From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Aug 2008 18:35:16 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: firefly_0821_release~18492
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9a5467fd600669cda488771dac3e951034fe2b08;p=firefly-linux-kernel-4.4.55.git
Merge git://git./linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (46 commits)
tcp: MD5: Fix IPv6 signatures
skbuff: add missing kernel-doc for do_not_encrypt
net/ipv4/route.c: fix build error
tcp: MD5: Fix MD5 signatures on certain ACK packets
ipv6: Fix ip6_xmit to send fragments if ipfragok is true
ipvs: Move userspace definitions to include/linux/ip_vs.h
netdev: Fix lockdep warnings in multiqueue configurations.
netfilter: xt_hashlimit: fix race between htable_destroy and htable_gc
netfilter: ipt_recent: fix race between recent_mt_destroy and proc manipulations
netfilter: nf_conntrack_tcp: decrease timeouts while data in unacknowledged
irda: replace __FUNCTION__ with __func__
nsc-ircc: default to dongle type 9 on IBM hardware
bluetooth: add quirks for a few hci_usb devices
hysdn: remove the packed attribute from PofTimStamp_tag
isdn: use the common ascii hex helpers
tg3: adapt tg3 to use reworked PCI PM code
atm: fix direct casts of pointers to u32 in the InterPhase driver
atm: fix const assignment/discard warnings in the ATM networking driver
net: use the common ascii hex helpers
random32: seeding improvement
...
---
9a5467fd600669cda488771dac3e951034fe2b08
diff --cc net/ipv4/route.c
index a72a5ad46ec5,d7bf0564b5f4..1bfa078ddbd0
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@@ -3223,9 -3222,10 +3223,11 @@@ int __init ip_rt_init(void
*/
void __init ip_static_sysctl_init(void)
{
+ #ifdef CONFIG_SYSCTL
register_sysctl_paths(ipv4_route_path, ipv4_route_table);
+ #endif
}
+#endif
EXPORT_SYMBOL(__ip_select_ident);
EXPORT_SYMBOL(ip_route_input);