diff options
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/dev_ioctl.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c index cf999e09bcd2..72e899a3efda 100644 --- a/net/core/dev_ioctl.c +++ b/net/core/dev_ioctl.c | |||
@@ -365,11 +365,8 @@ void dev_load(struct net *net, const char *name) | |||
365 | no_module = !dev; | 365 | no_module = !dev; |
366 | if (no_module && capable(CAP_NET_ADMIN)) | 366 | if (no_module && capable(CAP_NET_ADMIN)) |
367 | no_module = request_module("netdev-%s", name); | 367 | no_module = request_module("netdev-%s", name); |
368 | if (no_module && capable(CAP_SYS_MODULE)) { | 368 | if (no_module && capable(CAP_SYS_MODULE)) |
369 | if (!request_module("%s", name)) | 369 | request_module("%s", name); |
370 | pr_warn("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s instead.\n", | ||
371 | name); | ||
372 | } | ||
373 | } | 370 | } |
374 | EXPORT_SYMBOL(dev_load); | 371 | EXPORT_SYMBOL(dev_load); |
375 | 372 | ||