History

cfg80211: add checks for beacon rate, extend to mesh

The previous commit added support for specifying the beacon rate for AP mode. Add features checks to this, and extend it to also support the rate configuration for mesh networks. For IBSS it's not as simple due to joining etc., so that's not yet supported.

Johannes Berg committed 10 years ago

Commit 8564e381 parent a7c7fbf3 files · +54 −13Browse files

Showing the changes to include (2 of 3 files). Show all

Unified · Split

2 files
  1. include/net/cfg80211.h +3 −1
  2. include/uapi/linux/nl80211.h +16 −1
include/net/cfg80211.h+3−1
@@ -712,7 +712,7 @@ struct cfg80211_bitrate_mask { · 711 unmodified lines
712 * MAC address based access control712 * MAC address based access control
713 * @pbss: If set, start as a PCP instead of AP. Relevant for DMG713 * @pbss: If set, start as a PCP instead of AP. Relevant for DMG
714 * networks.714 * networks.
715 * @beacon_rate: masks for setting user configured beacon tx rate.715 * @beacon_rate: bitrate to be used for beacons
716 */716 */
717struct cfg80211_ap_settings {717struct cfg80211_ap_settings {
718 struct cfg80211_chan_def chandef;718 struct cfg80211_chan_def chandef;
@@ -1365,6 +1365,7 @@ struct mesh_config { · 646 unmodified lines
1365 * @beacon_interval: beacon interval to use1365 * @beacon_interval: beacon interval to use
1366 * @mcast_rate: multicat rate for Mesh Node [6Mbps is the default for 802.11a]1366 * @mcast_rate: multicat rate for Mesh Node [6Mbps is the default for 802.11a]
1367 * @basic_rates: basic rates to use when creating the mesh1367 * @basic_rates: basic rates to use when creating the mesh
1368 * @beacon_rate: bitrate to be used for beacons
1368 *1369 *
1369 * These parameters are fixed when the mesh is created.1370 * These parameters are fixed when the mesh is created.
1370 */1371 */
@@ -1385,6 +1386,7 @@ struct mesh_setup { · 14 unmodified lines
1385 u16 beacon_interval;1386 u16 beacon_interval;
1386 int mcast_rate[NUM_NL80211_BANDS];1387 int mcast_rate[NUM_NL80211_BANDS];
1387 u32 basic_rates;1388 u32 basic_rates;
1389 struct cfg80211_bitrate_mask beacon_rate;
1388};1390};
1389 1391
1390/**1392/**
include/uapi/linux/nl80211.h+16−1
@@ -1343,7 +1343,13 @@ enum nl80211_commands { · 1342 unmodified lines
1343 * enum nl80211_band value is used as the index (nla_type() of the nested1343 * enum nl80211_band value is used as the index (nla_type() of the nested
1344 * data. If a band is not included, it will be configured to allow all1344 * data. If a band is not included, it will be configured to allow all
1345 * rates based on negotiated supported rates information. This attribute1345 * rates based on negotiated supported rates information. This attribute
1346 * is used with %NL80211_CMD_SET_TX_BITRATE_MASK.1346 * is used with %NL80211_CMD_SET_TX_BITRATE_MASK and with starting AP,
1347 * and joining mesh networks (not IBSS yet). In the later case, it must
1348 * specify just a single bitrate, which is to be used for the beacon.
1349 * The driver must also specify support for this with the extended
1350 * features NL80211_EXT_FEATURE_BEACON_RATE_LEGACY,
1351 * NL80211_EXT_FEATURE_BEACON_RATE_HT and
1352 * NL80211_EXT_FEATURE_BEACON_RATE_VHT.
1347 *1353 *
1348 * @NL80211_ATTR_FRAME_MATCH: A binary attribute which typically must contain1354 * @NL80211_ATTR_FRAME_MATCH: A binary attribute which typically must contain
1349 * at least one byte, currently used with @NL80211_CMD_REGISTER_FRAME.1355 * at least one byte, currently used with @NL80211_CMD_REGISTER_FRAME.
@@ -4551,6 +4557,12 @@ enum nl80211_feature_flags { · 3201 unmodified lines
4551 * (if available).4557 * (if available).
4552 * @NL80211_EXT_FEATURE_SET_SCAN_DWELL: This driver supports configuration of4558 * @NL80211_EXT_FEATURE_SET_SCAN_DWELL: This driver supports configuration of
4553 * channel dwell time.4559 * channel dwell time.
4560 * @NL80211_EXT_FEATURE_BEACON_RATE_LEGACY: Driver supports beacon rate
4561 * configuration (AP/mesh), supporting a legacy (non HT/VHT) rate.
4562 * @NL80211_EXT_FEATURE_BEACON_RATE_HT: Driver supports beacon rate
4563 * configuration (AP/mesh) with HT rates.
4564 * @NL80211_EXT_FEATURE_BEACON_RATE_VHT: Driver supports beacon rate
4565 * configuration (AP/mesh) with VHT rates.
4554 *4566 *
4555 * @NUM_NL80211_EXT_FEATURES: number of extended features.4567 * @NUM_NL80211_EXT_FEATURES: number of extended features.
4556 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.4568 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
@@ -4562,6 +4574,9 @@ enum nl80211_ext_feature_index { · 5 unmodified lines
4562 NL80211_EXT_FEATURE_SCAN_START_TIME,4574 NL80211_EXT_FEATURE_SCAN_START_TIME,
4563 NL80211_EXT_FEATURE_BSS_PARENT_TSF,4575 NL80211_EXT_FEATURE_BSS_PARENT_TSF,
4564 NL80211_EXT_FEATURE_SET_SCAN_DWELL,4576 NL80211_EXT_FEATURE_SET_SCAN_DWELL,
4577 NL80211_EXT_FEATURE_BEACON_RATE_LEGACY,
4578 NL80211_EXT_FEATURE_BEACON_RATE_HT,
4579 NL80211_EXT_FEATURE_BEACON_RATE_VHT,
4565 4580
4566 /* add new features before the definition below */4581 /* add new features before the definition below */
4567 NUM_NL80211_EXT_FEATURES,4582 NUM_NL80211_EXT_FEATURES,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t