From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, eric.dumazet@gmail.com,
Nicolas Dichtel <nicolas.dichtel@6wind.com>
Subject: [PATCH net-next 05/10] ipip/rtnl: add IFLA_IPTUN_PMTUDISC on dump
Date: Wed, 14 Nov 2012 16:14:02 +0100 [thread overview]
Message-ID: <1352906047-11604-6-git-send-email-nicolas.dichtel@6wind.com> (raw)
In-Reply-To: <1352906047-11604-1-git-send-email-nicolas.dichtel@6wind.com>
This parameter was missing in the dump.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
include/uapi/linux/if_tunnel.h | 1 +
net/ipv4/ipip.c | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
index f5ea6b7..5ab0c8d 100644
--- a/include/uapi/linux/if_tunnel.h
+++ b/include/uapi/linux/if_tunnel.h
@@ -48,6 +48,7 @@ enum {
IFLA_IPTUN_FLOWINFO,
IFLA_IPTUN_FLAGS,
IFLA_IPTUN_PROTO,
+ IFLA_IPTUN_PMTUDISC,
__IFLA_IPTUN_MAX,
};
#define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1)
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 40984fa..1204da3 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -854,6 +854,8 @@ static size_t ipip_get_size(const struct net_device *dev)
nla_total_size(1) +
/* IFLA_IPTUN_TOS */
nla_total_size(1) +
+ /* IFLA_IPTUN_PMTUDISC */
+ nla_total_size(1) +
0;
}
@@ -866,7 +868,9 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev)
nla_put_be32(skb, IFLA_IPTUN_LOCAL, parm->iph.saddr) ||
nla_put_be32(skb, IFLA_IPTUN_REMOTE, parm->iph.daddr) ||
nla_put_u8(skb, IFLA_IPTUN_TTL, parm->iph.ttl) ||
- nla_put_u8(skb, IFLA_IPTUN_TOS, parm->iph.tos))
+ nla_put_u8(skb, IFLA_IPTUN_TOS, parm->iph.tos) ||
+ nla_put_u8(skb, IFLA_IPTUN_PMTUDISC,
+ !!(parm->iph.frag_off & htons(IP_DF))))
goto nla_put_failure;
return 0;
--
1.7.12
next prev parent reply other threads:[~2012-11-14 15:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-14 15:13 [PATCH net-next 0/10] Add support of tunnel management via rtnetlink Nicolas Dichtel
2012-11-14 15:13 ` [PATCH net-next 01/10] ip6tnl/rtnl: add IFLA_IPTUN_PROTO on dump Nicolas Dichtel
2012-11-14 15:13 ` [PATCH net-next 02/10] ip6tnl: rename rtnl functions for consistency Nicolas Dichtel
2012-11-14 15:14 ` [PATCH net-next 03/10] ip6tnl: add support of link creation via rtnl Nicolas Dichtel
2012-11-14 15:14 ` [PATCH net-next 04/10] ipip: always notify change when params are updated Nicolas Dichtel
2012-11-14 15:14 ` Nicolas Dichtel [this message]
2012-11-14 15:14 ` [PATCH net-next 06/10] ipip: add support of link creation via rtnl Nicolas Dichtel
2012-11-14 15:14 ` [PATCH net-next 07/10] sit: always notify change when params are updated Nicolas Dichtel
2012-11-14 15:14 ` [PATCH net-next 08/10] sit/rtnl: add missing parameters on dump Nicolas Dichtel
2012-11-14 15:14 ` [PATCH net-next 09/10] sit: rename rtnl functions for consistency Nicolas Dichtel
2012-11-14 15:14 ` [PATCH net-next 10/10] sit: add support of link creation via rtnl Nicolas Dichtel
2012-11-15 3:03 ` [PATCH net-next 0/10] Add support of tunnel management via rtnetlink David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1352906047-11604-6-git-send-email-nicolas.dichtel@6wind.com \
--to=nicolas.dichtel@6wind.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox