via-rhine: fix VLAN receive handling regression.

andrejota · davem330 · commit 5f715c097965 · 2015-10-16T00:55:30.000-07:00
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: 810f19b ("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>
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -2134,10 +2134,11 @@ static int rhine_rx(struct net_device *dev, int limit)`
`2134`	`2134`	`}`
`2135`	`2135`
`2136`	`2136`	`skb_put(skb, pkt_len);`
`2137`		`- skb->protocol = eth_type_trans(skb, dev);`
`2138`	`2137`
`2139`	`2138`	`rhine_rx_vlan_tag(skb, desc, data_size);`
`2140`	`2139`
	`2140`	`+ skb->protocol = eth_type_trans(skb, dev);`
	`2141`	`+`
`2141`	`2142`	`netif_receive_skb(skb);`
`2142`	`2143`
`2143`	`2144`	`u64_stats_update_begin(&rp->rx_stats.syncp);`