zd1211rw: do not ratelimit no-ops
Johannes Berg
maintainerPATCH 1/1 zd1211rw: do not ratelimit no-ops
It is rather confusing to see this in the log:
[ 695.606877] __ratelimit: 40 callbacks suppressed [ 700.726878] __ratelimit: 40 callbacks suppressed
without ever seeing any actual message. This is because zd1211rw doesn't compile out the net_ratelimit() call properly if debugging is not enabled.
Signed-off-by Johannes Berg <[email protected]>
--- drivers/net/wireless/zd1211rw/zd_def.h | 5 +++++ drivers/net/wireless/zd1211rw/zd_mac.c | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-)
drivers/net/wireless/zd1211rw/zd_def.h +5 -0
@@ -33,8 +33,13 @@ typedef u16 __nocast zd_addr_t;#ifdef DEBUG # define dev_dbg_f(dev, fmt, args...) \ dev_printk_f(KERN_DEBUG, dev, fmt, ## args) +# define dev_dbg_f_limit(dev, fmt, args...) do {\ + if (net_ratelimit()) + dev_printk_f(KERN_DEBUG, dev, fmt, ## args) +} while (0) #else # define dev_dbg_f(dev, fmt, args...) do { (void)(dev); } while (0) +# define dev_dbg_f_limit(dev, fmt, args...) do { (void)(dev); } while (0)#endif /* DEBUG */ #ifdef DEBUG
drivers/net/wireless/zd1211rw/zd_mac.c +3 -4
@@ -793,10 +793,9 @@ static void zd_process_intr(struct work_ struct zd_mac *mac = container_of(work, struct zd_mac, process_intr); int_status =le16_to_cpu (*(__le16 *)(mac->intr_buffer+4 )); -if (int_status &INT_CFG_NEXT_BCN ) { -if (net_ratelimit ()) -dev_dbg_f (zd_mac_dev (mac),"INT_CFG_NEXT_BCN\n" ); - }else +if (int_status &INT_CFG_NEXT_BCN ) +dev_dbg_f_limit (zd_mac_dev (mac),"INT_CFG_NEXT_BCN\n" ); +else dev_dbg_f (zd_mac_dev (mac),"Unsupported interrupt\n" );zd_chip_enable_hwint (&mac->chip);