Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit befe2aa1 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

ipip/rtnl: add IFLA_IPTUN_PMTUDISC on dump 



This parameter was missing in the dump.

Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c38cc4b5

include/uapi/linux/if_tunnel.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ enum { 
	IFLA_IPTUN_FLOWINFO,

	IFLA_IPTUN_FLOWINFO,

	IFLA_IPTUN_FLAGS,

	IFLA_IPTUN_FLAGS,

	IFLA_IPTUN_PROTO,

	IFLA_IPTUN_PROTO,

	IFLA_IPTUN_PMTUDISC,

	__IFLA_IPTUN_MAX,

	__IFLA_IPTUN_MAX,

};

};

#define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)

#define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)

net/ipv4/ipip.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -835,6 +835,8 @@ static size_t ipip_get_size(const struct net_device *dev) 
		nla_total_size(1) +

		nla_total_size(1) +

		/* IFLA_IPTUN_TOS */

		/* IFLA_IPTUN_TOS */

		nla_total_size(1) +

		nla_total_size(1) +

		/* IFLA_IPTUN_PMTUDISC */

		nla_total_size(1) +

		0;

		0;

}

}
@@ -847,7 +849,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_LOCAL, parm->iph.saddr) ||

	    nla_put_be32(skb, IFLA_IPTUN_REMOTE, parm->iph.daddr) ||

	    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_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;

		goto nla_put_failure;

	return 0;

	return 0;