diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-12 07:33:59 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-12 07:33:59 +0200 |
| commit | e6e30add6bd8115af108de2a13ec82d997a55777 (patch) | |
| tree | 558b4d1c3ac369805aa9c57abca710bdf52aff75 /net/ipv4/tcp_output.c | |
| parent | irda: remove CVS keywords (diff) | |
| parent | tcp md5sig: Let the caller pass appropriate key for tcp_v{4,6}_do_calc_md5_ha... (diff) | |
| download | linux-e6e30add6bd8115af108de2a13ec82d997a55777.tar.xz linux-e6e30add6bd8115af108de2a13ec82d997a55777.zip | |
Merge branch 'net-next-2.6-misc-20080612a' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-next
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index b171ac65ccab..8f83ab432705 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -605,7 +605,6 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, md5, sk, NULL, NULL, tcp_hdr(skb), - sk->sk_protocol, skb->len); } #endif @@ -2264,7 +2263,7 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst, tp->af_specific->calc_md5_hash(md5_hash_location, md5, NULL, dst, req, - tcp_hdr(skb), sk->sk_protocol, + tcp_hdr(skb), skb->len); } #endif |