lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:

	drivers/net/smc911x.c
This commit is contained in:
David S. Miller
2008-06-13 20:52:39 -07:00
parent 875ec4333b 7775c9753b
commit 4ae127d1b6
533 changed files with 6132 additions and 3211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/tcp.h
View File

@@ -239,11 +239,6 @@ static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req)
return (struct tcp_request_sock *)req;
}
struct tcp_deferred_accept_info {
struct sock *listen_sk;
struct request_sock *request;
};
struct tcp_sock {
/* inet_connection_sock has to be the first member of tcp_sock */
struct inet_connection_sock inet_conn;
@@ -379,8 +374,6 @@ struct tcp_sock {
unsigned int keepalive_time; /* time before keep alive takes place */
unsigned int keepalive_intvl; /* time interval between keep alive probes */
struct tcp_deferred_accept_info defer_tcp_accept;
unsigned long last_synq_overflow;
/* Receiver side RTT estimation */