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

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

tunnels: advertise link netns via netlink 



Implement rtnl_link_ops->get_link_net() callback so that IFLA_LINK_NETNSID is
added to rtnetlink messages.

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

drivers/net/vxlan.c

+8 −0
Original line number Diff line number Diff line
@@ -2923,6 +2923,13 @@ nla_put_failure: 
	return -EMSGSIZE;

}



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

{

	struct vxlan_dev *vxlan = netdev_priv(dev);



	return vxlan->net;

}



static struct rtnl_link_ops vxlan_link_ops __read_mostly = {

	.kind		= "vxlan",

	.maxtype	= IFLA_VXLAN_MAX,
@@ -2934,6 +2941,7 @@ static struct rtnl_link_ops vxlan_link_ops __read_mostly = { 
	.dellink	= vxlan_dellink,

	.get_size	= vxlan_get_size,

	.fill_info	= vxlan_fill_info,

	.get_link_net	= vxlan_get_link_net,

};



static void vxlan_handle_lowerdev_unregister(struct vxlan_net *vn,

include/net/ip6_tunnel.h

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ int ip6_tnl_xmit_ctl(struct ip6_tnl *t, const struct in6_addr *laddr, 
__u16 ip6_tnl_parse_tlv_enc_lim(struct sk_buff *skb, __u8 *raw);

__u32 ip6_tnl_get_cap(struct ip6_tnl *t, const struct in6_addr *laddr,

			     const struct in6_addr *raddr);

struct net *ip6_tnl_get_link_net(const struct net_device *dev);



static inline void ip6tunnel_xmit(struct sk_buff *skb, struct net_device *dev)

{

include/net/ip_tunnels.h

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ int ip_tunnel_encap_del_ops(const struct ip_tunnel_encap_ops *op, 
int ip_tunnel_init(struct net_device *dev);

void ip_tunnel_uninit(struct net_device *dev);

void  ip_tunnel_dellink(struct net_device *dev, struct list_head *head);

struct net *ip_tunnel_get_link_net(const struct net_device *dev);

int ip_tunnel_init_net(struct net *net, int ip_tnl_net_id,

		       struct rtnl_link_ops *ops, char *devname);

net/ipv4/ip_gre.c

+2 −0
Original line number Diff line number Diff line
@@ -829,6 +829,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = { 
	.dellink	= ip_tunnel_dellink,

	.get_size	= ipgre_get_size,

	.fill_info	= ipgre_fill_info,

	.get_link_net	= ip_tunnel_get_link_net,

};



static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
@@ -843,6 +844,7 @@ static struct rtnl_link_ops ipgre_tap_ops __read_mostly = { 
	.dellink	= ip_tunnel_dellink,

	.get_size	= ipgre_get_size,

	.fill_info	= ipgre_fill_info,

	.get_link_net	= ip_tunnel_get_link_net,

};



static int __net_init ipgre_tap_init_net(struct net *net)

net/ipv4/ip_tunnel.c

+8 −0
Original line number Diff line number Diff line
@@ -972,6 +972,14 @@ void ip_tunnel_dellink(struct net_device *dev, struct list_head *head) 
}

EXPORT_SYMBOL_GPL(ip_tunnel_dellink);



struct net *ip_tunnel_get_link_net(const struct net_device *dev)

{

	struct ip_tunnel *tunnel = netdev_priv(dev);



	return tunnel->net;

}

EXPORT_SYMBOL(ip_tunnel_get_link_net);



int ip_tunnel_init_net(struct net *net, int ip_tnl_net_id,

				  struct rtnl_link_ops *ops, char *devname)

{