git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users.
[safe/jmp/linux-2.6]
/
net
/
ipv4
/
tcp_minisocks.c
diff --git
a/net/ipv4/tcp_minisocks.c
b/net/ipv4/tcp_minisocks.c
index
bb3d8b3
..
43bbba7
100644
(file)
--- a/
net/ipv4/tcp_minisocks.c
+++ b/
net/ipv4/tcp_minisocks.c
@@
-107,7
+107,7
@@
tcp_timewait_state_process(struct inet_timewait_sock *tw, struct sk_buff *skb,
if (tmp_opt.saw_tstamp) {
tmp_opt.ts_recent = tcptw->tw_ts_recent;
tmp_opt.ts_recent_stamp = tcptw->tw_ts_recent_stamp;
if (tmp_opt.saw_tstamp) {
tmp_opt.ts_recent = tcptw->tw_ts_recent;
tmp_opt.ts_recent_stamp = tcptw->tw_ts_recent_stamp;
- paws_reject = tcp_paws_
check
(&tmp_opt, th->rst);
+ paws_reject = tcp_paws_
reject
(&tmp_opt, th->rst);
}
}
}
}
@@
-399,7
+399,7
@@
struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req,
tcp_prequeue_init(newtp);
tcp_prequeue_init(newtp);
- tcp_init_wl(newtp, treq->
snt_isn, treq->
rcv_isn);
+ tcp_init_wl(newtp, treq->rcv_isn);
newtp->srtt = 0;
newtp->mdev = TCP_TIMEOUT_INIT;
newtp->srtt = 0;
newtp->mdev = TCP_TIMEOUT_INIT;
@@
-511,7
+511,7
@@
struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,
* from another data.
*/
tmp_opt.ts_recent_stamp = get_seconds() - ((TCP_TIMEOUT_INIT/HZ)<<req->retrans);
* from another data.
*/
tmp_opt.ts_recent_stamp = get_seconds() - ((TCP_TIMEOUT_INIT/HZ)<<req->retrans);
- paws_reject = tcp_paws_
check
(&tmp_opt, th->rst);
+ paws_reject = tcp_paws_
reject
(&tmp_opt, th->rst);
}
}
}
}