diff options
author | Neil Horman <nhorman@tuxdriver.com> | 2008-12-22 23:43:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-22 23:43:12 -0500 |
commit | 908a7a16b852ffd618a9127be8d62432182d81b4 (patch) | |
tree | a0b509227e26bef7edd347575761e0dbeb5756e7 /drivers/net/spider_net.c | |
parent | 889bd9b6dbcd426b8698c4a779dd7dbf247f57b8 (diff) |
net: Remove unused netdev arg from some NAPI interfaces.
When the napi api was changed to separate its 1:1 binding to the net_device
struct, the netif_rx_[prep|schedule|complete] api failed to remove the now
vestigual net_device structure parameter. This patch cleans up that api by
properly removing it..
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/spider_net.c')
-rw-r--r-- | drivers/net/spider_net.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 325fbc9612c9..c5c123d3af57 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
@@ -1302,7 +1302,7 @@ static int spider_net_poll(struct napi_struct *napi, int budget) | |||
1302 | /* if all packets are in the stack, enable interrupts and return 0 */ | 1302 | /* if all packets are in the stack, enable interrupts and return 0 */ |
1303 | /* if not, return 1 */ | 1303 | /* if not, return 1 */ |
1304 | if (packets_done < budget) { | 1304 | if (packets_done < budget) { |
1305 | netif_rx_complete(netdev, napi); | 1305 | netif_rx_complete(napi); |
1306 | spider_net_rx_irq_on(card); | 1306 | spider_net_rx_irq_on(card); |
1307 | card->ignore_rx_ramfull = 0; | 1307 | card->ignore_rx_ramfull = 0; |
1308 | } | 1308 | } |
@@ -1529,8 +1529,7 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg, | |||
1529 | spider_net_refill_rx_chain(card); | 1529 | spider_net_refill_rx_chain(card); |
1530 | spider_net_enable_rxdmac(card); | 1530 | spider_net_enable_rxdmac(card); |
1531 | card->num_rx_ints ++; | 1531 | card->num_rx_ints ++; |
1532 | netif_rx_schedule(card->netdev, | 1532 | netif_rx_schedule(&card->napi); |
1533 | &card->napi); | ||
1534 | } | 1533 | } |
1535 | show_error = 0; | 1534 | show_error = 0; |
1536 | break; | 1535 | break; |
@@ -1550,8 +1549,7 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg, | |||
1550 | spider_net_refill_rx_chain(card); | 1549 | spider_net_refill_rx_chain(card); |
1551 | spider_net_enable_rxdmac(card); | 1550 | spider_net_enable_rxdmac(card); |
1552 | card->num_rx_ints ++; | 1551 | card->num_rx_ints ++; |
1553 | netif_rx_schedule(card->netdev, | 1552 | netif_rx_schedule(&card->napi); |
1554 | &card->napi); | ||
1555 | show_error = 0; | 1553 | show_error = 0; |
1556 | break; | 1554 | break; |
1557 | 1555 | ||
@@ -1565,8 +1563,7 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg, | |||
1565 | spider_net_refill_rx_chain(card); | 1563 | spider_net_refill_rx_chain(card); |
1566 | spider_net_enable_rxdmac(card); | 1564 | spider_net_enable_rxdmac(card); |
1567 | card->num_rx_ints ++; | 1565 | card->num_rx_ints ++; |
1568 | netif_rx_schedule(card->netdev, | 1566 | netif_rx_schedule(&card->napi); |
1569 | &card->napi); | ||
1570 | show_error = 0; | 1567 | show_error = 0; |
1571 | break; | 1568 | break; |
1572 | 1569 | ||
@@ -1660,11 +1657,11 @@ spider_net_interrupt(int irq, void *ptr) | |||
1660 | 1657 | ||
1661 | if (status_reg & SPIDER_NET_RXINT ) { | 1658 | if (status_reg & SPIDER_NET_RXINT ) { |
1662 | spider_net_rx_irq_off(card); | 1659 | spider_net_rx_irq_off(card); |
1663 | netif_rx_schedule(netdev, &card->napi); | 1660 | netif_rx_schedule(&card->napi); |
1664 | card->num_rx_ints ++; | 1661 | card->num_rx_ints ++; |
1665 | } | 1662 | } |
1666 | if (status_reg & SPIDER_NET_TXINT) | 1663 | if (status_reg & SPIDER_NET_TXINT) |
1667 | netif_rx_schedule(netdev, &card->napi); | 1664 | netif_rx_schedule(&card->napi); |
1668 | 1665 | ||
1669 | if (status_reg & SPIDER_NET_LINKINT) | 1666 | if (status_reg & SPIDER_NET_LINKINT) |
1670 | spider_net_link_reset(netdev); | 1667 | spider_net_link_reset(netdev); |