mirror of
https://github.com/torvalds/linux.git
synced 2024-10-23 05:30:55 +00:00
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>
This commit is contained in:
parent
d484735dcf
commit
6f83cb8cbf
|
@ -1231,7 +1231,7 @@ static int ucc_hdlc_probe(struct platform_device *pdev)
|
||||||
dev->watchdog_timeo = 2 * HZ;
|
dev->watchdog_timeo = 2 * HZ;
|
||||||
hdlc->attach = ucc_hdlc_attach;
|
hdlc->attach = ucc_hdlc_attach;
|
||||||
hdlc->xmit = ucc_hdlc_tx;
|
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)) {
|
if (register_hdlc_device(dev)) {
|
||||||
ret = -ENOBUFS;
|
ret = -ENOBUFS;
|
||||||
pr_err("ucc_hdlc: unable to register hdlc device\n");
|
pr_err("ucc_hdlc: unable to register hdlc device\n");
|
||||||
|
|
|
@ -173,7 +173,8 @@ static void sca_init_port(port_t *port)
|
||||||
sca_out(DIR_EOME, DIR_TX(port->chan), card); /* enable interrupts */
|
sca_out(DIR_EOME, DIR_TX(port->chan), card); /* enable interrupts */
|
||||||
|
|
||||||
sca_set_carrier(port);
|
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 */
|
/* MSCI interrupt service */
|
||||||
|
|
|
@ -1504,7 +1504,7 @@ static int ixp4xx_hss_probe(struct platform_device *pdev)
|
||||||
port->clock_reg = CLK42X_SPEED_2048KHZ;
|
port->clock_reg = CLK42X_SPEED_2048KHZ;
|
||||||
port->id = pdev->id;
|
port->id = pdev->id;
|
||||||
port->dev = &pdev->dev;
|
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);
|
err = register_hdlc_device(ndev);
|
||||||
if (err)
|
if (err)
|
||||||
|
|
|
@ -408,7 +408,7 @@ static int lapbeth_new_device(struct net_device *dev)
|
||||||
spin_lock_init(&lapbeth->up_lock);
|
spin_lock_init(&lapbeth->up_lock);
|
||||||
|
|
||||||
skb_queue_head_init(&lapbeth->rx_queue);
|
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;
|
rc = -EIO;
|
||||||
if (register_netdevice(ndev))
|
if (register_netdevice(ndev))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user