Commit 0b50f81d authored by Tommy Christensen's avatar Tommy Christensen Committed by Jeff Garzik

[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=5284Signed-off-by: default avatarTommy S. Christensen <tommy.christensen@tpack.net>
Cc: Francois Romieu <romieu@fr.zoreil.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 383181ac
...@@ -100,11 +100,11 @@ VERSION 2.2LK <2005/01/25> ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment