diff options
author | Krzysztof Halasa <khc@pm.waw.pl> | 2008-07-09 07:10:32 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-07-11 10:01:12 -0400 |
commit | 9076689ab07974a6f5d230fc241448f7a77e9078 (patch) | |
tree | a848b4d74909f14af90b4ee10fb17d1f3bb72af4 /drivers/net/arm | |
parent | e35259a95331ae4a9146cc03ab49aad641cab957 (diff) |
ARM: IXP4xx Ethernet NAPI fix
This patch removes some weirdness from IXP4xx Ethernet driver.
Signed-off-by: Krzysztof HaĆasa <khc@pm.waw.pl>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/arm')
-rw-r--r-- | drivers/net/arm/ixp4xx_eth.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c index c617b64c288e..9b777d9433cd 100644 --- a/drivers/net/arm/ixp4xx_eth.c +++ b/drivers/net/arm/ixp4xx_eth.c | |||
@@ -522,7 +522,6 @@ static int eth_poll(struct napi_struct *napi, int budget) | |||
522 | #endif | 522 | #endif |
523 | 523 | ||
524 | if ((n = queue_get_desc(rxq, port, 0)) < 0) { | 524 | if ((n = queue_get_desc(rxq, port, 0)) < 0) { |
525 | received = 0; /* No packet received */ | ||
526 | #if DEBUG_RX | 525 | #if DEBUG_RX |
527 | printk(KERN_DEBUG "%s: eth_poll netif_rx_complete\n", | 526 | printk(KERN_DEBUG "%s: eth_poll netif_rx_complete\n", |
528 | dev->name); | 527 | dev->name); |
@@ -543,7 +542,7 @@ static int eth_poll(struct napi_struct *napi, int budget) | |||
543 | printk(KERN_DEBUG "%s: eth_poll all done\n", | 542 | printk(KERN_DEBUG "%s: eth_poll all done\n", |
544 | dev->name); | 543 | dev->name); |
545 | #endif | 544 | #endif |
546 | return 0; /* all work done */ | 545 | return received; /* all work done */ |
547 | } | 546 | } |
548 | 547 | ||
549 | desc = rx_desc_ptr(port, n); | 548 | desc = rx_desc_ptr(port, n); |