diff options
| author | Thomas Graf <tgraf@noironetworks.com> | 2015-01-07 12:55:49 +0100 |
|---|---|---|
| committer | Thomas Graf <tgraf@noironetworks.com> | 2015-01-07 12:55:49 +0100 |
| commit | 7ab1a0d8e3851067366f2af22b9aec87cd7083bc (patch) | |
| tree | 312173e084f89a06e30c56ea42bd20401e37dd26 | |
| parent | 1dfb9f31f33e7e01944163d43a0e095ddd8dd31e (diff) | |
| download | openvswitch-7ab1a0d8e3851067366f2af22b9aec87cd7083bc.tar.gz | |
datapath: Account for new flags args of vxlan_sock_add()
The upstream commit 359a0ea
("vxlan: Add support for UDP checksums (v4 sending, v6 zero csums)")
has introduced a new flags argument to vxlan_sock_add().
OVS does not pass any flags at this point, thus specyfing 0 will be
compatible with both the old ipv6 bool and the new u32 flags argument.
Upstream: 359a0ea ("vxlan: Add support for UDP checksums (v4 sending, v6 zero csums)")
Signed-off-by: Thomas Graf <tgraf@noironetworks.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
| -rw-r--r-- | datapath/linux/compat/include/net/vxlan.h | 2 | ||||
| -rw-r--r-- | datapath/linux/compat/vxlan.c | 2 | ||||
| -rw-r--r-- | datapath/vport-vxlan.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/datapath/linux/compat/include/net/vxlan.h b/datapath/linux/compat/include/net/vxlan.h index 5fc4dea92..83e921076 100644 --- a/datapath/linux/compat/include/net/vxlan.h +++ b/datapath/linux/compat/include/net/vxlan.h @@ -53,7 +53,7 @@ struct vxlan_sock { struct vxlan_sock *vxlan_sock_add(struct net *net, __be16 port, vxlan_rcv_t *rcv, void *data, - bool no_share, bool ipv6); + bool no_share, u32 flags); void vxlan_sock_release(struct vxlan_sock *vs); diff --git a/datapath/linux/compat/vxlan.c b/datapath/linux/compat/vxlan.c index 49d3864e4..c509ee8a5 100644 --- a/datapath/linux/compat/vxlan.c +++ b/datapath/linux/compat/vxlan.c @@ -299,7 +299,7 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, __be16 port, struct vxlan_sock *vxlan_sock_add(struct net *net, __be16 port, vxlan_rcv_t *rcv, void *data, - bool no_share, bool ipv6) + bool no_share, u32 flags) { return vxlan_socket_create(net, port, rcv, data); } diff --git a/datapath/vport-vxlan.c b/datapath/vport-vxlan.c index 81347f2f8..c9e356e99 100644 --- a/datapath/vport-vxlan.c +++ b/datapath/vport-vxlan.c @@ -126,7 +126,7 @@ static struct vport *vxlan_tnl_create(const struct vport_parms *parms) vxlan_port = vxlan_vport(vport); strncpy(vxlan_port->name, parms->name, IFNAMSIZ); - vs = vxlan_sock_add(net, htons(dst_port), vxlan_rcv, vport, true, false); + vs = vxlan_sock_add(net, htons(dst_port), vxlan_rcv, vport, true, 0); if (IS_ERR(vs)) { ovs_vport_free(vport); return (void *)vs; |