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

Commit 908a7a16 authored by Neil Horman's avatar Neil Horman Committed by David S. Miller
Browse files

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: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 889bd9b6

drivers/infiniband/hw/nes/nes_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -2541,7 +2541,7 @@ static void nes_nic_napi_ce_handler(struct nes_device *nesdev, struct nes_hw_nic 
{

	struct nes_vnic *nesvnic = container_of(cq, struct nes_vnic, nic_cq);



	netif_rx_schedule(nesdev->netdev[nesvnic->netdev_index], &nesvnic->napi);

	netif_rx_schedule(&nesvnic->napi);

}

drivers/infiniband/hw/nes/nes_nic.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int nes_netdev_poll(struct napi_struct *napi, int budget) 
	nes_nic_ce_handler(nesdev, nescq);



	if (nescq->cqes_pending == 0) {

		netif_rx_complete(netdev, napi);

		netif_rx_complete(napi);

		/* clear out completed cqes and arm */

		nes_write32(nesdev->regs+NES_CQE_ALLOC, NES_CQE_ALLOC_NOTIFY_NEXT |

				nescq->cq_number | (nescq->cqe_allocs_pending << 16));

drivers/infiniband/ulp/ipoib/ipoib_ib.c

+3 −3
Original line number Diff line number Diff line
@@ -446,11 +446,11 @@ poll_more: 
		if (dev->features & NETIF_F_LRO)

			lro_flush_all(&priv->lro.lro_mgr);



		netif_rx_complete(dev, napi);

		netif_rx_complete(napi);

		if (unlikely(ib_req_notify_cq(priv->recv_cq,

					      IB_CQ_NEXT_COMP |

					      IB_CQ_REPORT_MISSED_EVENTS)) &&

		    netif_rx_reschedule(dev, napi))

		    netif_rx_reschedule(napi))

			goto poll_more;

	}
@@ -462,7 +462,7 @@ void ipoib_ib_completion(struct ib_cq *cq, void *dev_ptr) 
	struct net_device *dev = dev_ptr;

	struct ipoib_dev_priv *priv = netdev_priv(dev);



	netif_rx_schedule(dev, &priv->napi);

	netif_rx_schedule(&priv->napi);

}



static void drain_tx_cq(struct net_device *dev)

drivers/net/8139cp.c

+3 −3
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ rx_next: 


		spin_lock_irqsave(&cp->lock, flags);

		cpw16_f(IntrMask, cp_intr_mask);

		__netif_rx_complete(dev, napi);

		__netif_rx_complete(napi);

		spin_unlock_irqrestore(&cp->lock, flags);

	}
@@ -641,9 +641,9 @@ static irqreturn_t cp_interrupt (int irq, void *dev_instance) 
	}



	if (status & (RxOK | RxErr | RxEmpty | RxFIFOOvr))

		if (netif_rx_schedule_prep(dev, &cp->napi)) {

		if (netif_rx_schedule_prep(&cp->napi)) {

			cpw16_f(IntrMask, cp_norx_intr_mask);

			__netif_rx_schedule(dev, &cp->napi);

			__netif_rx_schedule(&cp->napi);

		}



	if (status & (TxOK | TxErr | TxEmpty | SWInt))

drivers/net/8139too.c

+3 −3
Original line number Diff line number Diff line
@@ -2128,7 +2128,7 @@ static int rtl8139_poll(struct napi_struct *napi, int budget) 
		 */

		spin_lock_irqsave(&tp->lock, flags);

		RTL_W16_F(IntrMask, rtl8139_intr_mask);

		__netif_rx_complete(dev, napi);

		__netif_rx_complete(napi);

		spin_unlock_irqrestore(&tp->lock, flags);

	}

	spin_unlock(&tp->rx_lock);
@@ -2178,9 +2178,9 @@ static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance) 
	/* Receive packets are processed by poll routine.

	   If not running start it now. */

	if (status & RxAckBits){

		if (netif_rx_schedule_prep(dev, &tp->napi)) {

		if (netif_rx_schedule_prep(&tp->napi)) {

			RTL_W16_F (IntrMask, rtl8139_norx_intr_mask);

			__netif_rx_schedule(dev, &tp->napi);

			__netif_rx_schedule(&tp->napi);

		}

	}