via-rhine: fix VLAN receive handling regression.
authorAndrej Ota <andrej@ota.si>
Wed, 14 Oct 2015 22:14:37 +0000 (00:14 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 15 Dec 2015 05:25:40 +0000 (21:25 -0800)
commit08b344675513eafb202e298f89ddc3b8cf7556f9
tree489403bd87107f70420772c92f43f8d43aec12da
parent74fcf054575b7e87a88fb3f4a2069395c9824544
via-rhine: fix VLAN receive handling regression.

[ Upstream commit 5f715c097965c0ad037f64393d0b95c50287775b ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/via/via-rhine.c