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

Commit 6dffb044 authored Dec 03, 2015 by Jiri Pirko Committed by David S. Miller Dec 03, 2015

net: propagate upper priv via netdev_master_upper_dev_link



Eliminate netdev_master_upper_dev_link_private and pass priv directly as
a parameter of netdev_master_upper_dev_link.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e0ba1414

drivers/net/bonding/bond_main.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1204,7 +1204,7 @@ static int bond_master_upper_dev_link(struct net_device *bond_dev,
	{		{
	int err;		int err;

	err = netdev_master_upper_dev_link_private(slave_dev, bond_dev, slave);		err = netdev_master_upper_dev_link(slave_dev, bond_dev, slave);
	if (err)		if (err)
	return err;		return err;
	slave_dev->flags \|= IFF_SLAVE;		slave_dev->flags \|= IFF_SLAVE;

drivers/net/team/team.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1083,7 +1083,7 @@ static int team_upper_dev_link(struct net_device *dev,
	{		{
	int err;		int err;

	err = netdev_master_upper_dev_link(port_dev, dev);		err = netdev_master_upper_dev_link(port_dev, dev, NULL);
	if (err)		if (err)
	return err;		return err;
	port_dev->priv_flags \|= IFF_TEAM_PORT;		port_dev->priv_flags \|= IFF_TEAM_PORT;

drivers/net/vrf.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -624,7 +624,7 @@ static int do_vrf_add_slave(struct net_device dev, struct net_device port_dev)
	goto out_fail;		goto out_fail;
	}		}

	ret = netdev_master_upper_dev_link(port_dev, dev);		ret = netdev_master_upper_dev_link(port_dev, dev, NULL);
	if (ret < 0)		if (ret < 0)
	goto out_unregister;		goto out_unregister;

include/linux/netdevice.h

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -3619,10 +3619,8 @@ struct net_device netdev_master_upper_dev_get(struct net_device dev);
	struct net_device netdev_master_upper_dev_get_rcu(struct net_device dev);		struct net_device netdev_master_upper_dev_get_rcu(struct net_device dev);
	int netdev_upper_dev_link(struct net_device dev, struct net_device upper_dev);		int netdev_upper_dev_link(struct net_device dev, struct net_device upper_dev);
	int netdev_master_upper_dev_link(struct net_device *dev,		int netdev_master_upper_dev_link(struct net_device *dev,
	struct net_device *upper_dev);
	int netdev_master_upper_dev_link_private(struct net_device *dev,
	struct net_device *upper_dev,		struct net_device *upper_dev,
	void *private);		void *upper_priv);
	void netdev_upper_dev_unlink(struct net_device *dev,		void netdev_upper_dev_unlink(struct net_device *dev,
	struct net_device *upper_dev);		struct net_device *upper_dev);
	void netdev_adjacent_rename_links(struct net_device dev, char oldname);		void netdev_adjacent_rename_links(struct net_device dev, char oldname);

net/batman-adv/hard-interface.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -464,7 +464,8 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
	hard_iface->soft_iface = soft_iface;		hard_iface->soft_iface = soft_iface;
	bat_priv = netdev_priv(hard_iface->soft_iface);		bat_priv = netdev_priv(hard_iface->soft_iface);

	ret = netdev_master_upper_dev_link(hard_iface->net_dev, soft_iface);		ret = netdev_master_upper_dev_link(hard_iface->net_dev,
			soft_iface, NULL);
	if (ret)		if (ret)
	goto err_dev;		goto err_dev;