diff options
| author | Andrej Ota <andrej@ota.si> | 2015-10-15 00:14:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-16 09:55:30 +0200 |
| commit | 5f715c097965c0ad037f64393d0b95c50287775b (patch) | |
| tree | a138493176b214b29f38995ba1271cf07950fe66 /drivers/net/ethernet/via | |
| parent | Merge branch 'ipv6-blackhole-route-fix' (diff) | |
| download | linux-5f715c097965c0ad037f64393d0b95c50287775b.tar.xz linux-5f715c097965c0ad037f64393d0b95c50287775b.zip | |
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: 810f19bcb862 ("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>
Diffstat (limited to 'drivers/net/ethernet/via')
| -rw-r--r-- | drivers/net/ethernet/via/via-rhine.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index a83263743665..2b7550c43f78 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); |