diff --git a/[refs] b/[refs]
index 699b5e72f813..cb67c4b3bf21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50b12f597be354a5a224f05c65c54c0667e57aec
+refs/heads/master: 80d7e403c97b712e302ec37e9beceff1dbdc9402
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index af9620406321..c30b8b72eedb 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -1134,6 +1134,12 @@ static int ieee80211_change_bss(struct wiphy *wiphy,
 			sdata->flags &= ~IEEE80211_SDATA_DONT_BRIDGE_PACKETS;
 	}
 
+	if (params->ht_opmode >= 0) {
+		sdata->vif.bss_conf.ht_operation_mode =
+			(u16) params->ht_opmode;
+		changed |= BSS_CHANGED_HT;
+	}
+
 	ieee80211_bss_info_change_notify(sdata, changed);
 
 	return 0;