Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[mv-sheeva.git] / net / rds / iw_cm.c

diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c
index c12db66f24c738fb83d1f7999b1784fd4ad807fd..9556d2895f7a35c72135989520a186618ed4e6bf 100644 (file)
--- a/net/rds/iw_cm.c
+++ b/net/rds/iw_cm.c
@@ -34,6 +34,7 @@
 #include <linux/in.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/ratelimit.h>
 
 #include "rds.h"
 #include "iw.h"
@@ -258,8 +259,7 @@ static int rds_iw_setup_qp(struct rds_connection *conn)
         */
        rds_iwdev = ib_get_client_data(dev, &rds_iw_client);
        if (!rds_iwdev) {
-               if (printk_ratelimit())
-                       printk(KERN_NOTICE "RDS/IW: No client_data for device %s\n",
+               printk_ratelimited(KERN_NOTICE "RDS/IW: No client_data for device %s\n",
                                        dev->name);
                return -EOPNOTSUPP;
        }
@@ -365,13 +365,12 @@ static u32 rds_iw_protocol_compatible(const struct rds_iw_connect_private *dp)
                version = RDS_PROTOCOL_3_0;
                while ((common >>= 1) != 0)
                        version++;
-       } else if (printk_ratelimit()) {
-               printk(KERN_NOTICE "RDS: Connection from %pI4 using "
+       }
+       printk_ratelimited(KERN_NOTICE "RDS: Connection from %pI4 using "
                        "incompatible protocol version %u.%u\n",
                        &dp->dp_saddr,
                        dp->dp_protocol_major,
                        dp->dp_protocol_minor);
-       }
        return version;
 }