diff options
| author |   Patrick McHardy <kaber@trash.net> | 2008-10-10 12:10:30 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-10-10 12:10:30 -0700 |
| commit | ba9e64b1c23f1dd22fea14c310f739d84ac8b748 (patch) | |
| tree | 2d7713503d2f2af40f4740718b785f6c6df78fdf /net | |
| parent | enic: Attempt to fix build in 32-bit such as i386. (diff) | |
| download | linux-dev-ba9e64b1c23f1dd22fea14c310f739d84ac8b748.tar.xz linux-dev-ba9e64b1c23f1dd22fea14c310f739d84ac8b748.zip | |
gre: fix copy and paste error
The flags are dumped twice, the keys not at all.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ip_gre.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 0d5e35b0ed54..c0755e98b810 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); |