diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-22 15:43:14 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-22 15:43:14 -0400 |
| commit | da192bb50cc9a7fe7d95e048422d51777bad0bba (patch) | |
| tree | 560986cb68a747de281f82ca605c7125ccc65c1c /drivers/net/r8169.c | |
| parent | af9288a707b609cdb1069cfe5bde0d6567c12c31 (diff) | |
| parent | 3fd07d3bf0077dcc0f5a33d2eb1938ea050da8da (diff) | |
Merge /spare/repo/linux-2.6/
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 cbc60ce365cb..40c40eba2581 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 | ||