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

Commit 587daaf3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'netpoll-next' 



Eric W. Biederman says:

====================
netpoll: Cleanups and fixes

This should be a small set of safe cleanups and fixes to netpoll.

The fixes are vlan headers are now always inserted when needed, and
napi polling is always avoided when network devices are closed.

There are a bunch of little cleanups removing unnecessary code, fixing
function naming, not taking unnecessary locks and removing general
silliness.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3f705f73 5efeac44

drivers/net/bonding/bond_main.c

+3 −3
Original line number Diff line number Diff line
@@ -922,12 +922,12 @@ static inline int slave_enable_netpoll(struct slave *slave) 
	struct netpoll *np;

	int err = 0;



	np = kzalloc(sizeof(*np), GFP_ATOMIC);

	np = kzalloc(sizeof(*np), GFP_KERNEL);

	err = -ENOMEM;

	if (!np)

		goto out;



	err = __netpoll_setup(np, slave->dev, GFP_ATOMIC);

	err = __netpoll_setup(np, slave->dev);

	if (err) {

		kfree(np);

		goto out;
@@ -962,7 +962,7 @@ static void bond_netpoll_cleanup(struct net_device *bond_dev) 
			slave_disable_netpoll(slave);

}



static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni, gfp_t gfp)

static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni)

{

	struct bonding *bond = netdev_priv(dev);

	struct list_head *iter;

drivers/net/team/team.c

+7 −9
Original line number Diff line number Diff line
@@ -1031,8 +1031,7 @@ static void team_port_leave(struct team *team, struct team_port *port) 
}



#ifdef CONFIG_NET_POLL_CONTROLLER

static int team_port_enable_netpoll(struct team *team, struct team_port *port,

				    gfp_t gfp)

static int team_port_enable_netpoll(struct team *team, struct team_port *port)

{

	struct netpoll *np;

	int err;
@@ -1040,11 +1039,11 @@ static int team_port_enable_netpoll(struct team *team, struct team_port *port, 
	if (!team->dev->npinfo)

		return 0;



	np = kzalloc(sizeof(*np), gfp);

	np = kzalloc(sizeof(*np), GFP_KERNEL);

	if (!np)

		return -ENOMEM;



	err = __netpoll_setup(np, port->dev, gfp);

	err = __netpoll_setup(np, port->dev);

	if (err) {

		kfree(np);

		return err;
@@ -1067,8 +1066,7 @@ static void team_port_disable_netpoll(struct team_port *port) 
	kfree(np);

}

#else

static int team_port_enable_netpoll(struct team *team, struct team_port *port,

				    gfp_t gfp)

static int team_port_enable_netpoll(struct team *team, struct team_port *port)

{

	return 0;

}
@@ -1156,7 +1154,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev) 
		goto err_vids_add;

	}



	err = team_port_enable_netpoll(team, port, GFP_KERNEL);

	err = team_port_enable_netpoll(team, port);

	if (err) {

		netdev_err(dev, "Failed to enable netpoll on device %s\n",

			   portname);
@@ -1850,7 +1848,7 @@ static void team_netpoll_cleanup(struct net_device *dev) 
}



static int team_netpoll_setup(struct net_device *dev,

			      struct netpoll_info *npifo, gfp_t gfp)

			      struct netpoll_info *npifo)

{

	struct team *team = netdev_priv(dev);

	struct team_port *port;
@@ -1858,7 +1856,7 @@ static int team_netpoll_setup(struct net_device *dev, 


	mutex_lock(&team->lock);

	list_for_each_entry(port, &team->port_list, list) {

		err = team_port_enable_netpoll(team, port, gfp);

		err = team_port_enable_netpoll(team, port);

		if (err) {

			__team_netpoll_cleanup(team);

			break;

include/linux/netdevice.h

+6 −2
Original line number Diff line number Diff line
@@ -1037,8 +1037,7 @@ struct net_device_ops { 
#ifdef CONFIG_NET_POLL_CONTROLLER

	void                    (*ndo_poll_controller)(struct net_device *dev);

	int			(*ndo_netpoll_setup)(struct net_device *dev,

						     struct netpoll_info *info,

						     gfp_t gfp);

						     struct netpoll_info *info);

	void			(*ndo_netpoll_cleanup)(struct net_device *dev);

#endif

#ifdef CONFIG_NET_RX_BUSY_POLL
@@ -2910,6 +2909,11 @@ static inline void netif_tx_unlock_bh(struct net_device *dev) 
	}						\

}



#define HARD_TX_TRYLOCK(dev, txq)			\

	(((dev->features & NETIF_F_LLTX) == 0) ?	\

		__netif_tx_trylock(txq) :		\

		true )



#define HARD_TX_UNLOCK(dev, txq) {			\

	if ((dev->features & NETIF_F_LLTX) == 0) {	\

		__netif_tx_unlock(txq);			\

include/linux/netpoll.h

+5 −5
Original line number Diff line number Diff line
@@ -47,17 +47,17 @@ struct netpoll_info { 
};



#ifdef CONFIG_NETPOLL

extern void netpoll_rx_disable(struct net_device *dev);

extern void netpoll_rx_enable(struct net_device *dev);

extern void netpoll_poll_disable(struct net_device *dev);

extern void netpoll_poll_enable(struct net_device *dev);

#else

static inline void netpoll_rx_disable(struct net_device *dev) { return; }

static inline void netpoll_rx_enable(struct net_device *dev) { return; }

static inline void netpoll_poll_disable(struct net_device *dev) { return; }

static inline void netpoll_poll_enable(struct net_device *dev) { return; }

#endif



void netpoll_send_udp(struct netpoll *np, const char *msg, int len);

void netpoll_print_options(struct netpoll *np);

int netpoll_parse_options(struct netpoll *np, char *opt);

int __netpoll_setup(struct netpoll *np, struct net_device *ndev, gfp_t gfp);

int __netpoll_setup(struct netpoll *np, struct net_device *ndev);

int netpoll_setup(struct netpoll *np);

void __netpoll_cleanup(struct netpoll *np);

void __netpoll_free_async(struct netpoll *np);

net/8021q/vlan_dev.c

+3 −4
Original line number Diff line number Diff line
@@ -707,20 +707,19 @@ static void vlan_dev_poll_controller(struct net_device *dev) 
	return;

}



static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *npinfo,

				  gfp_t gfp)

static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *npinfo)

{

	struct vlan_dev_priv *vlan = vlan_dev_priv(dev);

	struct net_device *real_dev = vlan->real_dev;

	struct netpoll *netpoll;

	int err = 0;



	netpoll = kzalloc(sizeof(*netpoll), gfp);

	netpoll = kzalloc(sizeof(*netpoll), GFP_KERNEL);

	err = -ENOMEM;

	if (!netpoll)

		goto out;



	err = __netpoll_setup(netpoll, real_dev, gfp);

	err = __netpoll_setup(netpoll, real_dev);

	if (err) {

		kfree(netpoll);

		goto out;