Merge pull request torvalds#187 in PROCESSOR-SDK/processor-sdk-linux …

…from PLSDK-3033 to processor-sdk-linux-4.19.y * commit 'ac18dd612b8fbbc43406f3323fbac783487defe3': net: hsrprp: allow HSR to forward PRP frames
chombourger · Nov 8, 2019 · 106aec4 · 106aec4
2 parents 9893456 + ac18dd6
commit 106aec4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/net/hsr-prp/hsr_prp_forward.c b/net/hsr-prp/hsr_prp_forward.c
@@ -738,7 +738,8 @@ static int fill_frame_info(struct hsr_prp_frame_info *frame,
 		struct prp_rct *rct = skb_get_PRP_rct(skb);
 
 		if (rct &&
-		    prp_check_lsdu_size(skb, rct, frame->is_supervision)) {
+		    prp_check_lsdu_size(skb, rct, frame->is_supervision) &&
+					port->priv->prot_version == PRP_V1) {
 			frame->skb_hsr = NULL;
 			frame->skb_std = NULL;
 			frame->skb_prp = skb;