diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
commit | 012e060c95e547eceea4a12c6f58592473bf4011 (patch) | |
tree | b57d3eafb50ce517577d2cf366c9ef0b4b286589 /drivers/net/r8169.c | |
parent | 923f122573851d18a3832ca808269fa2d5046fb1 (diff) | |
parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/net/r8169.c')
-rw-r--r-- | drivers/net/r8169.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index f0471d102e3c..afb3f186b884 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
@@ -92,19 +92,18 @@ VERSION 2.2LK <2005/01/25> | |||
92 | #endif /* RTL8169_DEBUG */ | 92 | #endif /* RTL8169_DEBUG */ |
93 | 93 | ||
94 | #define R8169_MSG_DEFAULT \ | 94 | #define R8169_MSG_DEFAULT \ |
95 | (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK | NETIF_MSG_IFUP | \ | 95 | (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_IFUP | NETIF_MSG_IFDOWN) |
96 | NETIF_MSG_IFDOWN) | ||
97 | 96 | ||
98 | #define TX_BUFFS_AVAIL(tp) \ | 97 | #define TX_BUFFS_AVAIL(tp) \ |
99 | (tp->dirty_tx + NUM_TX_DESC - tp->cur_tx - 1) | 98 | (tp->dirty_tx + NUM_TX_DESC - tp->cur_tx - 1) |
100 | 99 | ||
101 | #ifdef CONFIG_R8169_NAPI | 100 | #ifdef CONFIG_R8169_NAPI |
102 | #define rtl8169_rx_skb netif_receive_skb | 101 | #define rtl8169_rx_skb netif_receive_skb |
103 | #define rtl8169_rx_hwaccel_skb vlan_hwaccel_rx | 102 | #define rtl8169_rx_hwaccel_skb vlan_hwaccel_receive_skb |
104 | #define rtl8169_rx_quota(count, quota) min(count, quota) | 103 | #define rtl8169_rx_quota(count, quota) min(count, quota) |
105 | #else | 104 | #else |
106 | #define rtl8169_rx_skb netif_rx | 105 | #define rtl8169_rx_skb netif_rx |
107 | #define rtl8169_rx_hwaccel_skb vlan_hwaccel_receive_skb | 106 | #define rtl8169_rx_hwaccel_skb vlan_hwaccel_rx |
108 | #define rtl8169_rx_quota(count, quota) count | 107 | #define rtl8169_rx_quota(count, quota) count |
109 | #endif | 108 | #endif |
110 | 109 | ||