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

ip6tnl/rtnl: add IFLA_IPTUN_PROTO on dump 



IPv6 tunnels can have three mode: 4in6, 6in6 and xin6.
This information was missing in the netlink message.

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

include/uapi/linux/if_tunnel.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ enum { 
	IFLA_IPTUN_ENCAP_LIMIT,

	IFLA_IPTUN_FLOWINFO,

	IFLA_IPTUN_FLAGS,

	IFLA_IPTUN_PROTO,

	__IFLA_IPTUN_MAX,

};

#define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)

net/ipv6/ip6_tunnel.c

+4 −1
Original line number Diff line number Diff line
@@ -1515,6 +1515,8 @@ static size_t ip6_get_size(const struct net_device *dev) 
		nla_total_size(4) +

		/* IFLA_IPTUN_FLAGS */

		nla_total_size(4) +

		/* IFLA_IPTUN_PROTO */

		nla_total_size(1) +

		0;

}
@@ -1531,7 +1533,8 @@ static int ip6_fill_info(struct sk_buff *skb, const struct net_device *dev) 
	    nla_put_u8(skb, IFLA_IPTUN_TTL, parm->hop_limit) ||

	    nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) ||

	    nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||

	    nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags))

	    nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||

	    nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto))

		goto nla_put_failure;

	return 0;