瀏覽代碼

[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>
Tommy Christensen 19 年之前
父節點
當前提交
0b50f81d5a
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/net/r8169.c

+ 2 - 2
drivers/net/r8169.c

@@ -100,11 +100,11 @@ VERSION 2.2LK	<2005/01/25>
 
 
 #ifdef CONFIG_R8169_NAPI
 #ifdef CONFIG_R8169_NAPI
 #define rtl8169_rx_skb			netif_receive_skb
 #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)
 #define rtl8169_rx_quota(count, quota)	min(count, quota)
 #else
 #else
 #define rtl8169_rx_skb			netif_rx
 #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
 #define rtl8169_rx_quota(count, quota)	count
 #endif
 #endif