aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixp2000
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ixp2000')
-rw-r--r--drivers/net/ixp2000/ixpdev.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c
index d9fd57d7a4b3..e9d978a1d6b4 100644
--- a/drivers/net/ixp2000/ixpdev.c
+++ b/drivers/net/ixp2000/ixpdev.c
@@ -147,12 +147,6 @@ static int ixpdev_poll(struct net_device *dev, int *budget)
147 return 0; 147 return 0;
148} 148}
149 149
150/* @@@ Ugly hack. */
151static inline int netif_rx_schedule_prep_notup(struct net_device *dev)
152{
153 return !test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state);
154}
155
156static void ixpdev_tx_complete(void) 150static void ixpdev_tx_complete(void)
157{ 151{
158 int channel; 152 int channel;
@@ -206,7 +200,7 @@ static irqreturn_t ixpdev_interrupt(int irq, void *dev_id, struct pt_regs *regs)
206 */ 200 */
207 if (status & 0x00ff) { 201 if (status & 0x00ff) {
208 ixp2000_reg_wrb(IXP2000_IRQ_THD_ENABLE_CLEAR_A_0, 0x00ff); 202 ixp2000_reg_wrb(IXP2000_IRQ_THD_ENABLE_CLEAR_A_0, 0x00ff);
209 if (likely(netif_rx_schedule_prep_notup(nds[0]))) { 203 if (likely(netif_rx_schedule_test(nds[0]))) {
210 __netif_rx_schedule(nds[0]); 204 __netif_rx_schedule(nds[0]);
211 } else { 205 } else {
212 printk(KERN_CRIT "ixp2000: irq while polling!!\n"); 206 printk(KERN_CRIT "ixp2000: irq while polling!!\n");