Commit 5f715c09 authored Oct 15, 2015 by Andrej Ota Committed by David S. Miller Oct 16, 2015

via-rhine: fix VLAN receive handling regression.



Because eth_type_trans() consumes ethernet header worth of bytes, a call
to read TCI from end of 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: 810f19bc ("via-rhine: add consistent memory barrier in vlan receive code.")
Signed-off-by: Andrej Ota <andrej@ota.si>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7de88271

drivers/net/ethernet/via/via-rhine.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);