]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net/sched: act_tunnel_key: Fix setting UDP dst port in metadata under IPv6
authorOr Gerlitz <ogerlitz@mellanox.com>
Thu, 22 Dec 2016 12:28:14 +0000 (14:28 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Dec 2016 16:59:56 +0000 (11:59 -0500)
The UDP dst port was provided to the helper function which sets the
IPv6 IP tunnel meta-data under a wrong param order, fix that.

Fixes: 75bfbca01e48 ('net/sched: act_tunnel_key: Add UDP dst port option')
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: Hadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/act_tunnel_key.c

index 7af712526f01eaa9ed77f33ff6030a2fe7253713..e3a58e02119877d237f9aa18c5f9d9fdfb44d0c9 100644 (file)
@@ -134,8 +134,8 @@ static int tunnel_key_init(struct net *net, struct nlattr *nla,
                        saddr = nla_get_in6_addr(tb[TCA_TUNNEL_KEY_ENC_IPV6_SRC]);
                        daddr = nla_get_in6_addr(tb[TCA_TUNNEL_KEY_ENC_IPV6_DST]);
 
-                       metadata = __ipv6_tun_set_dst(&saddr, &daddr, 0, 0, 0,
-                                                     dst_port, TUNNEL_KEY,
+                       metadata = __ipv6_tun_set_dst(&saddr, &daddr, 0, 0, dst_port,
+                                                     0, TUNNEL_KEY,
                                                      key_id, 0);
                }