Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[karo-tx-linux.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index f843a0c5ecf91bc34f47895c042630a88d7986ed..84945470ab38cc073ff71eb8dac14ad653c9cad0 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1041,7 +1041,7 @@ void dev_load(struct net *net, const char *name)
        dev = __dev_get_by_name(net, name);
        read_unlock(&dev_base_lock);
 
-       if (!dev && capable(CAP_SYS_MODULE))
+       if (!dev && capable(CAP_NET_ADMIN))
                request_module("%s", name);
 }
 EXPORT_SYMBOL(dev_load);