diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
| commit | e5baa396af7560382d2cf3f0871d616b61fc284c (patch) | |
| tree | 6afc166894b8c8b3b2cf6add72a726be14ae2443 /drivers/net/r8169.c | |
| parent | d6a4c847e43c851cc0ddf73087a730227223f989 (diff) | |
| parent | ef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1 (diff) | |
Merge from Linus' tree.
Diffstat (limited to 'drivers/net/r8169.c')
| -rw-r--r-- | drivers/net/r8169.c | 4 |
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> | |||
| 100 | 100 | ||
| 101 | #ifdef CONFIG_R8169_NAPI | 101 | #ifdef CONFIG_R8169_NAPI |
| 102 | #define rtl8169_rx_skb netif_receive_skb | 102 | #define rtl8169_rx_skb netif_receive_skb |
| 103 | #define rtl8169_rx_hwaccel_skb vlan_hwaccel_rx | 103 | #define rtl8169_rx_hwaccel_skb vlan_hwaccel_receive_skb |
| 104 | #define rtl8169_rx_quota(count, quota) min(count, quota) | 104 | #define rtl8169_rx_quota(count, quota) min(count, quota) |
| 105 | #else | 105 | #else |
| 106 | #define rtl8169_rx_skb netif_rx | 106 | #define rtl8169_rx_skb netif_rx |
| 107 | #define rtl8169_rx_hwaccel_skb vlan_hwaccel_receive_skb | 107 | #define rtl8169_rx_hwaccel_skb vlan_hwaccel_rx |
| 108 | #define rtl8169_rx_quota(count, quota) count | 108 | #define rtl8169_rx_quota(count, quota) count |
| 109 | #endif | 109 | #endif |
| 110 | 110 | ||