| From 13e99342571d74a61b70c91f17f8ecba56f4df0a Mon Sep 17 00:00:00 2001 |
| From: Ding Zhi <zhi.ding@6wind.com> |
| Date: Mon, 16 Sep 2013 11:31:15 +0200 |
| Subject: ip6_tunnels: raddr and laddr are inverted in nl msg |
| |
| From: Ding Zhi <zhi.ding@6wind.com> |
| |
| [ Upstream commit 0d2ede929f61783aebfb9228e4d32a0546ee4d23 ] |
| |
| IFLA_IPTUN_LOCAL and IFLA_IPTUN_REMOTE were inverted. |
| |
| Introduced by c075b13098b3 (ip6tnl: advertise tunnel param via rtnl). |
| |
| Signed-off-by: Ding Zhi <zhi.ding@6wind.com> |
| Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/ipv6/ip6_tunnel.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/net/ipv6/ip6_tunnel.c |
| +++ b/net/ipv6/ip6_tunnel.c |
| @@ -1646,9 +1646,9 @@ static int ip6_tnl_fill_info(struct sk_b |
| |
| if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) || |
| nla_put(skb, IFLA_IPTUN_LOCAL, sizeof(struct in6_addr), |
| - &parm->raddr) || |
| - nla_put(skb, IFLA_IPTUN_REMOTE, sizeof(struct in6_addr), |
| &parm->laddr) || |
| + nla_put(skb, IFLA_IPTUN_REMOTE, sizeof(struct in6_addr), |
| + &parm->raddr) || |
| nla_put_u8(skb, IFLA_IPTUN_TTL, parm->hop_limit) || |
| nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) || |
| nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) || |
