diff options
| author | David S. Miller <davem@davemloft.net> | 2015-09-29 16:53:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-29 16:53:10 -0700 |
| commit | e6934f3ec00b04234acb24a1a2c28af59763d3b5 (patch) | |
| tree | 335da15ef581d750ada2ba11e6ca6900ba82ae86 /net/ipv4/inet_hashtables.c | |
| parent | 4c7e622ddf07388d72e15b97a88d260a5a168e37 (diff) | |
| parent | 0536fcc039a8926ec12ec587f41a83f7acafeb82 (diff) | |
| download | linux-stable-e6934f3ec00b04234acb24a1a2c28af59763d3b5.tar.gz linux-stable-e6934f3ec00b04234acb24a1a2c28af59763d3b5.tar.bz2 linux-stable-e6934f3ec00b04234acb24a1a2c28af59763d3b5.zip | |
Merge branch 'listener-refactoring-preparations'
Eric Dumazet says:
====================
tcp: listener refactoring preparations
This patch series makes changes to TCP/DCCP stacks so that
we can switch listener code to lockless mode.
This is done by marking const the listener socket in all
appropriate paths.
FastOpen code had to be changed to not dynamically allocate
a very small structure to make code simpler for following changes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_hashtables.c')
| -rw-r--r-- | net/ipv4/inet_hashtables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index 89120196a949..56742e995dd3 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -126,7 +126,7 @@ void inet_put_port(struct sock *sk) } EXPORT_SYMBOL(inet_put_port); -int __inet_inherit_port(struct sock *sk, struct sock *child) +int __inet_inherit_port(const struct sock *sk, struct sock *child) { struct inet_hashinfo *table = sk->sk_prot->h.hashinfo; unsigned short port = inet_sk(child)->inet_num; |