p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: 810f19bcb8 ("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>
This commit is contained in:
Andrej Ota 2015-10-15 00:14:37 +02:00 committed by David S. Miller
parent 7de88271da
commit 5f715c0979
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/via/via-rhine.c
View File

@ -2134,10 +2134,11 @@ static int rhine_rx(struct net_device *dev, int limit)
} }
skb_put(skb, pkt_len); skb_put(skb, pkt_len);
skb->protocol = eth_type_trans(skb, dev);
rhine_rx_vlan_tag(skb, desc, data_size); rhine_rx_vlan_tag(skb, desc, data_size);
skb->protocol = eth_type_trans(skb, dev);
netif_receive_skb(skb); netif_receive_skb(skb);
u64_stats_update_begin(&rp->rx_stats.syncp); u64_stats_update_begin(&rp->rx_stats.syncp);