diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-16 21:25:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-16 21:25:48 -0400 |
| commit | caea902f72b053fd0c76d0d3b6b2e057beb3fc64 (patch) | |
| tree | 74e8d476b2c51480420e2ef7c9bbae249b6edbc9 /net/ipv4/tcp_ipv4.c | |
| parent | 0b4419162aa6c4204843f3a13b48d9ab821d3167 (diff) | |
| parent | 65c3e4715b1b934f8dcc002d9f46b4371ca7a9b1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/Kconfig
drivers/net/wireless/rt2x00/rt2x00usb.c
net/sctp/protocol.c
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 64b385f65930..0db9b75c1fa2 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
| @@ -83,10 +83,6 @@ | |||
| 83 | int sysctl_tcp_tw_reuse __read_mostly; | 83 | int sysctl_tcp_tw_reuse __read_mostly; |
| 84 | int sysctl_tcp_low_latency __read_mostly; | 84 | int sysctl_tcp_low_latency __read_mostly; |
| 85 | 85 | ||
| 86 | /* Check TCP sequence numbers in ICMP packets. */ | ||
| 87 | #define ICMP_MIN_LENGTH 8 | ||
| 88 | |||
| 89 | void tcp_v4_send_check(struct sock *sk, int len, struct sk_buff *skb); | ||
| 90 | 86 | ||
| 91 | #ifdef CONFIG_TCP_MD5SIG | 87 | #ifdef CONFIG_TCP_MD5SIG |
| 92 | static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk, | 88 | static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk, |