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

Commit a54acb3a authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

dev: introduce dev_get_iflink() 



The goal of this patch is to prepare the removal of the iflink field. It
introduces a new ndo function, which will be implemented by virtual interfaces.

There is no functional change into this patch. All readers of iflink field
now call dev_get_iflink().

Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 033f46b3

drivers/net/ipvlan/ipvlan_core.c

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static int ipvlan_process_v4_outbound(struct sk_buff *skb) 
	struct rtable *rt;

	int err, ret = NET_XMIT_DROP;

	struct flowi4 fl4 = {

		.flowi4_oif = dev->iflink,

		.flowi4_oif = dev_get_iflink(dev),

		.flowi4_tos = RT_TOS(ip4h->tos),

		.flowi4_flags = FLOWI_FLAG_ANYSRC,

		.daddr = ip4h->daddr,

include/linux/netdevice.h

+4 −0
Original line number Diff line number Diff line
@@ -1030,6 +1030,8 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev, 
 *			     int queue_index, u32 maxrate);

 *	Called when a user wants to set a max-rate limitation of specific

 *	TX queue.

 * int (*ndo_get_iflink)(const struct net_device *dev);

 *	Called to get the iflink value of this device.

 */

struct net_device_ops {

	int			(*ndo_init)(struct net_device *dev);
@@ -1191,6 +1193,7 @@ struct net_device_ops { 
	int			(*ndo_set_tx_maxrate)(struct net_device *dev,

						      int queue_index,

						      u32 maxrate);

	int			(*ndo_get_iflink)(const struct net_device *dev);

};



/**
@@ -2149,6 +2152,7 @@ void __dev_remove_pack(struct packet_type *pt); 
void dev_add_offload(struct packet_offload *po);

void dev_remove_offload(struct packet_offload *po);



int dev_get_iflink(const struct net_device *dev);

struct net_device *__dev_get_by_flags(struct net *net, unsigned short flags,

				      unsigned short mask);

struct net_device *dev_get_by_name(struct net *net, const char *name);

net/batman-adv/hard-interface.c

+3 −2
Original line number Diff line number Diff line
@@ -83,11 +83,12 @@ static bool batadv_is_on_batman_iface(const struct net_device *net_dev) 
		return true;



	/* no more parents..stop recursion */

	if (net_dev->iflink == 0 || net_dev->iflink == net_dev->ifindex)

	if (dev_get_iflink(net_dev) == 0 ||

	    dev_get_iflink(net_dev) == net_dev->ifindex)

		return false;



	/* recurse over the parent device */

	parent_dev = __dev_get_by_index(&init_net, net_dev->iflink);

	parent_dev = __dev_get_by_index(&init_net, dev_get_iflink(net_dev));

	/* if we got a NULL parent_dev there is something broken.. */

	if (WARN(!parent_dev, "Cannot find parent device"))

		return false;

net/bridge/br_netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -305,8 +305,8 @@ static int br_fill_ifinfo(struct sk_buff *skb, 
	    nla_put_u8(skb, IFLA_OPERSTATE, operstate) ||

	    (dev->addr_len &&

	     nla_put(skb, IFLA_ADDRESS, dev->addr_len, dev->dev_addr)) ||

	    (dev->ifindex != dev->iflink &&

	     nla_put_u32(skb, IFLA_LINK, dev->iflink)))

	    (dev->ifindex != dev_get_iflink(dev) &&

	     nla_put_u32(skb, IFLA_LINK, dev_get_iflink(dev))))

		goto nla_put_failure;



	if (event == RTM_NEWLINK && port) {

net/core/dev.c

+19 −2
Original line number Diff line number Diff line
@@ -659,6 +659,23 @@ __setup("netdev=", netdev_boot_setup); 


*******************************************************************************/



/**

 *	dev_get_iflink	- get 'iflink' value of a interface

 *	@dev: targeted interface

 *

 *	Indicates the ifindex the interface is linked to.

 *	Physical interfaces have the same 'ifindex' and 'iflink' values.

 */



int dev_get_iflink(const struct net_device *dev)

{

	if (dev->netdev_ops && dev->netdev_ops->ndo_get_iflink)

		return dev->netdev_ops->ndo_get_iflink(dev);



	return dev->iflink;

}

EXPORT_SYMBOL(dev_get_iflink);



/**

 *	__dev_get_by_name	- find a device by its name

 *	@net: the applicable net namespace
@@ -6345,7 +6362,7 @@ int register_netdevice(struct net_device *dev) 
	else if (__dev_get_by_index(net, dev->ifindex))

		goto err_uninit;



	if (dev->iflink == -1)

	if (dev_get_iflink(dev) == -1)

		dev->iflink = dev->ifindex;



	/* Transfer changeable features to wanted_features and enable
@@ -7061,7 +7078,7 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char 


	/* If there is an ifindex conflict assign a new one */

	if (__dev_get_by_index(net, dev->ifindex)) {

		int iflink = (dev->iflink == dev->ifindex);

		int iflink = (dev_get_iflink(dev) == dev->ifindex);

		dev->ifindex = dev_new_index(net);

		if (iflink)

			dev->iflink = dev->ifindex;