diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2015-08-30 02:44:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-30 04:07:15 +0200 |
| commit | 3eedb41fb43461b5fde3f72fd00a7706f0b90103 (patch) | |
| tree | 96851bd448a2878fac5ba1e8e0c21b049f585547 /net/openvswitch/vport.c | |
| parent | openvswitch: Remove vport get_name() (diff) | |
| download | linux-3eedb41fb43461b5fde3f72fd00a7706f0b90103.tar.xz linux-3eedb41fb43461b5fde3f72fd00a7706f0b90103.zip | |
openvswitch: Remove egress_tun_info.
tun info is passed using skb-dst pointer. Now we have
converted all vports to netdev based implementation so
Now we can remove redundant pointer to tun-info from OVS_CB.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/vport.c')
| -rw-r--r-- | net/openvswitch/vport.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index 40164037928e..e658439a0bdd 100644 --- a/net/openvswitch/vport.c +++ b/net/openvswitch/vport.c @@ -483,7 +483,6 @@ void ovs_vport_receive(struct vport *vport, struct sk_buff *skb, u64_stats_update_end(&stats->syncp); OVS_CB(skb)->input_vport = vport; - OVS_CB(skb)->egress_tun_info = NULL; OVS_CB(skb)->mru = 0; /* Extract flow from 'skb' into 'key'. */ error = ovs_flow_key_extract(tun_info, skb, &key); @@ -575,13 +574,14 @@ EXPORT_SYMBOL_GPL(ovs_vport_deferred_free); int ovs_tunnel_get_egress_info(struct ip_tunnel_info *egress_tun_info, struct net *net, - const struct ip_tunnel_info *tun_info, + struct sk_buff *skb, u8 ipproto, - u32 skb_mark, __be16 tp_src, __be16 tp_dst) { + const struct ip_tunnel_info *tun_info = skb_tunnel_info(skb); const struct ip_tunnel_key *tun_key; + u32 skb_mark = skb->mark; struct rtable *rt; struct flowi4 fl; |