Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-11-01 00:15:30 -04:00
parent e7b63ff115 523e13455e
commit b75ec3af27
201 changed files with 1370 additions and 799 deletions
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -1110,8 +1110,8 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
 					     nla_data(a));

 			/* Hide stolen IP fragments from user space. */
-			if (err == -EINPROGRESS)
-				return 0;
+			if (err)
+				return err == -EINPROGRESS ? 0 : err;
 			break;
 		}