diff options
| author |   Rich Felker <dalias@libc.org> | 2016-03-29 21:53:03 +0000 |
|---|---|---|
| committer | Rich Felker <dalias@libc.org> | 2016-03-29 21:53:03 +0000 |
| commit | 16b02d711f4059b8338ef967064195b47cae65ea (patch) | |
| tree | 6d3e0b7629210b56f8d6cfa39184c878d8a15367 /net/ipv4/raw.c | |
| parent | sched/preempt, sh: kmap_coherent relies on disabled preemption (diff) | |
| parent | Linux 4.6-rc1 (diff) | |
| download | wireguard-linux-16b02d711f4059b8338ef967064195b47cae65ea.tar.xz wireguard-linux-16b02d711f4059b8338ef967064195b47cae65ea.zip | |
Merge tag 'v4.6-rc1'
Linux 4.6-rc1
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/raw.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 7113bae4e6a0..8d22de74080c 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -93,7 +93,7 @@ static struct raw_hashinfo raw_v4_hashinfo = { .lock = __RW_LOCK_UNLOCKED(raw_v4_hashinfo.lock), }; -void raw_hash_sk(struct sock *sk) +int raw_hash_sk(struct sock *sk) { struct raw_hashinfo *h = sk->sk_prot->h.raw_hash; struct hlist_head *head; @@ -104,6 +104,8 @@ void raw_hash_sk(struct sock *sk) sk_add_node(sk, head); sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); write_unlock_bh(&h->lock); + + return 0; } EXPORT_SYMBOL_GPL(raw_hash_sk); |