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

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

Merge branch 'link_netns_advertise' 



Nicolas Dichtel says:

====================
netns: advertise netns via netlink

The first patch of the series fix a bug of the previous series (present in
net-next only).
The rest of the series adds an attribute to advertise the peer netns for
rtnetlink messages where this information is needed by userland to be able to
interpret fully the received message.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d7924450 193523bf

drivers/net/macvlan.c

+6 −0
Original line number Diff line number Diff line
@@ -1471,11 +1471,17 @@ int macvlan_link_register(struct rtnl_link_ops *ops) 
};

EXPORT_SYMBOL_GPL(macvlan_link_register);



static struct net *macvlan_get_link_net(const struct net_device *dev)

{

	return dev_net(macvlan_dev_real_dev(dev));

}



static struct rtnl_link_ops macvlan_link_ops = {

	.kind		= "macvlan",

	.setup		= macvlan_setup,

	.newlink	= macvlan_newlink,

	.dellink	= macvlan_dellink,

	.get_link_net	= macvlan_get_link_net,

};



static int macvlan_device_event(struct notifier_block *unused,

drivers/net/veth.c

+9 −0
Original line number Diff line number Diff line
@@ -469,6 +469,14 @@ static const struct nla_policy veth_policy[VETH_INFO_MAX + 1] = { 
	[VETH_INFO_PEER]	= { .len = sizeof(struct ifinfomsg) },

};



static struct net *veth_get_link_net(const struct net_device *dev)

{

	struct veth_priv *priv = netdev_priv(dev);

	struct net_device *peer = rtnl_dereference(priv->peer);



	return peer ? dev_net(peer) : dev_net(dev);

}



static struct rtnl_link_ops veth_link_ops = {

	.kind		= DRV_NAME,

	.priv_size	= sizeof(struct veth_priv),
@@ -478,6 +486,7 @@ static struct rtnl_link_ops veth_link_ops = { 
	.dellink	= veth_dellink,

	.policy		= veth_policy,

	.maxtype	= VETH_INFO_MAX,

	.get_link_net	= veth_get_link_net,

};



/*

drivers/net/vxlan.c

+5 −0
Original line number Diff line number Diff line
@@ -339,6 +339,11 @@ static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan, 
	ndm->ndm_flags = fdb->flags;

	ndm->ndm_type = RTN_UNICAST;



	if (!net_eq(dev_net(vxlan->dev), vxlan->net) &&

	    nla_put_s32(skb, NDA_NDM_IFINDEX_NETNSID,

			peernet2id(vxlan->net, dev_net(vxlan->dev))))

		goto nla_put_failure;



	if (send_eth && nla_put(skb, NDA_LLADDR, ETH_ALEN, &fdb->eth_addr))

		goto nla_put_failure;

include/uapi/linux/neighbour.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ enum { 
	NDA_VNI,

	NDA_IFINDEX,

	NDA_MASTER,

	NDA_NDM_IFINDEX_NETNSID,

	__NDA_MAX

};

net/8021q/vlan_netlink.c

+8 −0
Original line number Diff line number Diff line
@@ -238,6 +238,13 @@ static int vlan_fill_info(struct sk_buff *skb, const struct net_device *dev) 
	return -EMSGSIZE;

}



static struct net *vlan_get_link_net(const struct net_device *dev)

{

	struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;



	return dev_net(real_dev);

}



struct rtnl_link_ops vlan_link_ops __read_mostly = {

	.kind		= "vlan",

	.maxtype	= IFLA_VLAN_MAX,
@@ -250,6 +257,7 @@ struct rtnl_link_ops vlan_link_ops __read_mostly = { 
	.dellink	= unregister_vlan_dev,

	.get_size	= vlan_get_size,

	.fill_info	= vlan_fill_info,

	.get_link_net	= vlan_get_link_net,

};



int __init vlan_netlink_init(void)