Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jakub Kicinski and committed by
David S. Miller
6f83cb8c d484735d

+5 -4
+1 -1
drivers/net/wan/fsl_ucc_hdlc.c
··· 1231 1231 dev->watchdog_timeo = 2 * HZ; 1232 1232 hdlc->attach = ucc_hdlc_attach; 1233 1233 hdlc->xmit = ucc_hdlc_tx; 1234 - netif_napi_add(dev, &uhdlc_priv->napi, ucc_hdlc_poll, 32); 1234 + netif_napi_add_weight(dev, &uhdlc_priv->napi, ucc_hdlc_poll, 32); 1235 1235 if (register_hdlc_device(dev)) { 1236 1236 ret = -ENOBUFS; 1237 1237 pr_err("ucc_hdlc: unable to register hdlc device\n");
+2 -1
drivers/net/wan/hd64572.c
··· 173 173 sca_out(DIR_EOME, DIR_TX(port->chan), card); /* enable interrupts */ 174 174 175 175 sca_set_carrier(port); 176 - netif_napi_add(port->netdev, &port->napi, sca_poll, NAPI_WEIGHT); 176 + netif_napi_add_weight(port->netdev, &port->napi, sca_poll, 177 + NAPI_WEIGHT); 177 178 } 178 179 179 180 /* MSCI interrupt service */
+1 -1
drivers/net/wan/ixp4xx_hss.c
··· 1504 1504 port->clock_reg = CLK42X_SPEED_2048KHZ; 1505 1505 port->id = pdev->id; 1506 1506 port->dev = &pdev->dev; 1507 - netif_napi_add(ndev, &port->napi, hss_hdlc_poll, NAPI_WEIGHT); 1507 + netif_napi_add_weight(ndev, &port->napi, hss_hdlc_poll, NAPI_WEIGHT); 1508 1508 1509 1509 err = register_hdlc_device(ndev); 1510 1510 if (err)
+1 -1
drivers/net/wan/lapbether.c
··· 408 408 spin_lock_init(&lapbeth->up_lock); 409 409 410 410 skb_queue_head_init(&lapbeth->rx_queue); 411 - netif_napi_add(ndev, &lapbeth->napi, lapbeth_napi_poll, 16); 411 + netif_napi_add_weight(ndev, &lapbeth->napi, lapbeth_napi_poll, 16); 412 412 413 413 rc = -EIO; 414 414 if (register_netdevice(ndev))