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

Commit 3a0c52a6 authored by Vladimir Kondratiev's avatar Vladimir Kondratiev Committed by Johannes Berg
Browse files

cfg80211: add 802.11ad (60gHz band) support 



Add enumerations for both cfg80211 and nl80211.
This expands wiphy.bands etc. arrays.

Extend channel <-> frequency translation to cover 60g band
and modify the rate check logic since there are no legacy
mandatory rates (only MCS is used.)

Signed-off-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent d9b3b28b

drivers/net/wireless/iwlegacy/3945-rs.c

+1 −1
Original line number Diff line number Diff line
@@ -946,7 +946,7 @@ il3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id) 
	case IEEE80211_BAND_5GHZ:

		rs_sta->expected_tpt = il3945_expected_tpt_a;

		break;

	case IEEE80211_NUM_BANDS:

	default:

		BUG();

		break;

	}

include/linux/nl80211.h

+2 −0
Original line number Diff line number Diff line
@@ -2545,10 +2545,12 @@ enum nl80211_tx_rate_attributes { 
 * 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)

 */

enum nl80211_band {

	NL80211_BAND_2GHZ,

	NL80211_BAND_5GHZ,

	NL80211_BAND_60GHZ,

};



/**

include/net/cfg80211.h

+2 −0
Original line number Diff line number Diff line
@@ -70,11 +70,13 @@ 
 *

 * @IEEE80211_BAND_2GHZ: 2.4GHz ISM band

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

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

 * @IEEE80211_NUM_BANDS: number of defined bands

 */

enum ieee80211_band {

	IEEE80211_BAND_2GHZ = NL80211_BAND_2GHZ,

	IEEE80211_BAND_5GHZ = NL80211_BAND_5GHZ,

	IEEE80211_BAND_60GHZ = NL80211_BAND_60GHZ,



	/* keep last */

	IEEE80211_NUM_BANDS

net/mac80211/tx.c

+2 −0
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, 
			if (r->flags & IEEE80211_RATE_MANDATORY_A)

				mrate = r->bitrate;

			break;

		case IEEE80211_BAND_60GHZ:

			/* TODO, for now fall through */

		case IEEE80211_NUM_BANDS:

			WARN_ON(1);

			break;

net/wireless/core.c

+8 −2
Original line number Diff line number Diff line
@@ -468,8 +468,14 @@ int wiphy_register(struct wiphy *wiphy) 
			continue;



		sband->band = band;



		if (WARN_ON(!sband->n_channels || !sband->n_bitrates))

		if (WARN_ON(!sband->n_channels))

			return -EINVAL;

		/*

		 * on 60gHz band, there are no legacy rates, so

		 * n_bitrates is 0

		 */

		if (WARN_ON(band != IEEE80211_BAND_60GHZ &&

			    !sband->n_bitrates))

			return -EINVAL;



		/*