diff options
| author | Craig Gallek <kraig@google.com> | 2016-02-10 17:50:35 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-11 09:54:14 +0100 |
| commit | 086c653f5862591a9cfe2386f5650d03adacc33a (patch) | |
| tree | c0aba9d55ae1740be1c7fbbbc30f30e68862e071 /net/phonet/socket.c | |
| parent | Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge (diff) | |
| download | linux-086c653f5862591a9cfe2386f5650d03adacc33a.tar.xz linux-086c653f5862591a9cfe2386f5650d03adacc33a.zip | |
sock: struct proto hash function may error
In order to support fast reuseport lookups in TCP, the hash function
defined in struct proto must be capable of returning an error code.
This patch changes the function signature of all related hash functions
to return an integer and handles or propagates this return value at
all call sites.
Signed-off-by: Craig Gallek <kraig@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/phonet/socket.c')
| -rw-r--r-- | net/phonet/socket.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/phonet/socket.c b/net/phonet/socket.c index d575ef4e9aa6..ffd5f2297584 100644 --- a/net/phonet/socket.c +++ b/net/phonet/socket.c @@ -140,13 +140,15 @@ void pn_deliver_sock_broadcast(struct net *net, struct sk_buff *skb) rcu_read_unlock(); } -void pn_sock_hash(struct sock *sk) +int pn_sock_hash(struct sock *sk) { struct hlist_head *hlist = pn_hash_list(pn_sk(sk)->sobject); mutex_lock(&pnsocks.lock); sk_add_node_rcu(sk, hlist); mutex_unlock(&pnsocks.lock); + + return 0; } EXPORT_SYMBOL(pn_sock_hash); @@ -200,7 +202,7 @@ static int pn_socket_bind(struct socket *sock, struct sockaddr *addr, int len) pn->resource = spn->spn_resource; /* Enable RX on the socket */ - sk->sk_prot->hash(sk); + err = sk->sk_prot->hash(sk); out_port: mutex_unlock(&port_mutex); out: |