projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pm-opp'
[firefly-linux-kernel-4.4.55.git]
/
net
/
openvswitch
/
actions.c
diff --git
a/net/openvswitch/actions.c
b/net/openvswitch/actions.c
index 221fa8b37a473ea3dd2a5f2987f9b4233ba6987d..c88d0f2d3e019b2caff3c19742c9b4c0886e6298 100644
(file)
--- 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;
}