diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 11:58:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 11:58:52 -0400 |
commit | b225ee5bed70254a100896c473e6dd8c2be45c18 (patch) | |
tree | 2f044d5898d15edcff858f624618c788d5b58760 /net/ipv4/inet_diag.c | |
parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
parent | 95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)
ipv4: Add a missing rcu_assign_pointer() in routing cache.
[netdrvr] ibmtr: PCMCIA IBMTR is ok on 64bit
xen-netfront: Avoid unaligned accesses to IP header
lmc: copy_*_user under spinlock
[netdrvr] myri10ge, ixgbe: remove broken select INTEL_IOATDMA
Diffstat (limited to 'net/ipv4/inet_diag.c')
-rw-r--r-- | net/ipv4/inet_diag.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 89cb047ab314..564230dabcb8 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c | |||
@@ -53,11 +53,9 @@ static DEFINE_MUTEX(inet_diag_table_mutex); | |||
53 | 53 | ||
54 | static const struct inet_diag_handler *inet_diag_lock_handler(int type) | 54 | static const struct inet_diag_handler *inet_diag_lock_handler(int type) |
55 | { | 55 | { |
56 | #ifdef CONFIG_KMOD | ||
57 | if (!inet_diag_table[type]) | 56 | if (!inet_diag_table[type]) |
58 | request_module("net-pf-%d-proto-%d-type-%d", PF_NETLINK, | 57 | request_module("net-pf-%d-proto-%d-type-%d", PF_NETLINK, |
59 | NETLINK_INET_DIAG, type); | 58 | NETLINK_INET_DIAG, type); |
60 | #endif | ||
61 | 59 | ||
62 | mutex_lock(&inet_diag_table_mutex); | 60 | mutex_lock(&inet_diag_table_mutex); |
63 | if (!inet_diag_table[type]) | 61 | if (!inet_diag_table[type]) |