diff --git a/[refs] b/[refs] index f269bce22ffa..0cbdeb9694ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 563d34d05786263893ba4a1042eb9b9374127cf5 +refs/heads/master: 5b3e7e6cb5771bedda51cdb6f715d1da8cd9e644 diff --git a/trunk/net/openvswitch/actions.c b/trunk/net/openvswitch/actions.c index f3f96badf5aa..320fa0e6951a 100644 --- a/trunk/net/openvswitch/actions.c +++ b/trunk/net/openvswitch/actions.c @@ -325,6 +325,9 @@ 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); }