From 13beaf6242986435200e545ce636446b12df8022 Mon Sep 17 00:00:00 2001 From: Pravin B Shelar Date: Fri, 6 Sep 2013 11:39:15 -0700 Subject: [PATCH] datapath: vxlan: remove net arg from vxlan[6]_xmit_skb() Backport of upstream commit 117961878cc1 (vxlan: remove net arg from vxlan[6]_xmit_skb()). Signed-off-by: Pravin B Shelar Acked-by: Jesse Gross --- datapath/linux/compat/include/net/vxlan.h | 2 +- datapath/linux/compat/vxlan.c | 2 +- datapath/vport-vxlan.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/datapath/linux/compat/include/net/vxlan.h b/datapath/linux/compat/include/net/vxlan.h index 46cbfb603..3ac816b51 100644 --- a/datapath/linux/compat/include/net/vxlan.h +++ b/datapath/linux/compat/include/net/vxlan.h @@ -24,7 +24,7 @@ struct vxlan_sock *vxlan_sock_add(struct net *net, __be16 port, void vxlan_sock_release(struct vxlan_sock *vs); -int vxlan_xmit_skb(struct net *net, struct vxlan_sock *vs, +int vxlan_xmit_skb(struct vxlan_sock *vs, struct rtable *rt, struct sk_buff *skb, __be32 src, __be32 dst, __u8 tos, __u8 ttl, __be16 df, __be16 src_port, __be16 dst_port, __be32 vni); diff --git a/datapath/linux/compat/vxlan.c b/datapath/linux/compat/vxlan.c index 74ac0d5b0..db14f2f55 100644 --- a/datapath/linux/compat/vxlan.c +++ b/datapath/linux/compat/vxlan.c @@ -209,7 +209,7 @@ static int handle_offloads(struct sk_buff *skb) return 0; } -int vxlan_xmit_skb(struct net *net, struct vxlan_sock *vs, +int vxlan_xmit_skb(struct vxlan_sock *vs, struct rtable *rt, struct sk_buff *skb, __be32 src, __be32 dst, __u8 tos, __u8 ttl, __be16 df, __be16 src_port, __be16 dst_port, __be32 vni) diff --git a/datapath/vport-vxlan.c b/datapath/vport-vxlan.c index de49ab164..3401dfd22 100644 --- a/datapath/vport-vxlan.c +++ b/datapath/vport-vxlan.c @@ -142,7 +142,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 net *net = ovs_dp_get_net(vport->dp); struct rtable *rt; __be16 src_port; __be32 saddr; @@ -177,7 +176,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); - 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, -- 2.20.1