diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-11 21:27:54 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-11 22:13:42 -0500 |
| commit | 19d28fbd306e7ae7c1acf05c3e6968b56f0d196b (patch) | |
| tree | 0584a3a4639424733bad7714796f858aa7addee7 /net/core/sock_diag.c | |
| parent | 8c2e6c904fd8701a8d02d2bdb86871dc3ec4e85b (diff) | |
| parent | 1545dec46db3858bbce84c2065b579e2925706ab (diff) | |
| download | linux-19d28fbd306e7ae7c1acf05c3e6968b56f0d196b.tar.gz linux-19d28fbd306e7ae7c1acf05c3e6968b56f0d196b.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
BPF alignment tests got a conflict because the registers
are output as Rn_w instead of just Rn in net-next, and
in net a fixup for a testcase prohibits logical operations
on pointers before using them.
Also, we should attempt to patch BPF call args if JIT always on is
enabled. Instead, if we fail to JIT the subprogs we should pass
an error back up and fail immediately.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock_diag.c')
| -rw-r--r-- | net/core/sock_diag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c index 217f4e3b82f6..146b50e30659 100644 --- a/net/core/sock_diag.c +++ b/net/core/sock_diag.c @@ -288,7 +288,7 @@ static int sock_diag_bind(struct net *net, int group) case SKNLGRP_INET6_UDP_DESTROY: if (!sock_diag_handlers[AF_INET6]) request_module("net-pf-%d-proto-%d-type-%d", PF_NETLINK, - NETLINK_SOCK_DIAG, AF_INET); + NETLINK_SOCK_DIAG, AF_INET6); break; } return 0; |