]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
mac80211: fix HT/VHT disable flags
authorJohannes Berg <johannes.berg@intel.com>
Thu, 7 Feb 2013 19:41:50 +0000 (20:41 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 15 Feb 2013 08:41:33 +0000 (09:41 +0100)
The code to disable HT and VHT if VHT was advertised
without VHT is wrong -- it accidentally uses the wrong
flags. Fix that.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/mlme.c

index b97b615d5711aa636989eba676d332c38c3ecc5b..e6da6bf8cc271b9c5e9c461ea6e533638fdc0a00 100644 (file)
@@ -3588,8 +3588,8 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
                        vht_oper = NULL;
                        sdata_info(sdata,
                                   "AP advertised VHT without HT, disabling both\n");
-                       sdata->flags |= IEEE80211_STA_DISABLE_HT;
-                       sdata->flags |= IEEE80211_STA_DISABLE_VHT;
+                       ifmgd->flags |= IEEE80211_STA_DISABLE_HT;
+                       ifmgd->flags |= IEEE80211_STA_DISABLE_VHT;
                }
        }