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

Commit 4d51e149 authored by Ben Greear's avatar Ben Greear Committed by John W. Linville
Browse files

mac80211: Properly set work-item channel-type. 



Some were indirectly set to NO_HT (zero), but I think
it's better to explicitly set it in case the enum ever
changes.  In cfg.c, it seems the channel-type was just
ignored (and thus always set to NO_HT).

Signed-off-by: default avatarBen Greear <greearb@candelatech.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8c79a610

net/mac80211/cfg.c

+1 −0
Original line number Diff line number Diff line
@@ -1862,6 +1862,7 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev, 


	wk->type = IEEE80211_WORK_OFFCHANNEL_TX;

	wk->chan = chan;

	wk->chan_type = channel_type;

	wk->sdata = sdata;

	wk->done = ieee80211_offchan_tx_done;

	wk->offchan_tx.frame = skb;

net/mac80211/mlme.c

+2 −0
Original line number Diff line number Diff line
@@ -2294,6 +2294,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, 
	else

		wk->type = IEEE80211_WORK_DIRECT_PROBE;

	wk->chan = req->bss->channel;

	wk->chan_type = NL80211_CHAN_NO_HT;

	wk->sdata = sdata;

	wk->done = ieee80211_probe_auth_done;
@@ -2443,6 +2444,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, 
		memcpy(wk->assoc.prev_bssid, req->prev_bssid, ETH_ALEN);



	wk->chan = req->bss->channel;

	wk->chan_type = NL80211_CHAN_NO_HT;

	wk->sdata = sdata;

	wk->done = ieee80211_assoc_done;

	if (!bss->dtim_period &&