2 files changed, 10 insertions, 0 deletions

diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 8ebce26ef4d0..bb12586cd7cd 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -300,6 +300,7 @@ enum {
 #define B43_SHM_SH_LFFBLIM              0x0046  /* Long frame fallback retry limit */
 #define B43_SHM_SH_BEACPHYCTL           0x0054  /* Beacon PHY TX control word (see PHY TX control) */
 #define B43_SHM_SH_EXTNPHYCTL           0x00B0  /* Extended bytes for beacon PHY control (N) */
+#define B43_SHM_SH_BCN_LI               0x00B6  /* beacon listen interval */
 /* SHM_SHARED ACK/CTS control */
 #define B43_SHM_SH_ACKCTSPHYCTL         0x0022  /* ACK/CTS PHY control word (see PHY TX control) */
 /* SHM_SHARED probe response variables */
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 76cae3154ab3..5d4173ee55bc 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -3930,6 +3930,12 @@ static int b43_switch_band(struct b43_wldev *dev,
         return 0;
 }
 
+static void b43_set_beacon_listen_interval(struct b43_wldev *dev, u16 interval)
+{
+        interval = min_t(u16, interval, (u16)0xFF);
+        b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_BCN_LI, interval);
+}
+
 /* Write the short and long frame retry limit values. */
 static void b43_set_retry_limits(struct b43_wldev *dev,
                                  unsigned int short_retry,
@@ -3958,6 +3964,9 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
         mutex_lock(&wl->mutex);
         b43_mac_suspend(dev);
 
+        if (changed & IEEE80211_CONF_CHANGE_LISTEN_INTERVAL)
+                b43_set_beacon_listen_interval(dev, conf->listen_interval);
+
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
                 phy->chandef = &conf->chandef;
                 phy->channel = conf->chandef.chan->hw_value;