History

gre6: fix rtnl dump messages

Spotted after a code review. Introduced by c12b395a46646bab69089ce7016ac78177f6001f (gre: Support GRE over IPv6).

Nicolas Dichtel committed 14 years ago

Commit a3754131 parent 103cdd11 file · +4 −4Browse files

Unified · Split

net/ipv6/ip6_gre.c+4−4
@@ -1633,9 +1633,9 @@ static size_t ip6gre_get_size(const struct net_device *dev) · 1632 unmodified lines
16331633 /* IFLA_GRE_OKEY */
16341634 nla_total_size(4) +
16351635 /* IFLA_GRE_LOCAL */
1636− nla_total_size(4) +
1636+ nla_total_size(sizeof(struct in6_addr)) +
16371637 /* IFLA_GRE_REMOTE */
1638− nla_total_size(4) +
1638+ nla_total_size(sizeof(struct in6_addr)) +
16391639 /* IFLA_GRE_TTL */
16401640 nla_total_size(1) +
16411641 /* IFLA_GRE_TOS */
@@ -1659,8 +1659,8 @@ static int ip6gre_fill_info(struct sk_buff *skb, const struct net_device *dev) · 17 unmodified lines
16591659 nla_put_be16(skb, IFLA_GRE_OFLAGS, p->o_flags) ||
16601660 nla_put_be32(skb, IFLA_GRE_IKEY, p->i_key) ||
16611661 nla_put_be32(skb, IFLA_GRE_OKEY, p->o_key) ||
1662− nla_put(skb, IFLA_GRE_LOCAL, sizeof(struct in6_addr), &p->raddr) ||
1663− nla_put(skb, IFLA_GRE_REMOTE, sizeof(struct in6_addr), &p->laddr) ||
1662+ nla_put(skb, IFLA_GRE_LOCAL, sizeof(struct in6_addr), &p->laddr) ||
1663+ nla_put(skb, IFLA_GRE_REMOTE, sizeof(struct in6_addr), &p->raddr) ||
16641664 nla_put_u8(skb, IFLA_GRE_TTL, p->hop_limit) ||
16651665 /*nla_put_u8(skb, IFLA_GRE_TOS, t->priority) ||*/
16661666 nla_put_u8(skb, IFLA_GRE_ENCAP_LIMIT, p->encap_limit) ||