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

Commit 10eccb46 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

bond: cleanup netpoll code 



This started out with fixing a sparse warning, then I realized that
the wrapper function bond_netpoll_info could just be removed
by rolling it into the enable code.

Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Reviewed-by: default avatarJiri Pirko <jiri@resnulli.us>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0fb52a27

drivers/net/bonding/bond_main.c

+1 −7
Original line number Diff line number Diff line
@@ -1245,12 +1245,6 @@ static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni, g 
	}

	return err;

}



static struct netpoll_info *bond_netpoll_info(struct bonding *bond)

{

	return bond->dev->npinfo;

}



#else

static inline int slave_enable_netpoll(struct slave *slave)

{
@@ -1795,7 +1789,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
	bond_set_carrier(bond);



#ifdef CONFIG_NET_POLL_CONTROLLER

	slave_dev->npinfo = bond_netpoll_info(bond);

	slave_dev->npinfo = bond->dev->npinfo;

	if (slave_dev->npinfo) {

		if (slave_enable_netpoll(new_slave)) {

			read_unlock(&bond->lock);