[PATCH] bcm43xx: preemptible periodic work

Make the heavy periodic work preemptible to avoid disabling
local IRQs for several msecs.

Signed-off-by: Michael Buesch <mb@buesch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
index 952c2f8b8b5e..f8200deecc8a 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
@@ -1410,7 +1410,10 @@ static inline
 u16 bcm43xx_phy_lo_g_deviation_subval(struct bcm43xx_private *bcm, u16 control)
 {
         struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+        u16 ret;
+        unsigned long flags;
 
+        local_irq_save(flags);
         if (phy->connected) {
                 bcm43xx_phy_write(bcm, 0x15, 0xE300);
                 control <<= 8;
@@ -1430,8 +1433,10 @@ u16 bcm43xx_phy_lo_g_deviation_subval(struct bcm43xx_private *bcm, u16 control)
                 bcm43xx_phy_write(bcm, 0x0015, control | 0xFFE0);
                 udelay(8);
         }
+        ret = bcm43xx_phy_read(bcm, 0x002D);
+        local_irq_restore(flags);
 
-        return bcm43xx_phy_read(bcm, 0x002D);
+        return ret;
 }
 
 static u32 bcm43xx_phy_lo_g_singledeviation(struct bcm43xx_private *bcm, u16 control)