gre: fix copy and paste error

PATCH Applied Patrick McHardy 3 participants 3 messages Oct 10, 2008

Subsystems (3)

Networking Network drivers IPv4/IPv6

lore

Share & tools

lore

Patrick McHardy

author

2008-10-10 15:54 UTC #0 lore raw

commit c7d32967f53c4d3ded69f0e645b7c0848ac8cb1b

Author: Patrick McHardy <[email protected]>
Date:   Fri Oct 10 17:53:36 2008 +0200

gre: fix copy and paste error

The flags are dumped twice, the keys not at all.

Signed-off-by Patrick McHardy <[email protected]>

net/ipv4/ip_gre.c +2 -2

index 0d5e35b..c0755e9 100644
@@ -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);

Herbert Xu

2008-10-10 15:57 UTC #1 lore raw

Quoted 9 lines · Patrick McHardy

commit c7d32967f53c4d3ded69f0e645b7c0848ac8cb1b
Author: Patrick McHardy <[email protected]>
Date:   Fri Oct 10 17:53:36 2008 +0200
gre: fix copy and paste error
The flags are dumped twice, the keys not at all.
Signed-off-by Patrick McHardy <[email protected]>

Good catch.

Thanks Patrick!

Signature · 4 lines

Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

David Miller

maintainer Applied

2008-10-10 19:11 UTC #2 lore raw

From: Herbert Xu <[email protected]>
Date: Fri, 10 Oct 2008 23:57:32 +0800

Quoted 8 lines · Patrick McHardy

Quoted 7 lines
commit c7d32967f53c4d3ded69f0e645b7c0848ac8cb1b
Author: Patrick McHardy <[email protected]>
Date:   Fri Oct 10 17:53:36 2008 +0200
gre: fix copy and paste error

Quoted 7 lines

Quoted 3 lines
The flags are dumped twice, the keys not at all.
Signed-off-by Patrick McHardy <[email protected]>
Good catch.
Thanks Patrick!

Applied, thanks everyone.