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/dccp/minisocks.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/dccp/minisocks.c')
| -rw-r--r-- | net/dccp/minisocks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c index 838f524cf11a..d10aace43672 100644 --- a/net/dccp/minisocks.c +++ b/net/dccp/minisocks.c @@ -72,7 +72,7 @@ void dccp_time_wait(struct sock *sk, int state, int timeo) dccp_done(sk); } -struct sock *dccp_create_openreq_child(struct sock *sk, +struct sock *dccp_create_openreq_child(const struct sock *sk, const struct request_sock *req, const struct sk_buff *skb) { @@ -236,7 +236,7 @@ int dccp_child_process(struct sock *parent, struct sock *child, EXPORT_SYMBOL_GPL(dccp_child_process); -void dccp_reqsk_send_ack(struct sock *sk, struct sk_buff *skb, +void dccp_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb, struct request_sock *rsk) { DCCP_BUG("DCCP-ACK packets are never sent in LISTEN/RESPOND state"); |