Attachment 873098 Details for Bug 1069028 – ixgbevf vlan stripping fix when not in netpoll path (v3)

[patch] ixgbevf vlan stripping fix when not in netpoll path (v3)

0001-ixgbevf-fix-vlan-acceleration-when-not-in-netpoll.patch (text/plain), 1.15 KB, created by Nikolay Aleksandrov on 2014-03-11 12:13:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolay Aleksandrov

Created: 2014-03-11 12:13:44 UTC

Size: 1.15 KB

patch

obsolete

>From cd76cc7943a8488c7f59d241e2de232654a0305b Mon Sep 17 00:00:00 2001
>From: Nikolay Aleksandrov <nikolay@redhat.com>
>Date: Tue, 11 Mar 2014 12:24:25 +0100
>Subject: [PATCH] ixgbevf: fix vlan acceleration when not in netpoll
>
>Currently if we're not in netpoll the stripped VLAN information will get
>lost resulting in connectivity problems if there're VLANs configured on
>top. Fix this to match upstream and add the VLAN information to the skb
>no matter which path will get chosen.
>
>v2: use vlan_hwaccel_rx()
>---
> drivers/net/ixgbevf/ixgbevf_main.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c
>index 56b394621814..bea26ad29d4b 100644
>--- a/drivers/net/ixgbevf/ixgbevf_main.c
>+++ b/drivers/net/ixgbevf/ixgbevf_main.c
>@@ -295,8 +295,12 @@ static void ixgbevf_receive_skb(struct ixgbevf_q_vector *q_vector,
> 					 tag, skb);
> 		else
> 			napi_gro_receive(&q_vector->napi, skb);
>-	} else
>-		netif_rx(skb);
>+	} else {
>+		if (is_vlan && vlan_group_get_device(adapter->vlgrp, tag))
>+			vlan_hwaccel_rx(skb, adapter->vlgrp, tag);
>+		else
>+			netif_rx(skb);
>+	}
> }
> 
> /**
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1069028: 869940 | 870927 | 873096 | 873098 | 873936 | 873949 | 874080