git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
datapath
/
vport-vxlan.c
diff --git
a/datapath/vport-vxlan.c
b/datapath/vport-vxlan.c
index
708283e
..
7ff51fd
100644
(file)
--- a/
datapath/vport-vxlan.c
+++ b/
datapath/vport-vxlan.c
@@
-135,7
+135,7
@@
static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
/* Save outer tunnel values */
iph = ip_hdr(skb);
- tnl_tun_key_init(&tun_key, iph, key,
OVS_TNL_F
_KEY);
+ tnl_tun_key_init(&tun_key, iph, key,
TUNNEL
_KEY);
ovs_tnl_rcv(vport_from_priv(vxlan_vport), skb, &tun_key);
goto out;