diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-12-11 13:10:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-12-11 13:10:40 +0100 |
| commit | 6643aab30f88e2929bcc401a9ae39bf6f1c0b61d (patch) | |
| tree | 72c43e9d7287aef9b8d9699491038edc1929f1f2 /net/xfrm/xfrm_user.c | |
| parent | 8fb9dcbdc3619741c10c573199d804161c34c89a (diff) | |
| parent | 045169816b31b10faed984b01c390db1b32ee4c1 (diff) | |
| download | talos-op-linux-6643aab30f88e2929bcc401a9ae39bf6f1c0b61d.tar.gz talos-op-linux-6643aab30f88e2929bcc401a9ae39bf6f1c0b61d.zip | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/xfrm/xfrm_user.c')
| -rw-r--r-- | net/xfrm/xfrm_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 08892091cfe3..671a1d0333f0 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -2450,7 +2450,7 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) #ifdef CONFIG_COMPAT if (in_compat_syscall()) - return -ENOTSUPP; + return -EOPNOTSUPP; #endif type = nlh->nlmsg_type; |
