From e5d56730a5ee48064ef33c2bbff46153cd7470ee Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Fri, 10 Oct 2008 12:10:30 -0700 Subject: [PATCH] --- yaml --- r: 112247 b: refs/heads/master c: ba9e64b1c23f1dd22fea14c310f739d84ac8b748 h: refs/heads/master i: 112245: 265f65dcf9aab0f9e974434ab650aa932aaa40c2 112243: 45f3ef025078bc7d1a3ba111147669a45faf5e10 112239: 88bd09466f8bde09b02a3c6e4888467d88b3cbb7 v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_gre.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e4f5ba4bbcb7..980534926656 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55ed31e62d18094337319b942b38cfc00360444b +refs/heads/master: ba9e64b1c23f1dd22fea14c310f739d84ac8b748 diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c index 0d5e35b0ed54..c0755e98b810 100644 --- a/trunk/net/ipv4/ip_gre.c +++ b/trunk/net/ipv4/ip_gre.c @@ -1539,8 +1539,8 @@ static int ipgre_fill_info(struct sk_buff *skb, const struct net_device *dev) NLA_PUT_U32(skb, IFLA_GRE_LINK, p->link); NLA_PUT_BE16(skb, IFLA_GRE_IFLAGS, p->i_flags); NLA_PUT_BE16(skb, IFLA_GRE_OFLAGS, p->o_flags); - NLA_PUT_BE32(skb, IFLA_GRE_IFLAGS, p->i_flags); - NLA_PUT_BE32(skb, IFLA_GRE_OFLAGS, p->o_flags); + NLA_PUT_BE32(skb, IFLA_GRE_IKEY, p->i_key); + NLA_PUT_BE32(skb, IFLA_GRE_OKEY, p->o_key); NLA_PUT(skb, IFLA_GRE_LOCAL, 4, &p->iph.saddr); NLA_PUT(skb, IFLA_GRE_REMOTE, 4, &p->iph.daddr); NLA_PUT_U8(skb, IFLA_GRE_TTL, p->iph.ttl);