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/netlink | |
| parent | 4ce72a2c063a7fa8e42a9435440ae3364115a58d (diff) | |
| parent | 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 (diff) | |
Merge commit 'v2.6.28-rc1' into sched/urgent
Diffstat (limited to 'net/netlink')
| -rw-r--r-- | net/netlink/af_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 2fd8afac5f71..480184a857d2 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
| @@ -435,7 +435,7 @@ static int netlink_create(struct net *net, struct socket *sock, int protocol) | |||
| 435 | return -EPROTONOSUPPORT; | 435 | return -EPROTONOSUPPORT; |
| 436 | 436 | ||
| 437 | netlink_lock_table(); | 437 | netlink_lock_table(); |
| 438 | #ifdef CONFIG_KMOD | 438 | #ifdef CONFIG_MODULES |
| 439 | if (!nl_table[protocol].registered) { | 439 | if (!nl_table[protocol].registered) { |
| 440 | netlink_unlock_table(); | 440 | netlink_unlock_table(); |
| 441 | request_module("net-pf-%d-proto-%d", PF_NETLINK, protocol); | 441 | request_module("net-pf-%d-proto-%d", PF_NETLINK, protocol); |