aboutsummaryrefslogtreecommitdiffstats
path: root/net/openvswitch/actions.c
diff options
context:
space:
mode:
authorLorand Jakab <lojakab@cisco.com>2014-10-06 08:45:32 -0400
committerPravin B Shelar <pshelar@nicira.com>2014-11-06 02:52:35 -0500
commitd98612b8c1150cb73ecd45e94c62de053f89441c (patch)
tree2ed1870ee81bb17f5d6bbfaea04ea207f75836fc /net/openvswitch/actions.c
parent1a4e96a0e989200f7180264e27b22e9a85f3fcc8 (diff)
openvswitch: Remove flow member from struct ovs_skb_cb
The 'flow' memeber was chosen for removal because it's only used in ovs_execute_actions() we can pass it as argument to this function. Signed-off-by: Lorand Jakab <lojakab@cisco.com> Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Diffstat (limited to 'net/openvswitch/actions.c')
-rw-r--r--net/openvswitch/actions.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 9fd33c0bf173..f7e589159e4a 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -865,14 +865,11 @@ static void process_deferred_actions(struct datapath *dp)
865 865
866/* Execute a list of actions against 'skb'. */ 866/* Execute a list of actions against 'skb'. */
867int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb, 867int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb,
868 struct sw_flow_key *key) 868 struct sw_flow_actions *acts, struct sw_flow_key *key)
869{ 869{
870 int level = this_cpu_read(exec_actions_level); 870 int level = this_cpu_read(exec_actions_level);
871 struct sw_flow_actions *acts;
872 int err; 871 int err;
873 872
874 acts = rcu_dereference(OVS_CB(skb)->flow->sf_acts);
875
876 this_cpu_inc(exec_actions_level); 873 this_cpu_inc(exec_actions_level);
877 OVS_CB(skb)->egress_tun_info = NULL; 874 OVS_CB(skb)->egress_tun_info = NULL;
878 err = do_execute_actions(dp, skb, key, 875 err = do_execute_actions(dp, skb, key,