diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-24 06:48:46 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-24 06:48:46 -0400 |
| commit | 8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 (patch) | |
| tree | d535f46a917e14e90deccb29ad00aac016ad18dd /net/phonet/af_phonet.c | |
| parent | 4ce72a2c063a7fa8e42a9435440ae3364115a58d (diff) | |
| parent | 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 (diff) | |
Merge commit 'v2.6.28-rc1' into sched/urgent
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) { |