diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
| commit | 74d154189d597b91da4322996dbf4f5c3d1544ab (patch) | |
| tree | 6f09861b5e2f875d2d8ea2127b16add9103221c6 /net/ipv4/tcp_output.c | |
| parent | 5a6338db37885af06760d40cad589316e48431e9 (diff) | |
| parent | ffafa60d496f80c250f2ae0340ae94434c0b0b4d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index c464892cf642..4e004424d400 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
| @@ -2294,7 +2294,7 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst, | |||
| 2294 | #ifdef CONFIG_TCP_MD5SIG | 2294 | #ifdef CONFIG_TCP_MD5SIG |
| 2295 | /* Okay, we have all we need - do the md5 hash if needed */ | 2295 | /* Okay, we have all we need - do the md5 hash if needed */ |
| 2296 | if (md5) { | 2296 | if (md5) { |
| 2297 | tp->af_specific->calc_md5_hash(md5_hash_location, | 2297 | tcp_rsk(req)->af_specific->calc_md5_hash(md5_hash_location, |
| 2298 | md5, NULL, req, skb); | 2298 | md5, NULL, req, skb); |
| 2299 | } | 2299 | } |
| 2300 | #endif | 2300 | #endif |