summaryrefslogtreecommitdiff
path: root/net/openvswitch/actions.c
diff options
context:
space:
mode:
authorPravin B Shelar <pshelar@nicira.com>2015-08-29 17:44:06 -0700
committerDavid S. Miller <davem@davemloft.net>2015-08-29 19:07:15 -0700
commit3eedb41fb43461b5fde3f72fd00a7706f0b90103 (patch)
tree96851bd448a2878fac5ba1e8e0c21b049f585547 /net/openvswitch/actions.c
parent24d43f32d86026a0e318fee736380e164d85eefa (diff)
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/actions.c')
-rw-r--r--net/openvswitch/actions.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 4487543806bb..090d9e3a460c 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -896,10 +896,6 @@ static int execute_set_action(struct sk_buff *skb,
skb_dst_drop(skb);
dst_hold((struct dst_entry *)tun->tun_dst);
skb_dst_set(skb, (struct dst_entry *)tun->tun_dst);
-
- /* FIXME: Remove when all vports have been converted */
- OVS_CB(skb)->egress_tun_info = &tun->tun_dst->u.tun_info;
-
return 0;
}
@@ -1159,7 +1155,6 @@ int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb,
int err;
this_cpu_inc(exec_actions_level);
- OVS_CB(skb)->egress_tun_info = NULL;
err = do_execute_actions(dp, skb, key,
acts->actions, acts->actions_len);