diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-09-06 17:05:28 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-09-06 17:05:28 +0200 |
| commit | 00b14825eead7dd748d15ce6519726d06b3ee0d5 (patch) | |
| tree | e771e6dcde53b65a1d438dfabbe8cb4e7402e334 /net/openvswitch/actions.c | |
| parent | 882a7c69d3c605bfacf32e19033447dc70204d45 (diff) | |
| parent | a4881cc45a3fab4488e16c4934e149cfa620f1a9 (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'net/openvswitch/actions.c')
| -rw-r--r-- | net/openvswitch/actions.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index 320fa0e6951a..f3f96badf5aa 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -325,9 +325,6 @@ static int sample(struct datapath *dp, struct sk_buff *skb, } } - if (!acts_list) - return 0; - return do_execute_actions(dp, skb, nla_data(acts_list), nla_len(acts_list), true); } |