* gre: fix copy and paste error
@ 2008-10-10 15:54 Patrick McHardy
2008-10-10 15:57 ` Herbert Xu
0 siblings, 1 reply; 3+ messages in thread
From: Patrick McHardy @ 2008-10-10 15:54 UTC (permalink / raw)
To: Herbert Xu, David S. Miller, Linux Netdev List
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 01.diff --]
[-- Type: text/x-patch, Size: 992 bytes --]
commit c7d32967f53c4d3ded69f0e645b7c0848ac8cb1b
Author: Patrick McHardy <kaber@trash.net>
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 <kaber@trash.net>
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 0d5e35b..c0755e9 100644
--- a/net/ipv4/ip_gre.c
+++ b/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);
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: gre: fix copy and paste error
2008-10-10 15:54 gre: fix copy and paste error Patrick McHardy
@ 2008-10-10 15:57 ` Herbert Xu
2008-10-10 19:10 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Herbert Xu @ 2008-10-10 15:57 UTC (permalink / raw)
To: Patrick McHardy; +Cc: David S. Miller, Linux Netdev List
On Fri, Oct 10, 2008 at 05:54:40PM +0200, Patrick McHardy wrote:
> commit c7d32967f53c4d3ded69f0e645b7c0848ac8cb1b
> Author: Patrick McHardy <kaber@trash.net>
> 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 <kaber@trash.net>
Good catch.
Thanks Patrick!
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: gre: fix copy and paste error
2008-10-10 15:57 ` Herbert Xu
@ 2008-10-10 19:10 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2008-10-10 19:10 UTC (permalink / raw)
To: herbert; +Cc: kaber, netdev
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Fri, 10 Oct 2008 23:57:32 +0800
> On Fri, Oct 10, 2008 at 05:54:40PM +0200, Patrick McHardy wrote:
>
> > commit c7d32967f53c4d3ded69f0e645b7c0848ac8cb1b
> > Author: Patrick McHardy <kaber@trash.net>
> > 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 <kaber@trash.net>
>
> Good catch.
>
> Thanks Patrick!
Applied, thanks everyone.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-10-10 19:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-10 15:54 gre: fix copy and paste error Patrick McHardy
2008-10-10 15:57 ` Herbert Xu
2008-10-10 19:10 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox