summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorTommy Christensen <tommy.christensen@tpack.net>2005-09-21 12:13:57 -0700
committerJeff Garzik <jgarzik@pobox.com>2005-09-21 22:49:07 -0400
commit0b50f81d5a63428f131ff20596f4e3d473e5b94f (patch)
treeafb7d2f8382bb7798e90d88d6a690e63b5dfeb92 /drivers/net
parent383181ac7e59542ff47e2b81f7e4c40aba39b30b (diff)
downloadblackbird-op-linux-0b50f81d5a63428f131ff20596f4e3d473e5b94f.tar.gz
blackbird-op-linux-0b50f81d5a63428f131ff20596f4e3d473e5b94f.zip
[PATCH] r8169: call proper VLAN receive function
vlan_hwaccel_rx should be used when in interrupt context. Fixes bug http://bugzilla.kernel.org/show_bug.cgi?id=5284 Signed-off-by: Tommy S. Christensen <tommy.christensen@tpack.net> Cc: Francois Romieu <romieu@fr.zoreil.com> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/r8169.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index f0471d102e3c..f9223c1c5aa4 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -100,11 +100,11 @@ VERSION 2.2LK <2005/01/25>
#ifdef CONFIG_R8169_NAPI
#define rtl8169_rx_skb netif_receive_skb
-#define rtl8169_rx_hwaccel_skb vlan_hwaccel_rx
+#define rtl8169_rx_hwaccel_skb vlan_hwaccel_receive_skb
#define rtl8169_rx_quota(count, quota) min(count, quota)
#else
#define rtl8169_rx_skb netif_rx
-#define rtl8169_rx_hwaccel_skb vlan_hwaccel_receive_skb
+#define rtl8169_rx_hwaccel_skb vlan_hwaccel_rx
#define rtl8169_rx_quota(count, quota) count
#endif
OpenPOWER on IntegriCloud