diff options
| author | James Morris | 2009-09-11 00:04:49 +0200 |
|---|---|---|
| committer | James Morris | 2009-09-11 00:04:49 +0200 |
| commit | a3c8b97396ef42edfb845788ba6f53b2a93ce980 (patch) | |
| tree | 530c5bdbc534618311dab3e0af245835af56db0f /net/core | |
| parent | Linux 2.6.31 (diff) | |
| parent | binfmt_elf: fix PT_INTERP bss handling (diff) | |
| download | kernel-qcow2-linux-a3c8b97396ef42edfb845788ba6f53b2a93ce980.tar.gz kernel-qcow2-linux-a3c8b97396ef42edfb845788ba6f53b2a93ce980.tar.xz kernel-qcow2-linux-a3c8b97396ef42edfb845788ba6f53b2a93ce980.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 6a94475aee85..278d489aad3b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1031,7 +1031,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); } |