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 remote-tracking branch 'asoc/fix/arizona' into asoc-linus
[firefly-linux-kernel-4.4.55.git]
/
net
/
openvswitch
/
datapath.c
diff --git
a/net/openvswitch/datapath.c
b/net/openvswitch/datapath.c
index 5633172b791ab98e297ba1605c34bf42e684ccfb..91a8b004dc510272e6ab09c22ccea821cb62ac49 100644
(file)
--- a/
net/openvswitch/datapath.c
+++ b/
net/openvswitch/datapath.c
@@
-1175,7
+1175,7
@@
static int ovs_flow_cmd_set(struct sk_buff *skb, struct genl_info *info)
info, OVS_FLOW_CMD_NEW, false,
ufid_flags);
info, OVS_FLOW_CMD_NEW, false,
ufid_flags);
- if (
unlikely(IS_ERR(reply)
)) {
+ if (
IS_ERR(reply
)) {
error = PTR_ERR(reply);
goto err_unlock_ovs;
}
error = PTR_ERR(reply);
goto err_unlock_ovs;
}