1 files changed, 34 insertions, 1 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 0edb2566c14c..037b4e498890 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -804,6 +804,30 @@ enum nl80211_commands {
 * @NL80211_ATTR_SUPPORT_IBSS_RSN: The device supports IBSS RSN, which mostly
 *      means support for per-station GTKs.
 *
+ * @NL80211_ATTR_WIPHY_ANTENNA_TX: Bitmap of allowed antennas for transmitting.
+ *      This can be used to mask out antennas which are not attached or should
+ *      not be used for transmitting. If an antenna is not selected in this
+ *      bitmap the hardware is not allowed to transmit on this antenna.
+ *
+ *      Each bit represents one antenna, starting with antenna 1 at the first
+ *      bit. Depending on which antennas are selected in the bitmap, 802.11n
+ *      drivers can derive which chainmasks to use (if all antennas belonging to
+ *      a particular chain are disabled this chain should be disabled) and if
+ *      a chain has diversity antennas wether diversity should be used or not.
+ *      HT capabilities (STBC, TX Beamforming, Antenna selection) can be
+ *      derived from the available chains after applying the antenna mask.
+ *      Non-802.11n drivers can derive wether to use diversity or not.
+ *      Drivers may reject configurations or RX/TX mask combinations they cannot
+ *      support by returning -EINVAL.
+ *
+ * @NL80211_ATTR_WIPHY_ANTENNA_RX: Bitmap of allowed antennas for receiving.
+ *      This can be used to mask out antennas which are not attached or should
+ *      not be used for receiving. If an antenna is not selected in this bitmap
+ *      the hardware should not be configured to receive on this antenna.
+ *      For a more detailed descripton see @NL80211_ATTR_WIPHY_ANTENNA_TX.
+ *
+ * @NL80211_ATTR_MCAST_RATE: Multicast tx rate (in 100 kbps) for IBSS
+ *
 * @NL80211_ATTR_MAX: highest attribute number currently defined
 * @__NL80211_ATTR_AFTER_LAST: internal use
 */
@@ -973,6 +997,11 @@ enum nl80211_attrs {
        NL80211_ATTR_SUPPORT_IBSS_RSN,
+        NL80211_ATTR_WIPHY_ANTENNA_TX,
+        NL80211_ATTR_WIPHY_ANTENNA_RX,
+        NL80211_ATTR_MCAST_RATE,
        /* add attributes here, update the policy in nl80211.c */
        __NL80211_ATTR_AFTER_LAST,
@@ -1307,7 +1336,11 @@ enum nl80211_bitrate_attr {
 *      wireless core it thinks its knows the regulatory domain we should be in.
 * @NL80211_REGDOM_SET_BY_COUNTRY_IE: the wireless core has received an
 *      802.11 country information element with regulatory information it
- *      thinks we should consider.
+ *      thinks we should consider. cfg80211 only processes the country
+ *      code from the IE, and relies on the regulatory domain information
+ *      structure pased by userspace (CRDA) from our wireless-regdb.
+ *      If a channel is enabled but the country code indicates it should
+ *      be disabled we disable the channel and re-enable it upon disassociation.
 */
 enum nl80211_reg_initiator {
        NL80211_REGDOM_SET_BY_CORE,

diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index 0edb2566c14c..037b4e498890 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h
@@ -804,6 +804,30 @@ enum nl80211_commands {
804	* @NL80211_ATTR_SUPPORT_IBSS_RSN: The device supports IBSS RSN, which mostly	804	* @NL80211_ATTR_SUPPORT_IBSS_RSN: The device supports IBSS RSN, which mostly
805	* means support for per-station GTKs.	805	* means support for per-station GTKs.
806	*	806	*
		807	* @NL80211_ATTR_WIPHY_ANTENNA_TX: Bitmap of allowed antennas for transmitting.
		808	* This can be used to mask out antennas which are not attached or should
		809	* not be used for transmitting. If an antenna is not selected in this
		810	* bitmap the hardware is not allowed to transmit on this antenna.
		811	*
		812	* Each bit represents one antenna, starting with antenna 1 at the first
		813	* bit. Depending on which antennas are selected in the bitmap, 802.11n
		814	* drivers can derive which chainmasks to use (if all antennas belonging to
		815	* a particular chain are disabled this chain should be disabled) and if
		816	* a chain has diversity antennas wether diversity should be used or not.
		817	* HT capabilities (STBC, TX Beamforming, Antenna selection) can be
		818	* derived from the available chains after applying the antenna mask.
		819	* Non-802.11n drivers can derive wether to use diversity or not.
		820	* Drivers may reject configurations or RX/TX mask combinations they cannot
		821	* support by returning -EINVAL.
		822	*
		823	* @NL80211_ATTR_WIPHY_ANTENNA_RX: Bitmap of allowed antennas for receiving.
		824	* This can be used to mask out antennas which are not attached or should
		825	* not be used for receiving. If an antenna is not selected in this bitmap
		826	* the hardware should not be configured to receive on this antenna.
		827	* For a more detailed descripton see @NL80211_ATTR_WIPHY_ANTENNA_TX.
		828	*
		829	* @NL80211_ATTR_MCAST_RATE: Multicast tx rate (in 100 kbps) for IBSS
		830	*
807	* @NL80211_ATTR_MAX: highest attribute number currently defined	831	* @NL80211_ATTR_MAX: highest attribute number currently defined
808	* @__NL80211_ATTR_AFTER_LAST: internal use	832	* @__NL80211_ATTR_AFTER_LAST: internal use
809	*/	833	*/
@@ -973,6 +997,11 @@ enum nl80211_attrs {
973		997
974	NL80211_ATTR_SUPPORT_IBSS_RSN,	998	NL80211_ATTR_SUPPORT_IBSS_RSN,
975		999
		1000	NL80211_ATTR_WIPHY_ANTENNA_TX,
		1001	NL80211_ATTR_WIPHY_ANTENNA_RX,
		1002
		1003	NL80211_ATTR_MCAST_RATE,
		1004
976	/* add attributes here, update the policy in nl80211.c */	1005	/* add attributes here, update the policy in nl80211.c */
977		1006
978	__NL80211_ATTR_AFTER_LAST,	1007	__NL80211_ATTR_AFTER_LAST,
@@ -1307,7 +1336,11 @@ enum nl80211_bitrate_attr {
1307	* wireless core it thinks its knows the regulatory domain we should be in.	1336	* wireless core it thinks its knows the regulatory domain we should be in.
1308	* @NL80211_REGDOM_SET_BY_COUNTRY_IE: the wireless core has received an	1337	* @NL80211_REGDOM_SET_BY_COUNTRY_IE: the wireless core has received an
1309	* 802.11 country information element with regulatory information it	1338	* 802.11 country information element with regulatory information it
1310	* thinks we should consider.	1339	* thinks we should consider. cfg80211 only processes the country
		1340	* code from the IE, and relies on the regulatory domain information
		1341	* structure pased by userspace (CRDA) from our wireless-regdb.
		1342	* If a channel is enabled but the country code indicates it should
		1343	* be disabled we disable the channel and re-enable it upon disassociation.
1311	*/	1344	*/
1312	enum nl80211_reg_initiator {	1345	enum nl80211_reg_initiator {
1313	NL80211_REGDOM_SET_BY_CORE,	1346	NL80211_REGDOM_SET_BY_CORE,