aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/ip.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-13 19:24:01 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-13 19:24:01 -0400
commit814d8ffd5009e13f1266759b583ef847c5350d77 (patch)
tree00b01e4ccac6ba82ab5e67c27103f6f75f8ccf9d /include/net/ip.h
parent386bfcf5e8a3c34d92156c945c8db58a1e2f7c69 (diff)
parent1c2fb7f93cb20621772bf304f3dba0849942e5db (diff)
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net/ip.h')
-rw-r--r--include/net/ip.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ip.h b/include/net/ip.h
index 3f63992eb712..32360bbe143f 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -163,6 +163,7 @@ DECLARE_SNMP_STAT(struct linux_mib, net_statistics);
163 163
164extern int sysctl_local_port_range[2]; 164extern int sysctl_local_port_range[2];
165extern int sysctl_ip_default_ttl; 165extern int sysctl_ip_default_ttl;
166extern int sysctl_ip_nonlocal_bind;
166 167
167#ifdef CONFIG_INET 168#ifdef CONFIG_INET
168/* The function in 2.2 was invalid, producing wrong result for 169/* The function in 2.2 was invalid, producing wrong result for