diff options
Diffstat (limited to 'drivers/net/znet.c')
-rw-r--r-- | drivers/net/znet.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/znet.c b/drivers/net/znet.c index b42347333750..bc5ae0f6e934 100644 --- a/drivers/net/znet.c +++ b/drivers/net/znet.c | |||
@@ -103,8 +103,7 @@ | |||
103 | #include <asm/io.h> | 103 | #include <asm/io.h> |
104 | #include <asm/dma.h> | 104 | #include <asm/dma.h> |
105 | 105 | ||
106 | /* This include could be elsewhere, since it is not wireless specific */ | 106 | #include <linux/i82593.h> |
107 | #include "wireless/i82593.h" | ||
108 | 107 | ||
109 | static char version[] __initdata = "znet.c:v1.02 9/23/94 becker@scyld.com\n"; | 108 | static char version[] __initdata = "znet.c:v1.02 9/23/94 becker@scyld.com\n"; |
110 | 109 | ||
@@ -170,7 +169,7 @@ static int znet_request_resources (struct net_device *dev) | |||
170 | { | 169 | { |
171 | struct znet_private *znet = netdev_priv(dev); | 170 | struct znet_private *znet = netdev_priv(dev); |
172 | 171 | ||
173 | if (request_irq (dev->irq, &znet_interrupt, 0, "ZNet", dev)) | 172 | if (request_irq (dev->irq, znet_interrupt, 0, "ZNet", dev)) |
174 | goto failed; | 173 | goto failed; |
175 | if (request_dma (znet->rx_dma, "ZNet rx")) | 174 | if (request_dma (znet->rx_dma, "ZNet rx")) |
176 | goto free_irq; | 175 | goto free_irq; |
@@ -698,8 +697,8 @@ static void znet_rx(struct net_device *dev) | |||
698 | the same area of the backwards links we now have. This allows us to | 697 | the same area of the backwards links we now have. This allows us to |
699 | pass packets to the upper layers in the order they were received -- | 698 | pass packets to the upper layers in the order they were received -- |
700 | important for fast-path sequential operations. */ | 699 | important for fast-path sequential operations. */ |
701 | while (znet->rx_start + cur_frame_end_offset != znet->rx_cur | 700 | while (znet->rx_start + cur_frame_end_offset != znet->rx_cur && |
702 | && ++boguscount < 5) { | 701 | ++boguscount < 5) { |
703 | unsigned short hi_cnt, lo_cnt, hi_status, lo_status; | 702 | unsigned short hi_cnt, lo_cnt, hi_status, lo_status; |
704 | int count, status; | 703 | int count, status; |
705 | 704 | ||