diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-28 13:33:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-28 13:33:37 +0200 |
| commit | a0306db6e5758b0488c79e739de3c0ffe47ea62f (patch) | |
| tree | 86d17769496f96554f89bfc3be02b645a420889f /include/net/sock.h | |
| parent | 4bc07aa4f030d4d3e551ce8d96ca15b6424a5641 (diff) | |
| parent | 3eb2ce825ea1ad89d20f7a3b5780df850e4be274 (diff) | |
| download | linux-a0306db6e5758b0488c79e739de3c0ffe47ea62f.tar.bz2 | |
Merge 4.16-rc7 into staging-next
We want the IIO and staging driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 169c92afcafa..ae23f3b389ca 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1137,6 +1137,7 @@ struct proto { int proto_register(struct proto *prot, int alloc_slab); void proto_unregister(struct proto *prot); +int sock_load_diag_module(int family, int protocol); #ifdef SOCK_REFCNT_DEBUG static inline void sk_refcnt_debug_inc(struct sock *sk) |