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/phonet/af_phonet.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/phonet/af_phonet.c')
| -rw-r--r-- | net/phonet/af_phonet.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c index 9e9c6fce11aa..b9d97effebe3 100644 --- a/net/phonet/af_phonet.c +++ b/net/phonet/af_phonet.c | |||
| @@ -67,11 +67,10 @@ static int pn_socket_create(struct net *net, struct socket *sock, int protocol) | |||
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | pnp = phonet_proto_get(protocol); | 69 | pnp = phonet_proto_get(protocol); |
| 70 | #ifdef CONFIG_KMOD | ||
| 71 | if (pnp == NULL && | 70 | if (pnp == NULL && |
| 72 | request_module("net-pf-%d-proto-%d", PF_PHONET, protocol) == 0) | 71 | request_module("net-pf-%d-proto-%d", PF_PHONET, protocol) == 0) |
| 73 | pnp = phonet_proto_get(protocol); | 72 | pnp = phonet_proto_get(protocol); |
| 74 | #endif | 73 | |
| 75 | if (pnp == NULL) | 74 | if (pnp == NULL) |
| 76 | return -EPROTONOSUPPORT; | 75 | return -EPROTONOSUPPORT; |
| 77 | if (sock->type != pnp->sock_type) { | 76 | if (sock->type != pnp->sock_type) { |