Commit 6f83cb8c authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

net: wan: switch to netif_napi_add_weight() 



A handful of WAN drivers use custom napi weights,
switch them to the new API.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d484735d

drivers/net/wan/fsl_ucc_hdlc.c

+1 −1
Original line number Diff line number Diff line
@@ -1231,7 +1231,7 @@ static int ucc_hdlc_probe(struct platform_device *pdev) 
	dev->watchdog_timeo = 2 * HZ;

	hdlc->attach = ucc_hdlc_attach;

	hdlc->xmit = ucc_hdlc_tx;

	netif_napi_add(dev, &uhdlc_priv->napi, ucc_hdlc_poll, 32);

	netif_napi_add_weight(dev, &uhdlc_priv->napi, ucc_hdlc_poll, 32);

	if (register_hdlc_device(dev)) {

		ret = -ENOBUFS;

		pr_err("ucc_hdlc: unable to register hdlc device\n");

drivers/net/wan/hd64572.c

+2 −1
Original line number Diff line number Diff line
@@ -173,7 +173,8 @@ static void sca_init_port(port_t *port) 
	sca_out(DIR_EOME, DIR_TX(port->chan), card); /* enable interrupts */



	sca_set_carrier(port);

	netif_napi_add(port->netdev, &port->napi, sca_poll, NAPI_WEIGHT);

	netif_napi_add_weight(port->netdev, &port->napi, sca_poll,

			      NAPI_WEIGHT);

}



/* MSCI interrupt service */

drivers/net/wan/ixp4xx_hss.c

+1 −1
Original line number Diff line number Diff line
@@ -1504,7 +1504,7 @@ static int ixp4xx_hss_probe(struct platform_device *pdev) 
	port->clock_reg = CLK42X_SPEED_2048KHZ;

	port->id = pdev->id;

	port->dev = &pdev->dev;

	netif_napi_add(ndev, &port->napi, hss_hdlc_poll, NAPI_WEIGHT);

	netif_napi_add_weight(ndev, &port->napi, hss_hdlc_poll, NAPI_WEIGHT);



	err = register_hdlc_device(ndev);

	if (err)

drivers/net/wan/lapbether.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ static int lapbeth_new_device(struct net_device *dev) 
	spin_lock_init(&lapbeth->up_lock);



	skb_queue_head_init(&lapbeth->rx_queue);

	netif_napi_add(ndev, &lapbeth->napi, lapbeth_napi_poll, 16);

	netif_napi_add_weight(ndev, &lapbeth->napi, lapbeth_napi_poll, 16);



	rc = -EIO;

	if (register_netdevice(ndev))