diff --git a/[refs] b/[refs] index a1a98c619fbd..c749eed7a253 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75c0141ca2fdae7c332d8f17412fbe0939dd005f +refs/heads/master: 7a11c4d0635d9f6995736390b8c3346fe6f63d57 diff --git a/trunk/include/net/irda/irda.h b/trunk/include/net/irda/irda.h index 05a840837fe7..1880e46ecc9b 100644 --- a/trunk/include/net/irda/irda.h +++ b/trunk/include/net/irda/irda.h @@ -82,9 +82,9 @@ do { if(!(expr)) { \ #define IRDA_ASSERT_LABEL(label) #endif /* CONFIG_IRDA_DEBUG */ -#define IRDA_WARNING(args...) printk(KERN_WARNING args) -#define IRDA_MESSAGE(args...) printk(KERN_INFO args) -#define IRDA_ERROR(args...) printk(KERN_ERR args) +#define IRDA_WARNING(args...) do { if (net_ratelimit()) printk(KERN_WARNING args); } while (0) +#define IRDA_MESSAGE(args...) do { if (net_ratelimit()) printk(KERN_INFO args); } while (0) +#define IRDA_ERROR(args...) do { if (net_ratelimit()) printk(KERN_ERR args); } while (0) /* * Magic numbers used by Linux-IrDA. Random numbers which must be unique to