Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md

Pull in pre-requisites for adding raid10 support to dm-raid.

1 files changed, 4 insertions, 1 deletions

diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 48badffaafc1..320fa0e6951a 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
@@ -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);
 }