vxlan: support both IPv4 and IPv6 sockets in a single vxlan device

[cascardo/linux.git] / net / openvswitch / vport-vxlan.c

diff --git a/net/openvswitch/vport-vxlan.c b/net/openvswitch/vport-vxlan.c
index c11413d..fb3cdb8 100644 (file)
--- a/net/openvswitch/vport-vxlan.c
+++ b/net/openvswitch/vport-vxlan.c
@@ -151,7 +151,8 @@ static int vxlan_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
 {
        struct vxlan_dev *vxlan = netdev_priv(vport->dev);
        struct net *net = ovs_dp_get_net(vport->dp);
-       __be16 dst_port = vxlan_dev_dst_port(vxlan);
+       unsigned short family = ip_tunnel_info_af(upcall->egress_tun_info);
+       __be16 dst_port = vxlan_dev_dst_port(vxlan, family);
        __be16 src_port;
        int port_min;
        int port_max;