diff options
author | Eric Dumazet <edumazet@google.com> | 2017-06-02 17:02:26 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-06-05 01:58:35 +0200 |
commit | 8e2f6dd298beb93c30e1699a5c26492a10214447 (patch) | |
tree | 5faf6b63009874e98bb84eaf56aaa22650544343 /net/ipv4 | |
parent | net: phy: marvell: make some functions static (diff) | |
download | linux-8e2f6dd298beb93c30e1699a5c26492a10214447.tar.xz linux-8e2f6dd298beb93c30e1699a5c26492a10214447.zip |
dccp: consistently use dccp_write_space()
DCCP uses dccp_write_space() for sk->sk_write_space method.
Unfortunately a passive connection (as provided by accept())
is using the generic sk_stream_write_space() function.
Lets simply inherit sk->sk_write_space from the parent
instead of forcing the generic one.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/inet_connection_sock.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 82dec8825d28..a3fa1a5b6d98 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -790,7 +790,6 @@ struct sock *inet_csk_clone_lock(const struct sock *sk, inet_sk(newsk)->inet_dport = inet_rsk(req)->ir_rmt_port; inet_sk(newsk)->inet_num = inet_rsk(req)->ir_num; inet_sk(newsk)->inet_sport = htons(inet_rsk(req)->ir_num); - newsk->sk_write_space = sk_stream_write_space; /* listeners have SOCK_RCU_FREE, not the children */ sock_reset_flag(newsk, SOCK_RCU_FREE); |