diff options
| author | Haishuang Yan <yanhaishuang@cmss.chinamobile.com> | 2016-05-11 18:48:31 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-12 16:53:58 -0400 |
| commit | 23f72215bc030d1eea437713abfef91c635e2e1f (patch) | |
| tree | e9a83a6a8d47099e62706f7aab0caf309c3e93e0 /net | |
| parent | 27ee441a43392ebe5b027fe5d78640e839673d21 (diff) | |
| download | linux-stable-23f72215bc030d1eea437713abfef91c635e2e1f.tar.gz linux-stable-23f72215bc030d1eea437713abfef91c635e2e1f.tar.bz2 linux-stable-23f72215bc030d1eea437713abfef91c635e2e1f.zip | |
ip6_gre: Fix get_size calculation for gre6 tunnel
Do not include attribute IFLA_GRE_TOS.
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/ip6_gre.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index ee62ec469ab3..3c25fe67d3da 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -1394,8 +1394,6 @@ static size_t ip6gre_get_size(const struct net_device *dev) nla_total_size(sizeof(struct in6_addr)) + /* IFLA_GRE_TTL */ nla_total_size(1) + - /* IFLA_GRE_TOS */ - nla_total_size(1) + /* IFLA_GRE_ENCAP_LIMIT */ nla_total_size(1) + /* IFLA_GRE_FLOWINFO */ @@ -1420,7 +1418,6 @@ static int ip6gre_fill_info(struct sk_buff *skb, const struct net_device *dev) nla_put_in6_addr(skb, IFLA_GRE_LOCAL, &p->laddr) || nla_put_in6_addr(skb, IFLA_GRE_REMOTE, &p->raddr) || nla_put_u8(skb, IFLA_GRE_TTL, p->hop_limit) || - /*nla_put_u8(skb, IFLA_GRE_TOS, t->priority) ||*/ nla_put_u8(skb, IFLA_GRE_ENCAP_LIMIT, p->encap_limit) || nla_put_be32(skb, IFLA_GRE_FLOWINFO, p->flowinfo) || nla_put_u32(skb, IFLA_GRE_FLAGS, p->flags)) |