aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/sit.c
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2012-11-14 00:14:05 -0500
committerDavid S. Miller <davem@davemloft.net>2012-11-14 22:02:38 -0500
commita12c9a85813e927e1143989876d70697eb85aac9 (patch)
treeffdab0610923f1cfe151fe5fa16c7d284861e5d5 /net/ipv6/sit.c
parentf9cd5a5536cacc254cd6bd1d8b736a02726ab24a (diff)
sit/rtnl: add missing parameters on dump
IFLA_IPTUN_FLAGS and IFLA_IPTUN_PMTUDISC were missing. There is only one possible flag in i_flag: SIT_ISATAP. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/sit.c')
-rw-r--r--net/ipv6/sit.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index cd6a2b2d766a..69e5e7340743 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1210,6 +1210,10 @@ static size_t sit_get_size(const struct net_device *dev)
1210 nla_total_size(1) + 1210 nla_total_size(1) +
1211 /* IFLA_IPTUN_TOS */ 1211 /* IFLA_IPTUN_TOS */
1212 nla_total_size(1) + 1212 nla_total_size(1) +
1213 /* IFLA_IPTUN_PMTUDISC */
1214 nla_total_size(1) +
1215 /* IFLA_IPTUN_FLAGS */
1216 nla_total_size(2) +
1213 0; 1217 0;
1214} 1218}
1215 1219
@@ -1222,7 +1226,10 @@ static int sit_fill_info(struct sk_buff *skb, const struct net_device *dev)
1222 nla_put_be32(skb, IFLA_IPTUN_LOCAL, parm->iph.saddr) || 1226 nla_put_be32(skb, IFLA_IPTUN_LOCAL, parm->iph.saddr) ||
1223 nla_put_be32(skb, IFLA_IPTUN_REMOTE, parm->iph.daddr) || 1227 nla_put_be32(skb, IFLA_IPTUN_REMOTE, parm->iph.daddr) ||
1224 nla_put_u8(skb, IFLA_IPTUN_TTL, parm->iph.ttl) || 1228 nla_put_u8(skb, IFLA_IPTUN_TTL, parm->iph.ttl) ||
1225 nla_put_u8(skb, IFLA_IPTUN_TOS, parm->iph.tos)) 1229 nla_put_u8(skb, IFLA_IPTUN_TOS, parm->iph.tos) ||
1230 nla_put_u8(skb, IFLA_IPTUN_PMTUDISC,
1231 !!(parm->iph.frag_off & htons(IP_DF))) ||
1232 nla_put_u16(skb, IFLA_IPTUN_FLAGS, parm->i_flags))
1226 goto nla_put_failure; 1233 goto nla_put_failure;
1227 return 0; 1234 return 0;
1228 1235