Merge pull request linux4kix#12 from linux4kix/linux-linaro-lsk-v3.14…

…-mx6 brcmfmac: deal with NL80211_CHANWIDTH_20_NOHT setting
tomlohave · Oct 2, 2014 · 43fe0bd · 43fe0bd
2 parents 6fbe2a0 + 0eba97c
commit 43fe0bd
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -352,6 +352,7 @@ static u16 chandef_to_chanspec(struct brcmu_d11inf *d11inf,
 	ch_inf.chnum = ieee80211_frequency_to_channel(ch->center_freq1);
 	primary_offset = ch->center_freq1 - ch->chan->center_freq;
 	switch (ch->width) {
+	case NL80211_CHAN_WIDTH_20_NOHT:
 	case NL80211_CHAN_WIDTH_20:
 		ch_inf.bw = BRCMU_CHAN_BW_20;
 		WARN_ON(primary_offset != 0);