diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2013-09-06 11:39:09 -0700 |
|---|---|---|
| committer | Pravin B Shelar <pshelar@nicira.com> | 2013-09-07 13:56:01 -0700 |
| commit | 2b897011eeb4a0b06fc555009b2b3e138b809a0d (patch) | |
| tree | 2203eef2884a1af32a64d695530057694b383151 /datapath/vport-gre.c | |
| parent | 3cf54a5632d538b4b81f1c418d198614c63a843d (diff) | |
| download | openvswitch-2b897011eeb4a0b06fc555009b2b3e138b809a0d.tar.gz | |
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 <pshelar@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'datapath/vport-gre.c')
| -rw-r--r-- | datapath/vport-gre.c | 3 |
1 files changed, 1 insertions, 2 deletions
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); |