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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
net
/
sched
/
cls_flow.c
diff --git
a/net/sched/cls_flow.c
b/net/sched/cls_flow.c
index aa36a8c8b33bf27e286443f23ba27393e7156cda..7881e2fccbc2ea1b7cd0eaf98ac3f0675836e150 100644
(file)
--- a/
net/sched/cls_flow.c
+++ b/
net/sched/cls_flow.c
@@
-393,7
+393,7
@@
static int flow_change(struct net *net, struct sk_buff *in_skb,
return -EOPNOTSUPP;
if ((keymask & (FLOW_KEY_SKUID|FLOW_KEY_SKGID)) &&
- sk_user_ns(NETLINK_CB(in_skb).s
s
k) != &init_user_ns)
+ sk_user_ns(NETLINK_CB(in_skb).sk) != &init_user_ns)
return -EOPNOTSUPP;
}