From 3cfc4f69c498496f5f4de98717a1e3716676e530 Mon Sep 17 00:00:00 2001 From: Jesse Gross Date: Fri, 27 Jul 2012 10:19:40 +0000 Subject: [PATCH] --- yaml --- r: 319125 b: refs/heads/master c: 6081030769f23c83c0564e993be146db568bf68b h: refs/heads/master i: 319123: 48c3334318c56e56c3e49031f6041bf554927791 v: v3 --- [refs] | 2 +- trunk/net/openvswitch/actions.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 12e21694ec79..f9056084ecfd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 505fbcf035c245a1a42cd80184feecf61ee868dc +refs/heads/master: 6081030769f23c83c0564e993be146db568bf68b diff --git a/trunk/net/openvswitch/actions.c b/trunk/net/openvswitch/actions.c index 320fa0e6951a..f3f96badf5aa 100644 --- a/trunk/net/openvswitch/actions.c +++ b/trunk/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); }