diff options
author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2012-11-14 00:14:02 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-11-14 22:02:38 -0500 |
commit | befe2aa1b2c7b9b7e20e97906f99b58475608867 (patch) | |
tree | 1d06510d521ee10652a90815bc5431d7f0c8bb1f | |
parent | c38cc4b599c2fe5815af4b0c6acac48e904977b4 (diff) |
ipip/rtnl: add IFLA_IPTUN_PMTUDISC on dump
This parameter was missing in the dump.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/uapi/linux/if_tunnel.h | 1 | ||||
-rw-r--r-- | net/ipv4/ipip.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h index f5ea6b7b651f..5ab0c8ddc2bc 100644 --- a/include/uapi/linux/if_tunnel.h +++ b/include/uapi/linux/if_tunnel.h | |||
@@ -48,6 +48,7 @@ enum { | |||
48 | IFLA_IPTUN_FLOWINFO, | 48 | IFLA_IPTUN_FLOWINFO, |
49 | IFLA_IPTUN_FLAGS, | 49 | IFLA_IPTUN_FLAGS, |
50 | IFLA_IPTUN_PROTO, | 50 | IFLA_IPTUN_PROTO, |
51 | IFLA_IPTUN_PMTUDISC, | ||
51 | __IFLA_IPTUN_MAX, | 52 | __IFLA_IPTUN_MAX, |
52 | }; | 53 | }; |
53 | #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) | 54 | #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) |
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 4be88cc98957..1fc0ea4786b9 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c | |||
@@ -835,6 +835,8 @@ static size_t ipip_get_size(const struct net_device *dev) | |||
835 | nla_total_size(1) + | 835 | nla_total_size(1) + |
836 | /* IFLA_IPTUN_TOS */ | 836 | /* IFLA_IPTUN_TOS */ |
837 | nla_total_size(1) + | 837 | nla_total_size(1) + |
838 | /* IFLA_IPTUN_PMTUDISC */ | ||
839 | nla_total_size(1) + | ||
838 | 0; | 840 | 0; |
839 | } | 841 | } |
840 | 842 | ||
@@ -847,7 +849,9 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev) | |||
847 | nla_put_be32(skb, IFLA_IPTUN_LOCAL, parm->iph.saddr) || | 849 | nla_put_be32(skb, IFLA_IPTUN_LOCAL, parm->iph.saddr) || |
848 | nla_put_be32(skb, IFLA_IPTUN_REMOTE, parm->iph.daddr) || | 850 | nla_put_be32(skb, IFLA_IPTUN_REMOTE, parm->iph.daddr) || |
849 | nla_put_u8(skb, IFLA_IPTUN_TTL, parm->iph.ttl) || | 851 | nla_put_u8(skb, IFLA_IPTUN_TTL, parm->iph.ttl) || |
850 | nla_put_u8(skb, IFLA_IPTUN_TOS, parm->iph.tos)) | 852 | nla_put_u8(skb, IFLA_IPTUN_TOS, parm->iph.tos) || |
853 | nla_put_u8(skb, IFLA_IPTUN_PMTUDISC, | ||
854 | !!(parm->iph.frag_off & htons(IP_DF)))) | ||
851 | goto nla_put_failure; | 855 | goto nla_put_failure; |
852 | return 0; | 856 | return 0; |
853 | 857 | ||