diff options
Diffstat (limited to 'drivers/net/8139too.c')
-rw-r--r-- | drivers/net/8139too.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index feae7832fc84..abd6261465f1 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
@@ -165,7 +165,7 @@ static int multicast_filter_limit = 32; | |||
165 | static int debug = -1; | 165 | static int debug = -1; |
166 | 166 | ||
167 | /* | 167 | /* |
168 | * Receive ring size | 168 | * Receive ring size |
169 | * Warning: 64K ring has hardware issues and may lock up. | 169 | * Warning: 64K ring has hardware issues and may lock up. |
170 | */ | 170 | */ |
171 | #if defined(CONFIG_SH_DREAMCAST) | 171 | #if defined(CONFIG_SH_DREAMCAST) |
@@ -257,7 +257,7 @@ static struct pci_device_id rtl8139_pci_tbl[] = { | |||
257 | {0x018a, 0x0106, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, | 257 | {0x018a, 0x0106, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, |
258 | {0x126c, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, | 258 | {0x126c, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, |
259 | {0x1743, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, | 259 | {0x1743, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, |
260 | {0x021b, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, | 260 | {0x021b, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, |
261 | 261 | ||
262 | #ifdef CONFIG_SH_SECUREEDGE5410 | 262 | #ifdef CONFIG_SH_SECUREEDGE5410 |
263 | /* Bogus 8139 silicon reports 8129 without external PROM :-( */ | 263 | /* Bogus 8139 silicon reports 8129 without external PROM :-( */ |
@@ -1824,7 +1824,7 @@ static void rtl8139_rx_err (u32 rx_status, struct net_device *dev, | |||
1824 | int tmp_work; | 1824 | int tmp_work; |
1825 | #endif | 1825 | #endif |
1826 | 1826 | ||
1827 | if (netif_msg_rx_err (tp)) | 1827 | if (netif_msg_rx_err (tp)) |
1828 | printk(KERN_DEBUG "%s: Ethernet frame had errors, status %8.8x.\n", | 1828 | printk(KERN_DEBUG "%s: Ethernet frame had errors, status %8.8x.\n", |
1829 | dev->name, rx_status); | 1829 | dev->name, rx_status); |
1830 | tp->stats.rx_errors++; | 1830 | tp->stats.rx_errors++; |
@@ -1944,7 +1944,7 @@ static int rtl8139_rx(struct net_device *dev, struct rtl8139_private *tp, | |||
1944 | RTL_R16 (RxBufAddr), | 1944 | RTL_R16 (RxBufAddr), |
1945 | RTL_R16 (RxBufPtr), RTL_R8 (ChipCmd)); | 1945 | RTL_R16 (RxBufPtr), RTL_R8 (ChipCmd)); |
1946 | 1946 | ||
1947 | while (netif_running(dev) && received < budget | 1947 | while (netif_running(dev) && received < budget |
1948 | && (RTL_R8 (ChipCmd) & RxBufEmpty) == 0) { | 1948 | && (RTL_R8 (ChipCmd) & RxBufEmpty) == 0) { |
1949 | u32 ring_offset = cur_rx % RX_BUF_LEN; | 1949 | u32 ring_offset = cur_rx % RX_BUF_LEN; |
1950 | u32 rx_status; | 1950 | u32 rx_status; |
@@ -2031,7 +2031,7 @@ no_early_rx: | |||
2031 | 2031 | ||
2032 | netif_receive_skb (skb); | 2032 | netif_receive_skb (skb); |
2033 | } else { | 2033 | } else { |
2034 | if (net_ratelimit()) | 2034 | if (net_ratelimit()) |
2035 | printk (KERN_WARNING | 2035 | printk (KERN_WARNING |
2036 | "%s: Memory squeeze, dropping packet.\n", | 2036 | "%s: Memory squeeze, dropping packet.\n", |
2037 | dev->name); | 2037 | dev->name); |
@@ -2158,13 +2158,13 @@ static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance, | |||
2158 | status = RTL_R16 (IntrStatus); | 2158 | status = RTL_R16 (IntrStatus); |
2159 | 2159 | ||
2160 | /* shared irq? */ | 2160 | /* shared irq? */ |
2161 | if (unlikely((status & rtl8139_intr_mask) == 0)) | 2161 | if (unlikely((status & rtl8139_intr_mask) == 0)) |
2162 | goto out; | 2162 | goto out; |
2163 | 2163 | ||
2164 | handled = 1; | 2164 | handled = 1; |
2165 | 2165 | ||
2166 | /* h/w no longer present (hotplug?) or major error, bail */ | 2166 | /* h/w no longer present (hotplug?) or major error, bail */ |
2167 | if (unlikely(status == 0xFFFF)) | 2167 | if (unlikely(status == 0xFFFF)) |
2168 | goto out; | 2168 | goto out; |
2169 | 2169 | ||
2170 | /* close possible race's with dev_close */ | 2170 | /* close possible race's with dev_close */ |