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

Commit 7a9151c9 authored by Alexei Avshalom Lazar's avatar Alexei Avshalom Lazar Committed by Gerrit - the friendly Code Review server
Browse files

cfg80211: Add support for 60GHz band channels 5 and 6 



The current support in the 60GHz band is for channels 1-4.
Add support for channels 5 and 6.
This requires enlarging ieee80211_channel.center_freq from u16 to u32.

Signed-off-by: default avatarAlexei Avshalom Lazar <ailizaro@codeaurora.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Git-commit: 9cf0a0b4b64ae103cf0e7dfaa72b44ecda24c0eb
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git


CRs-Fixed: 2743684
Change-Id: I8e38c2e97d1f1e8f8f3e21e91a6a70f335a8447a
Signed-off-by: default avatarVinita S. Maloo <vmaloo@codeaurora.org>
parent 1d37df79

drivers/net/wireless/ath/wil6210/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1547,7 +1547,7 @@ static int wil_freq_debugfs_show(struct seq_file *s, void *data) 
{

	struct wil6210_priv *wil = s->private;

	struct wireless_dev *wdev = wil->main_ndev->ieee80211_ptr;

	u16 freq = wdev->chandef.chan ? wdev->chandef.chan->center_freq : 0;

	u32 freq = wdev->chandef.chan ? wdev->chandef.chan->center_freq : 0;



	seq_printf(s, "Freq = %d\n", freq);

include/net/cfg80211.h

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ enum ieee80211_channel_flags { 
 */

struct ieee80211_channel {

	enum nl80211_band band;

	u16 center_freq;

	u32 center_freq;

	u16 hw_value;

	u32 flags;

	int max_antenna_gain;

include/uapi/linux/nl80211.h

+1 −1
Original line number Diff line number Diff line
@@ -4498,7 +4498,7 @@ enum nl80211_txrate_gi { 
 * enum nl80211_band - Frequency band

 * @NL80211_BAND_2GHZ: 2.4 GHz ISM band

 * @NL80211_BAND_5GHZ: around 5 GHz band (4.9 - 5.7 GHz)

 * @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 64.80 GHz)

 * @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 69.12 GHz)

 * @NL80211_BAND_6GHZ: around 6 GHz band (5.9 - 7.2 GHz)

 * @NUM_NL80211_BANDS: number of bands, avoid using this in userspace

 *	since newer kernel versions may support more bands

net/wireless/reg.c

+1 −1
Original line number Diff line number Diff line
@@ -3340,7 +3340,7 @@ void regulatory_hint_disconnect(void) 
	restore_regulatory_settings(false);

}



static bool freq_is_chan_12_13_14(u16 freq)

static bool freq_is_chan_12_13_14(u32 freq)

{

	if (freq == ieee80211_channel_to_frequency(12, NL80211_BAND_2GHZ) ||

	    freq == ieee80211_channel_to_frequency(13, NL80211_BAND_2GHZ) ||

net/wireless/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
	} while (0)



#define CHAN_ENTRY __field(enum nl80211_band, band) \

		   __field(u16, center_freq)

		   __field(u32, center_freq)

#define CHAN_ASSIGN(chan)					  \

	do {							  \

		if (chan) {					  \