/[linux-patches]/genpatches-2.6/trunk/2.6.14/1464_15.6_dont-reset-rskq_defer_accept.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.14/1464_15.6_dont-reset-rskq_defer_accept.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 328 - (show annotations) (download) (as text)
Tue Mar 14 13:34:17 2006 UTC (14 years, 7 months ago) by johnm
File MIME type: text/x-diff
File size: 1379 byte(s)
2.6.14-11, rebase against local tree
1 From chrisw@osdl.org Wed Mar 1 12:22:20 2006
2 From: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
3 Date: Feb 27, 2006 6:28 PM
4 Subject: [REQSK] Don't reset rskq_defer_accept in reqsk_queue_alloc
5 To: "David S. Miller" <davem@davemloft.net>
6 Cc: netdev@vger.kernel.org, Andrew Morton <akpm@osdl.org>, "Alexandra N. Kossovsky" <Alexandra.Kossovsky@oktetlabs.ru>
7
8 In 295f7324ff8d9ea58b4d3ec93b1aaa1d80e048a9 I moved defer_accept from
9 tcp_sock to request_queue and mistakingly reset it at reqsl_queue_alloc, causing
10 calls to setsockopt(TCP_DEFER_ACCEPT ) to be lost after bind, the fix is to
11 remove the zeroing of rskq_defer_accept from reqsl_queue_alloc.
12
13 Thanks to Alexandra N. Kossovsky <Alexandra.Kossovsky@oktetlabs.ru> for
14 reporting and testing the suggested fix.
15
16 Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
17 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
18 ---
19
20 net/core/request_sock.c | 1 -
21 1 files changed, 1 deletion(-)
22
23 --- linux-2.6.15.5.orig/net/core/request_sock.c
24 +++ linux-2.6.15.5/net/core/request_sock.c
25 @@ -52,7 +52,6 @@ int reqsk_queue_alloc(struct request_soc
26 get_random_bytes(&lopt->hash_rnd, sizeof(lopt->hash_rnd));
27 rwlock_init(&queue->syn_wait_lock);
28 queue->rskq_accept_head = queue->rskq_accept_head = NULL;
29 - queue->rskq_defer_accept = 0;
30 lopt->nr_table_entries = nr_table_entries;
31
32 write_lock_bh(&queue->syn_wait_lock);

  ViewVC Help
Powered by ViewVC 1.1.20