From patchwork Wed Nov 14 15:14:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 198938 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4DC2C2C008E for ; Thu, 15 Nov 2012 02:16:30 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422671Ab2KNPQ1 (ORCPT ); Wed, 14 Nov 2012 10:16:27 -0500 Received: from 33.106-14-84.ripe.coltfrance.com ([84.14.106.33]:34749 "EHLO proxy.6wind.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964811Ab2KNPQM (ORCPT ); Wed, 14 Nov 2012 10:16:12 -0500 Received: from schnaps.dev.6wind.com (unknown [10.16.0.249]) by proxy.6wind.com (Postfix) with ESMTPS id 0357C5A557; Wed, 14 Nov 2012 16:16:09 +0100 (CET) Received: from root by schnaps.dev.6wind.com with local (Exim 4.80) (envelope-from ) id 1TYei8-00035k-VY; Wed, 14 Nov 2012 16:17:04 +0100 From: Nicolas Dichtel To: netdev@vger.kernel.org Cc: davem@davemloft.net, eric.dumazet@gmail.com, Nicolas Dichtel Subject: [PATCH net-next 08/10] sit/rtnl: add missing parameters on dump Date: Wed, 14 Nov 2012 16:14:05 +0100 Message-Id: <1352906047-11604-9-git-send-email-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1352906047-11604-1-git-send-email-nicolas.dichtel@6wind.com> References: <1352906047-11604-1-git-send-email-nicolas.dichtel@6wind.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- net/ipv6/sit.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index b2cfdda..28f56ee 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1229,6 +1229,10 @@ static size_t sit_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) + + /* IFLA_IPTUN_FLAGS */ + nla_total_size(2) + 0; } @@ -1241,7 +1245,10 @@ static int sit_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))) || + nla_put_u16(skb, IFLA_IPTUN_FLAGS, parm->i_flags)) goto nla_put_failure; return 0;