diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2015-08-31 03:09:38 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-31 21:28:56 +0200 |
| commit | 4c22279848c531fc7f555d463daf3d0df963bd41 (patch) | |
| tree | 38315c4715393860962cc00a19f47fa1554b6add /net/openvswitch/vport-gre.c | |
| parent | ipv4: fix 32b build (diff) | |
| download | linux-4c22279848c531fc7f555d463daf3d0df963bd41.tar.xz linux-4c22279848c531fc7f555d463daf3d0df963bd41.zip | |
ip-tunnel: Use API to access tunnel metadata options.
Currently tun-info options pointer is used in few cases to
pass options around. But tunnel options can be accessed using
ip_tunnel_info_opts() API without using the pointer. Following
patch removes the redundant pointer and consistently make use
of API.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Reviewed-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/vport-gre.c')
| -rw-r--r-- | net/openvswitch/vport-gre.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/openvswitch/vport-gre.c b/net/openvswitch/vport-gre.c index 36c39843607e..4d24481669c9 100644 --- a/net/openvswitch/vport-gre.c +++ b/net/openvswitch/vport-gre.c @@ -85,10 +85,9 @@ static struct vport *gre_create(const struct vport_parms *parms) } static int gre_get_egress_tun_info(struct vport *vport, struct sk_buff *skb, - struct ip_tunnel_info *egress_tun_info) + struct dp_upcall_info *upcall) { - return ovs_tunnel_get_egress_info(egress_tun_info, - ovs_dp_get_net(vport->dp), + return ovs_tunnel_get_egress_info(upcall, ovs_dp_get_net(vport->dp), skb, IPPROTO_GRE, 0, 0); } |