diff options
| author | David S. Miller <davem@davemloft.net> | 2015-09-25 13:00:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-25 13:00:40 -0700 |
| commit | 4d54d86546f62c7c4a0fe3b36a64c5e3b98ce1a9 (patch) | |
| tree | bd48e072bacebb47bc6cd4ebb3483e9bd9da21b0 /include/net/route.h | |
| parent | 6ea29da1d04f56e167ec8cc5ed15e927997d9d67 (diff) | |
| parent | 1b70e977cef6ce7e7411c9bbec21f9adc8e29097 (diff) | |
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 'include/net/route.h')
| -rw-r--r-- | include/net/route.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/route.h b/include/net/route.h index 10a7d21a211c..414beadc619f 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -114,7 +114,7 @@ void rt_cache_flush(struct net *net); void rt_flush_dev(struct net_device *dev); struct rtable *__ip_route_output_key(struct net *, struct flowi4 *flp); struct rtable *ip_route_output_flow(struct net *, struct flowi4 *flp, - struct sock *sk); + const struct sock *sk); struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_orig); |