Eric Dumazet <[email protected]> wrote:
>We want to allow NAPI drivers to no longer provide
>ndo_poll_controller() method, as it has been proven problematic.
>
>team driver must not look at its presence, but instead call
>netpoll_poll_dev() which factorize the needed actions.
This patch is for bonding, not team; otherwise LGTM.
Acked-by: Jay Vosburgh <[email protected]>
-J
>Signed-off-by: Eric Dumazet <[email protected]>
>Cc: Jay Vosburgh <[email protected]>
>Cc: Veaceslav Falico <[email protected]>
>Cc: Andy Gospodarek <[email protected]>
>---
> drivers/net/bonding/bond_main.c | 11 ++---------
> 1 file changed, 2 insertions(+), 9 deletions(-)
>
>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
>index
>a764a83f99dabe54585dbad7dba40b6601177c03..0d87e11e7f1d84537fe43d95249b1bd3a2ce291d
> 100644
>--- a/drivers/net/bonding/bond_main.c
>+++ b/drivers/net/bonding/bond_main.c
>@@ -971,16 +971,13 @@ static void bond_poll_controller(struct net_device
>*bond_dev)
> struct slave *slave = NULL;
> struct list_head *iter;
> struct ad_info ad_info;
>- struct netpoll_info *ni;
>- const struct net_device_ops *ops;
>
> if (BOND_MODE(bond) == BOND_MODE_8023AD)
> if (bond_3ad_get_active_agg_info(bond, &ad_info))
> return;
>
> bond_for_each_slave_rcu(bond, slave, iter) {
>- ops = slave->dev->netdev_ops;
>- if (!bond_slave_is_up(slave) || !ops->ndo_poll_controller)
>+ if (!bond_slave_is_up(slave))
> continue;
>
> if (BOND_MODE(bond) == BOND_MODE_8023AD) {
>@@ -992,11 +989,7 @@ static void bond_poll_controller(struct net_device
>*bond_dev)
> continue;
> }
>
>- ni = rcu_dereference_bh(slave->dev->npinfo);
>- if (down_trylock(&ni->dev_lock))
>- continue;
>- ops->ndo_poll_controller(slave->dev);
>- up(&ni->dev_lock);
>+ netpoll_poll_dev(slave->dev);
> }
> }
>
>--
>2.19.0.444.g18242da7ef-goog
>
