From 2b897011eeb4a0b06fc555009b2b3e138b809a0d Mon Sep 17 00:00:00 2001 From: Pravin B Shelar Date: Fri, 6 Sep 2013 11:39:09 -0700 Subject: [PATCH 1/1] datapath: iptunnels: remove net arg from iptunnel_xmit(). Backport of upstream commit 8b7ed2d91d6af (iptunnels: remove net arg from iptunnel_xmit()). Signed-off-by: Pravin B Shelar Acked-by: Jesse Gross --- datapath/linux/compat/include/net/ip_tunnels.h | 2 +- datapath/linux/compat/ip_tunnels_core.c | 2 +- datapath/linux/compat/vxlan.c | 3 +-- datapath/vport-gre.c | 3 +-- datapath/vport-lisp.c | 3 +-- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/datapath/linux/compat/include/net/ip_tunnels.h b/datapath/linux/compat/include/net/ip_tunnels.h index 14f55d068..a786aa99d 100644 --- a/datapath/linux/compat/include/net/ip_tunnels.h +++ b/datapath/linux/compat/include/net/ip_tunnels.h @@ -31,7 +31,7 @@ struct tnl_ptk_info { #define PACKET_RCVD 0 #define PACKET_REJECT 1 -int iptunnel_xmit(struct net *net, struct rtable *rt, +int iptunnel_xmit(struct rtable *rt, struct sk_buff *skb, __be32 src, __be32 dst, __u8 proto, __u8 tos, __u8 ttl, __be16 df); diff --git a/datapath/linux/compat/ip_tunnels_core.c b/datapath/linux/compat/ip_tunnels_core.c index f9f6caeba..66d5e0252 100644 --- a/datapath/linux/compat/ip_tunnels_core.c +++ b/datapath/linux/compat/ip_tunnels_core.c @@ -34,7 +34,7 @@ #include "compat.h" #include "gso.h" -int iptunnel_xmit(struct net *net, struct rtable *rt, +int iptunnel_xmit(struct rtable *rt, struct sk_buff *skb, __be32 src, __be32 dst, __u8 proto, __u8 tos, __u8 ttl, __be16 df) diff --git a/datapath/linux/compat/vxlan.c b/datapath/linux/compat/vxlan.c index d774b6c3c..74ac0d5b0 100644 --- a/datapath/linux/compat/vxlan.c +++ b/datapath/linux/compat/vxlan.c @@ -259,8 +259,7 @@ int vxlan_xmit_skb(struct net *net, struct vxlan_sock *vs, if (err) return err; - return iptunnel_xmit(net, rt, skb, src, dst, - IPPROTO_UDP, tos, ttl, df); + return iptunnel_xmit(rt, skb, src, dst, IPPROTO_UDP, tos, ttl, df); } static void rcu_free_vs(struct rcu_head *rcu) diff --git a/datapath/vport-gre.c b/datapath/vport-gre.c index a49002f41..b6c1d6f0b 100644 --- a/datapath/vport-gre.c +++ b/datapath/vport-gre.c @@ -122,7 +122,6 @@ static int __send(struct vport *vport, struct sk_buff *skb, int tunnel_hlen, __be32 seq, __be16 gre64_flag) { - struct net *net = ovs_dp_get_net(vport->dp); struct rtable *rt; int min_headroom; __be16 df; @@ -178,7 +177,7 @@ static int __send(struct vport *vport, struct sk_buff *skb, skb->local_df = 1; - return iptunnel_xmit(net, rt, skb, saddr, + return iptunnel_xmit(rt, skb, saddr, OVS_CB(skb)->tun_key->ipv4_dst, IPPROTO_GRE, OVS_CB(skb)->tun_key->ipv4_tos, OVS_CB(skb)->tun_key->ipv4_ttl, df); diff --git a/datapath/vport-lisp.c b/datapath/vport-lisp.c index b1581ef95..c7da276b8 100644 --- a/datapath/vport-lisp.c +++ b/datapath/vport-lisp.c @@ -393,7 +393,6 @@ static void handle_offloads(struct sk_buff *skb) static int lisp_send(struct vport *vport, struct sk_buff *skb) { - struct net *net = ovs_dp_get_net(vport->dp); int network_offset = skb_network_offset(skb); struct rtable *rt; int min_headroom; @@ -453,7 +452,7 @@ static int lisp_send(struct vport *vport, struct sk_buff *skb) df = OVS_CB(skb)->tun_key->tun_flags & TUNNEL_DONT_FRAGMENT ? htons(IP_DF) : 0; - sent_len = iptunnel_xmit(net, rt, skb, + sent_len = iptunnel_xmit(rt, skb, saddr, OVS_CB(skb)->tun_key->ipv4_dst, IPPROTO_UDP, OVS_CB(skb)->tun_key->ipv4_tos, OVS_CB(skb)->tun_key->ipv4_ttl, df); -- 2.43.0