summaryrefslogtreecommitdiff
path: root/pfinet/linux-src/net/ipv4/tcp_ipv4.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2000-02-05 12:13:22 +0000
committerRoland McGrath <roland@gnu.org>2000-02-05 12:13:22 +0000
commit1a7ccb577c414677f9e763036d6ccce3a298f16d (patch)
tree10f45d0745e0f65108ecbda92ed6f7214dc703ff /pfinet/linux-src/net/ipv4/tcp_ipv4.c
parentadd1cad493c256d0a7c939070f9ee067c2718daf (diff)
parentb39cd08347c72483a4521a55301a0fa147a2a2b1 (diff)
Merge from vendor branch Linux:
Import of Linux 2.2.13 subset (ipv4 stack and related)
Diffstat (limited to 'pfinet/linux-src/net/ipv4/tcp_ipv4.c')
-rw-r--r--pfinet/linux-src/net/ipv4/tcp_ipv4.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/pfinet/linux-src/net/ipv4/tcp_ipv4.c b/pfinet/linux-src/net/ipv4/tcp_ipv4.c
index c2c78365..904f8b5d 100644
--- a/pfinet/linux-src/net/ipv4/tcp_ipv4.c
+++ b/pfinet/linux-src/net/ipv4/tcp_ipv4.c
@@ -525,7 +525,8 @@ gotit:
static inline __u32 tcp_v4_init_sequence(struct sock *sk, struct sk_buff *skb)
{
- return secure_tcp_sequence_number(sk->saddr, sk->daddr,
+ return secure_tcp_sequence_number(skb->nh.iph->daddr,
+ skb->nh.iph->saddr,
skb->h.th->dest,
skb->h.th->source);
}
@@ -1866,7 +1867,7 @@ do_rewrite:
/* Ouch!, this should not happen. */
if (!sk->saddr || !sk->rcv_saddr) {
printk(KERN_WARNING "tcp_v4_rebuild_header(): not valid sock addrs: "
- "saddr=%08lX rcv_saddr=%08lX\n",
+ "saddr=%08X rcv_saddr=%08X\n",
ntohl(sk->saddr),
ntohl(sk->rcv_saddr));
return 0;