Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9076689a authored by Krzysztof Halasa's avatar Krzysztof Halasa Committed by Jeff Garzik
Browse files

ARM: IXP4xx Ethernet NAPI fix 



This patch removes some weirdness from IXP4xx Ethernet driver.

Signed-off-by: default avatarKrzysztof Hałasa <khc@pm.waw.pl>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent e35259a9

drivers/net/arm/ixp4xx_eth.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -522,7 +522,6 @@ static int eth_poll(struct napi_struct *napi, int budget) 
#endif

#endif





		if ((n = queue_get_desc(rxq, port, 0)) < 0) {

		if ((n = queue_get_desc(rxq, port, 0)) < 0) {

			received = 0; /* No packet received */

#if DEBUG_RX

#if DEBUG_RX

			printk(KERN_DEBUG "%s: eth_poll netif_rx_complete\n",

			printk(KERN_DEBUG "%s: eth_poll netif_rx_complete\n",

			       dev->name);

			       dev->name);
@@ -543,7 +542,7 @@ static int eth_poll(struct napi_struct *napi, int budget) 
			printk(KERN_DEBUG "%s: eth_poll all done\n",

			printk(KERN_DEBUG "%s: eth_poll all done\n",

			       dev->name);

			       dev->name);

#endif

#endif

			return 0; /* all work done */

			return received; /* all work done */

		}

		}





		desc = rx_desc_ptr(port, n);

		desc = rx_desc_ptr(port, n);