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
datapath: Change ovs_flow_tbl_lookup_xx() APIs
[sliver-openvswitch.git]
/
datapath
/
vport-vxlan.c
diff --git
a/datapath/vport-vxlan.c
b/datapath/vport-vxlan.c
index
de49ab1
..
ab2b6f7
100644
(file)
--- a/
datapath/vport-vxlan.c
+++ b/
datapath/vport-vxlan.c
@@
-31,7
+31,6
@@
#include <net/ip.h>
#include <net/udp.h>
#include <net/ip_tunnels.h>
#include <net/ip.h>
#include <net/udp.h>
#include <net/ip_tunnels.h>
-#include <net/udp.h>
#include <net/rtnetlink.h>
#include <net/route.h>
#include <net/dsfield.h>
#include <net/rtnetlink.h>
#include <net/route.h>
#include <net/dsfield.h>
@@
-142,7
+141,6
@@
static int vxlan_tnl_send(struct vport *vport, struct sk_buff *skb)
{
struct vxlan_port *vxlan_port = vxlan_vport(vport);
__be16 dst_port = inet_sport(vxlan_port->vs->sock->sk);
{
struct vxlan_port *vxlan_port = vxlan_vport(vport);
__be16 dst_port = inet_sport(vxlan_port->vs->sock->sk);
- struct net *net = ovs_dp_get_net(vport->dp);
struct rtable *rt;
__be16 src_port;
__be32 saddr;
struct rtable *rt;
__be16 src_port;
__be32 saddr;
@@
-177,7
+175,7
@@
static int vxlan_tnl_send(struct vport *vport, struct sk_buff *skb)
inet_get_local_port_range(&port_min, &port_max);
src_port = vxlan_src_port(port_min, port_max, skb);
inet_get_local_port_range(&port_min, &port_max);
src_port = vxlan_src_port(port_min, port_max, skb);
- err = vxlan_xmit_skb(
net,
vxlan_port->vs, rt, skb,
+ err = vxlan_xmit_skb(vxlan_port->vs, rt, skb,
saddr, OVS_CB(skb)->tun_key->ipv4_dst,
OVS_CB(skb)->tun_key->ipv4_tos,
OVS_CB(skb)->tun_key->ipv4_ttl, df,
saddr, OVS_CB(skb)->tun_key->ipv4_dst,
OVS_CB(skb)->tun_key->ipv4_tos,
OVS_CB(skb)->tun_key->ipv4_ttl, df,