From: Vinson Lee <vlee@twitter.com>
Date: Wed, 27 Jun 2012 14:32:07 +0000 (+0000)
Subject: net: Downgrade CAP_SYS_MODULE deprecated message from error to warning.
X-Git-Tag: Ubuntu-5.0.0-8.9~15748^2~7
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7cecb523adedcaf8acba5e14d47559d8bc3f40d7;p=mirror_ubuntu-disco-kernel.git

net: Downgrade CAP_SYS_MODULE deprecated message from error to warning.

Make logging level consistent with other deprecation messages in net
subsystem.

Signed-off-by: Vinson Lee <vlee@twitter.com>
Cc: David Mackey <tdmackey@twitter.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/dev.c b/net/core/dev.c
index 6df214041a5e..84f01ba81a34 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1136,8 +1136,8 @@ void dev_load(struct net *net, const char *name)
 		no_module = request_module("netdev-%s", name);
 	if (no_module && capable(CAP_SYS_MODULE)) {
 		if (!request_module("%s", name))
-			pr_err("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated).  Use CAP_NET_ADMIN and alias netdev-%s instead.\n",
-			       name);
+			pr_warn("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated).  Use CAP_NET_ADMIN and alias netdev-%s instead.\n",
+				name);
 	}
 }
 EXPORT_SYMBOL(dev_load);