[PATCH] via-rhine: fix VLAN receive handling error in 4.2.x

From	Andrej Ota <andrej@ota.si>
Newsgroups	linux.kernel
Subject	[PATCH] via-rhine: fix VLAN receive handling error in 4.2.x
Date	2015-10-04 22:10 +0200
Message-ID	<qfXLA-29h-3@gated-at.bofh.it> (permalink)
References	<qfCQN-5OX-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Fixes commit 810f19bcb862 ("via-rhine: add consistent memory barrier in
vlan receive code.") which broke VLAN tag parsing on receive.

Because eth_type_trans() consumes ethernet header worth of bytes, a call
to read TCI from packet using rhine_rx_vlan_tag() no longer works as it's
reading from an invalid offset.

Tested to be working on PCEngines Alix board.

Fixes: 810f19bcb862 ("via-rhine: add consistent memory barrier in vlan receive code.")
Signed-off-by: Andrej Ota <andrej@ota.si>
---
 drivers/net/ethernet/via/via-rhine.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index a832637..2b7550c 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -2134,10 +2134,11 @@ static int rhine_rx(struct net_device *dev, int limit)
 			}
 
 			skb_put(skb, pkt_len);
-			skb->protocol = eth_type_trans(skb, dev);
 
 			rhine_rx_vlan_tag(skb, desc, data_size);
 
+			skb->protocol = eth_type_trans(skb, dev);
+
 			netif_receive_skb(skb);
 
 			u64_stats_update_begin(&rp->rx_stats.syncp);
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

via-rhine: fix VLAN receive handling error in 4.2.x Andrej <andrej@ota.si> - 2015-10-03 19:40 +0200
  Re: via-rhine: fix VLAN receive handling error in 4.2.x Francois Romieu <romieu@fr.zoreil.com> - 2015-10-03 23:50 +0200
    [PATCH] via-rhine: fix VLAN receive handling error in 4.2.x Andrej Ota <andrej@ota.si> - 2015-10-04 22:10 +0200

csiph-web