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

Commit d9736749 authored by Krzysztof Hałasa's avatar Krzysztof Hałasa Committed by David S. Miller
Browse files

WAN: Fix NAPI interface in IXP4xx HSS driver.

parent 37a76bd4
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -622,7 +622,7 @@ static void hss_hdlc_rx_irq(void *pdev)
	printk(KERN_DEBUG "%s: hss_hdlc_rx_irq\n", dev->name);
	printk(KERN_DEBUG "%s: hss_hdlc_rx_irq\n", dev->name);
#endif
#endif
	qmgr_disable_irq(queue_ids[port->id].rx);
	qmgr_disable_irq(queue_ids[port->id].rx);
	netif_rx_schedule(dev, &port->napi);
	netif_rx_schedule(&port->napi);
}
}


static int hss_hdlc_poll(struct napi_struct *napi, int budget)
static int hss_hdlc_poll(struct napi_struct *napi, int budget)
@@ -651,7 +651,7 @@ static int hss_hdlc_poll(struct napi_struct *napi, int budget)
			printk(KERN_DEBUG "%s: hss_hdlc_poll"
			printk(KERN_DEBUG "%s: hss_hdlc_poll"
			       " netif_rx_complete\n", dev->name);
			       " netif_rx_complete\n", dev->name);
#endif
#endif
			netif_rx_complete(dev, napi);
			netif_rx_complete(napi);
			qmgr_enable_irq(rxq);
			qmgr_enable_irq(rxq);
			if (!qmgr_stat_empty(rxq) &&
			if (!qmgr_stat_empty(rxq) &&
			    netif_rx_reschedule(napi)) {
			    netif_rx_reschedule(napi)) {
@@ -1069,7 +1069,7 @@ static int hss_hdlc_open(struct net_device *dev)
	hss_start_hdlc(port);
	hss_start_hdlc(port);


	/* we may already have RX data, enables IRQ */
	/* we may already have RX data, enables IRQ */
	netif_rx_schedule(dev, &port->napi);
	netif_rx_schedule(&port->napi);
	return 0;
	return 0;


err_unlock:
err_unlock: