Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75e6934a authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: fix HT40 connections 



My commit 4bf88530
("mac80211: convert to channel definition struct")
accidentally broke HT40 connections due to swapped
channel flag checks -- fix that.

Reported-by: default avatarSujith Manoharan <sujith@msujith.org>
Tested-by: default avatarSujith Manoharan <sujith@msujith.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 2d319867

net/mac80211/mlme.c

+2 −2
Original line number Diff line number Diff line
@@ -199,11 +199,11 @@ static u32 ieee80211_config_ht_tx(struct ieee80211_sub_if_data *sdata, 
	case NL80211_CHAN_WIDTH_40:

		if (sdata->vif.bss_conf.chandef.chan->center_freq >

				sdata->vif.bss_conf.chandef.center_freq1 &&

		    chan->flags & IEEE80211_CHAN_NO_HT40PLUS)

		    chan->flags & IEEE80211_CHAN_NO_HT40MINUS)

			disable_40 = true;

		if (sdata->vif.bss_conf.chandef.chan->center_freq <

				sdata->vif.bss_conf.chandef.center_freq1 &&

		    chan->flags & IEEE80211_CHAN_NO_HT40MINUS)

		    chan->flags & IEEE80211_CHAN_NO_HT40PLUS)

			disable_40 = true;

		break;

	default: