diff --git a/[refs] b/[refs]
index 64c42901a4ab..6b3e94adc158 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db5b4f7ae3901fdc48c5b988fc2a5e0cb4ec1870
+refs/heads/master: e31ae0508315ebf5d8b1b8a1fca8550737fb3996
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index c43129efc3bf..58693e52d458 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -451,7 +451,8 @@ static int ieee80211_config_beacon(struct ieee80211_sub_if_data *sdata,
 	 * This is a kludge. beacon interval should really be part
 	 * of the beacon information.
 	 */
-	if (params->interval) {
+	if (params->interval && (sdata->local->hw.conf.beacon_int !=
+				 params->interval)) {
 		sdata->local->hw.conf.beacon_int = params->interval;
 		err = ieee80211_hw_config(sdata->local,
 					IEEE80211_CONF_CHANGE_BEACON_INTERVAL);