---

yaml --- r: 255585 b: refs/heads/master c: d751e62 h: refs/heads/master i: 255583: 1f4a29d v: v3
git-mirror · Jun 17, 2011 · 5210eeb · 5210eeb
1 parent e2b5f1b
commit 5210eeb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c63d6ea3060d9e10773e869b1112e3a0efbcf820
+refs/heads/master: d751e623969bf758f3f75f59418b19ede570ab50
diff --git a/trunk/net/can/af_can.c b/trunk/net/can/af_can.c
@@ -58,6 +58,7 @@
 #include <linux/skbuff.h>
 #include <linux/can.h>
 #include <linux/can/core.h>
+#include <linux/ratelimit.h>
 #include <net/net_namespace.h>
 #include <net/sock.h>
 
@@ -161,8 +162,8 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
 		 * return the error code immediately.  Below we will
 		 * return -EPROTONOSUPPORT
 		 */
-		if (err && printk_ratelimit())
-			printk(KERN_ERR "can: request_module "
+		if (err)
+			printk_ratelimited(KERN_ERR "can: request_module "
 			       "(can-proto-%d) failed.\n", protocol);
 
 		cp = can_get_proto(protocol);