diff options
| author | Lorand Jakab <lojakab@cisco.com> | 2014-10-06 14:45:32 +0200 |
|---|---|---|
| committer | Pravin B Shelar <pshelar@nicira.com> | 2014-11-06 08:52:35 +0100 |
| commit | d98612b8c1150cb73ecd45e94c62de053f89441c (patch) | |
| tree | 2ed1870ee81bb17f5d6bbfaea04ea207f75836fc /net/openvswitch/actions.c | |
| parent | openvswitch: Fix the type of struct ovs_key_nd nd_target field. (diff) | |
| download | linux-d98612b8c1150cb73ecd45e94c62de053f89441c.tar.xz linux-d98612b8c1150cb73ecd45e94c62de053f89441c.zip | |
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.c | 5 |
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) /* Execute a list of actions against 'skb'. */ int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb, - struct sw_flow_key *key) + struct sw_flow_actions *acts, struct sw_flow_key *key) { int level = this_cpu_read(exec_actions_level); - struct sw_flow_actions *acts; int err; - acts = rcu_dereference(OVS_CB(skb)->flow->sf_acts); - this_cpu_inc(exec_actions_level); OVS_CB(skb)->egress_tun_info = NULL; err = do_execute_actions(dp, skb, key, |