openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nicolas Dichtel 2012-11-14 05:13:58 +00:00 committed by David S. Miller
parent 96800ee73c
commit cfa323b6b9
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/uapi/linux/if_tunnel.h
View File

@ -47,6 +47,7 @@ enum {
IFLA_IPTUN_ENCAP_LIMIT, IFLA_IPTUN_ENCAP_LIMIT,
IFLA_IPTUN_FLOWINFO, IFLA_IPTUN_FLOWINFO,
IFLA_IPTUN_FLAGS, IFLA_IPTUN_FLAGS,
IFLA_IPTUN_PROTO,
__IFLA_IPTUN_MAX, __IFLA_IPTUN_MAX,
}; };
#define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1)

5
net/ipv6/ip6_tunnel.c
View File

@ -1515,6 +1515,8 @@ static size_t ip6_get_size(const struct net_device *dev)
nla_total_size(4) + nla_total_size(4) +
/* IFLA_IPTUN_FLAGS */ /* IFLA_IPTUN_FLAGS */
nla_total_size(4) + nla_total_size(4) +
/* IFLA_IPTUN_PROTO */
nla_total_size(1) +
0; 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_TTL, parm->hop_limit) ||
nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) || nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) ||
nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) || 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; goto nla_put_failure;
return 0; return 0;