From 5210eeb2e3696020436760b944a88e7638a4b35b Mon Sep 17 00:00:00 2001
From: Manuel Zerpies <manuel.f.zerpies@ww.stud.uni-erlangen.de>
Date: Thu, 16 Jun 2011 02:08:01 +0000
Subject: [PATCH] --- yaml --- r: 255585 b: refs/heads/master c:
 d751e623969bf758f3f75f59418b19ede570ab50 h: refs/heads/master i:   255583:
 1f4a29d4e191b6d7b134fa15d46a18e24cf20a0e v: v3

---
 [refs]                 | 2 +-
 trunk/net/can/af_can.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 81c80b4af779..9ba61d480f41 100644
--- 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
index 094fc5332d42..8ce926d3b2cb 100644
--- 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);