diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2015-08-30 18:09:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-31 12:28:56 -0700 |
| commit | 4c22279848c531fc7f555d463daf3d0df963bd41 (patch) | |
| tree | 38315c4715393860962cc00a19f47fa1554b6add /net/openvswitch/vport-geneve.c | |
| parent | d1bfc62591a0a5144dc380976e737fbbb4f40f4f (diff) | |
| download | linux-4c22279848c531fc7f555d463daf3d0df963bd41.tar.gz | |
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-geneve.c')
| -rw-r--r-- | net/openvswitch/vport-geneve.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/openvswitch/vport-geneve.c b/net/openvswitch/vport-geneve.c index 24c56e56fedd..2735e9c4a3b8 100644 --- a/net/openvswitch/vport-geneve.c +++ b/net/openvswitch/vport-geneve.c @@ -53,15 +53,14 @@ static int geneve_get_options(const struct vport *vport, } static int geneve_get_egress_tun_info(struct vport *vport, struct sk_buff *skb, - struct ip_tunnel_info *egress_tun_info) + struct dp_upcall_info *upcall) { struct geneve_port *geneve_port = geneve_vport(vport); struct net *net = ovs_dp_get_net(vport->dp); __be16 dport = htons(geneve_port->port_no); __be16 sport = udp_flow_src_port(net, skb, 1, USHRT_MAX, true); - 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_UDP, sport, dport); } |