diff options
| author | David S. Miller <davem@davemloft.net> | 2015-09-25 22:00:40 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-25 22:00:40 +0200 |
| commit | 4d54d86546f62c7c4a0fe3b36a64c5e3b98ce1a9 (patch) | |
| tree | bd48e072bacebb47bc6cd4ebb3483e9bd9da21b0 /net/ipv4/inet_connection_sock.c | |
| parent | net: remove unused argument of __netdev_find_adj() (diff) | |
| parent | inet: constify inet_rtx_syn_ack() sock argument (diff) | |
| download | linux-4d54d86546f62c7c4a0fe3b36a64c5e3b98ce1a9.tar.xz linux-4d54d86546f62c7c4a0fe3b36a64c5e3b98ce1a9.zip | |
Merge branch 'listener-sock-const'
Eric Dumazet says:
====================
dccp/tcp: constify listener sock
Another patch bomb to prepare lockless TCP/DCCP LISTEN handling.
SYNACK retransmits are built and sent without listener socket
being locked. Soon, initial SYNACK packets will have same property.
This series makes sure we did not something wrong with this model,
by adding a const qualifier in all the paths taken from synack building
and transmit, for IPv4/IPv6 and TCP/dccp.
The only potential problem was the rewrite of ecn bits for connections
with DCTCP as congestion module, but this was a very minor one.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_connection_sock.c')
| -rw-r--r-- | net/ipv4/inet_connection_sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 134957159c27..bac205136e1c 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -408,7 +408,7 @@ void inet_csk_reset_keepalive_timer(struct sock *sk, unsigned long len) } EXPORT_SYMBOL(inet_csk_reset_keepalive_timer); -struct dst_entry *inet_csk_route_req(struct sock *sk, +struct dst_entry *inet_csk_route_req(const struct sock *sk, struct flowi4 *fl4, const struct request_sock *req) { @@ -563,7 +563,7 @@ static inline void syn_ack_recalc(struct request_sock *req, const int thresh, req->num_timeout >= rskq_defer_accept - 1; } -int inet_rtx_syn_ack(struct sock *parent, struct request_sock *req) +int inet_rtx_syn_ack(const struct sock *parent, struct request_sock *req) { int err = req->rsk_ops->rtx_syn_ack(parent, req); |