From 67599df0cbc74955ee3ad8443b800b0514934350 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 15 Jan 2010 01:16:44 +0000 Subject: iw: add patch for setting coverage class / distance git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19140 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iw/patches/001-sync_nl80211_h.patch | 167 ++++++++++++++++++++++++++++ package/iw/patches/100-coverage_class.patch | 81 ++++++++++++++ 2 files changed, 248 insertions(+) create mode 100644 package/iw/patches/001-sync_nl80211_h.patch create mode 100644 package/iw/patches/100-coverage_class.patch (limited to 'package/iw/patches') diff --git a/package/iw/patches/001-sync_nl80211_h.patch b/package/iw/patches/001-sync_nl80211_h.patch new file mode 100644 index 0000000000..fecb35d251 --- /dev/null +++ b/package/iw/patches/001-sync_nl80211_h.patch @@ -0,0 +1,167 @@ +--- a/nl80211.h ++++ b/nl80211.h +@@ -270,6 +270,35 @@ + * @NL80211_CMD_SET_WIPHY_NETNS: Set a wiphy's netns. Note that all devices + * associated with this wiphy must be down and will follow. + * ++ * @NL80211_CMD_REMAIN_ON_CHANNEL: Request to remain awake on the specified ++ * channel for the specified amount of time. This can be used to do ++ * off-channel operations like transmit a Public Action frame and wait for ++ * a response while being associated to an AP on another channel. ++ * %NL80211_ATTR_WIPHY or %NL80211_ATTR_IFINDEX is used to specify which ++ * radio is used. %NL80211_ATTR_WIPHY_FREQ is used to specify the ++ * frequency for the operation and %NL80211_ATTR_WIPHY_CHANNEL_TYPE may be ++ * optionally used to specify additional channel parameters. ++ * %NL80211_ATTR_DURATION is used to specify the duration in milliseconds ++ * to remain on the channel. This command is also used as an event to ++ * notify when the requested duration starts (it may take a while for the ++ * driver to schedule this time due to other concurrent needs for the ++ * radio). ++ * When called, this operation returns a cookie (%NL80211_ATTR_COOKIE) ++ * that will be included with any events pertaining to this request; ++ * the cookie is also used to cancel the request. ++ * @NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL: This command can be used to cancel a ++ * pending remain-on-channel duration if the desired operation has been ++ * completed prior to expiration of the originally requested duration. ++ * %NL80211_ATTR_WIPHY or %NL80211_ATTR_IFINDEX is used to specify the ++ * radio. The %NL80211_ATTR_COOKIE attribute must be given as well to ++ * uniquely identify the request. ++ * This command is also used as an event to notify when a requested ++ * remain-on-channel duration has expired. ++ * ++ * @NL80211_CMD_SET_TX_BITRATE_MASK: Set the mask of rates to be used in TX ++ * rate selection. %NL80211_ATTR_IFINDEX is used to specify the interface ++ * and @NL80211_ATTR_TX_RATES the set of allowed rates. ++ * + * @NL80211_CMD_MAX: highest used command number + * @__NL80211_CMD_AFTER_LAST: internal use + */ +@@ -349,6 +378,15 @@ enum nl80211_commands { + NL80211_CMD_GET_SURVEY, + NL80211_CMD_NEW_SURVEY_RESULTS, + ++ NL80211_CMD_SET_PMKSA, ++ NL80211_CMD_DEL_PMKSA, ++ NL80211_CMD_FLUSH_PMKSA, ++ ++ NL80211_CMD_REMAIN_ON_CHANNEL, ++ NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL, ++ ++ NL80211_CMD_SET_TX_BITRATE_MASK, ++ + /* add new commands above here */ + + /* used to define NL80211_CMD_MAX below */ +@@ -398,6 +436,8 @@ enum nl80211_commands { + * @NL80211_ATTR_WIPHY_RTS_THRESHOLD: RTS threshold (TX frames with length + * larger than or equal to this use RTS/CTS handshake); allowed range: + * 0..65536, disable with (u32)-1; dot11RTSThreshold; u32 ++ * @NL80211_ATTR_WIPHY_COVERAGE_CLASS: Coverage Class as defined by IEEE 802.11 ++ * section 7.3.2.9; dot11CoverageClass; u8 + * + * @NL80211_ATTR_IFINDEX: network interface index of the device to operate on + * @NL80211_ATTR_IFNAME: network interface name +@@ -598,6 +638,21 @@ enum nl80211_commands { + * the survey response for %NL80211_CMD_GET_SURVEY, nested attribute + * containing info as possible, see &enum survey_info. + * ++ * @NL80211_ATTR_PMKID: PMK material for PMKSA caching. ++ * @NL80211_ATTR_MAX_NUM_PMKIDS: maximum number of PMKIDs a firmware can ++ * cache, a wiphy attribute. ++ * ++ * @NL80211_ATTR_DURATION: Duration of an operation in milliseconds, u32. ++ * ++ * @NL80211_ATTR_COOKIE: Generic 64-bit cookie to identify objects. ++ * ++ * @NL80211_ATTR_TX_RATES: Nested set of attributes ++ * (enum nl80211_tx_rate_attributes) describing TX rates per band. The ++ * enum nl80211_band value is used as the index (nla_type() of the nested ++ * data. If a band is not included, it will be configured to allow all ++ * rates based on negotiated supported rates information. This attribute ++ * is used with %NL80211_CMD_SET_TX_BITRATE_MASK. ++ * + * @NL80211_ATTR_MAX: highest attribute number currently defined + * @__NL80211_ATTR_AFTER_LAST: internal use + */ +@@ -732,6 +787,17 @@ enum nl80211_attrs { + + NL80211_ATTR_SURVEY_INFO, + ++ NL80211_ATTR_PMKID, ++ NL80211_ATTR_MAX_NUM_PMKIDS, ++ ++ NL80211_ATTR_DURATION, ++ ++ NL80211_ATTR_COOKIE, ++ ++ NL80211_ATTR_WIPHY_COVERAGE_CLASS, ++ ++ NL80211_ATTR_TX_RATES, ++ + /* add attributes here, update the policy in nl80211.c */ + + __NL80211_ATTR_AFTER_LAST, +@@ -1312,13 +1378,20 @@ enum nl80211_channel_type { + * @NL80211_BSS_BEACON_INTERVAL: beacon interval of the (I)BSS (u16) + * @NL80211_BSS_CAPABILITY: capability field (CPU order, u16) + * @NL80211_BSS_INFORMATION_ELEMENTS: binary attribute containing the +- * raw information elements from the probe response/beacon (bin) ++ * raw information elements from the probe response/beacon (bin); ++ * if the %NL80211_BSS_BEACON_IES attribute is present, the IEs here are ++ * from a Probe Response frame; otherwise they are from a Beacon frame. ++ * However, if the driver does not indicate the source of the IEs, these ++ * IEs may be from either frame subtype. + * @NL80211_BSS_SIGNAL_MBM: signal strength of probe response/beacon + * in mBm (100 * dBm) (s32) + * @NL80211_BSS_SIGNAL_UNSPEC: signal strength of the probe response/beacon + * in unspecified units, scaled to 0..100 (u8) + * @NL80211_BSS_STATUS: status, if this BSS is "used" + * @NL80211_BSS_SEEN_MS_AGO: age of this BSS entry in ms ++ * @NL80211_BSS_BEACON_IES: binary attribute containing the raw information ++ * elements from a Beacon frame (bin); not present if no Beacon frame has ++ * yet been received + * @__NL80211_BSS_AFTER_LAST: internal + * @NL80211_BSS_MAX: highest BSS attribute + */ +@@ -1334,6 +1407,7 @@ enum nl80211_bss { + NL80211_BSS_SIGNAL_UNSPEC, + NL80211_BSS_STATUS, + NL80211_BSS_SEEN_MS_AGO, ++ NL80211_BSS_BEACON_IES, + + /* keep last */ + __NL80211_BSS_AFTER_LAST, +@@ -1431,4 +1505,33 @@ enum nl80211_key_attributes { + NL80211_KEY_MAX = __NL80211_KEY_AFTER_LAST - 1 + }; + ++/** ++ * enum nl80211_tx_rate_attributes - TX rate set attributes ++ * @__NL80211_TXRATE_INVALID: invalid ++ * @NL80211_TXRATE_LEGACY: Legacy (non-MCS) rates allowed for TX rate selection ++ * in an array of rates as defined in IEEE 802.11 7.3.2.2 (u8 values with ++ * 1 = 500 kbps) but without the IE length restriction (at most ++ * %NL80211_MAX_SUPP_RATES in a single array). ++ * @__NL80211_TXRATE_AFTER_LAST: internal ++ * @NL80211_TXRATE_MAX: highest TX rate attribute ++ */ ++enum nl80211_tx_rate_attributes { ++ __NL80211_TXRATE_INVALID, ++ NL80211_TXRATE_LEGACY, ++ ++ /* keep last */ ++ __NL80211_TXRATE_AFTER_LAST, ++ NL80211_TXRATE_MAX = __NL80211_TXRATE_AFTER_LAST - 1 ++}; ++ ++/** ++ * 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) ++ */ ++enum nl80211_band { ++ NL80211_BAND_2GHZ, ++ NL80211_BAND_5GHZ, ++}; ++ + #endif /* __LINUX_NL80211_H */ diff --git a/package/iw/patches/100-coverage_class.patch b/package/iw/patches/100-coverage_class.patch new file mode 100644 index 0000000000..8e18e038d6 --- /dev/null +++ b/package/iw/patches/100-coverage_class.patch @@ -0,0 +1,81 @@ +--- a/info.c ++++ b/info.c +@@ -156,6 +156,14 @@ static int print_phy_handler(struct nl_m + printf("\tRTS threshold: %d\n", rts); + } + ++ if (tb_msg[NL80211_ATTR_WIPHY_COVERAGE_CLASS]) { ++ unsigned char coverage; ++ ++ coverage = nla_get_u8(tb_msg[NL80211_ATTR_WIPHY_COVERAGE_CLASS]); ++ /* See handle_distance() for an explanation where the '450' comes from */ ++ printf("\tCoverage class: %d (up to %dm)\n", coverage, 450 * coverage); ++ } ++ + if (!tb_msg[NL80211_ATTR_SUPPORTED_IFTYPES]) + goto commands; + +--- a/phy.c ++++ b/phy.c +@@ -164,3 +164,61 @@ static int handle_netns(struct nl80211_s + COMMAND(set, netns, "", + NL80211_CMD_SET_WIPHY_NETNS, 0, CIB_PHY, handle_netns, + "Put this wireless device into a different network namespace"); ++ ++static int handle_coverage(struct nl80211_state *state, ++ struct nl_cb *cb, ++ struct nl_msg *msg, ++ int argc, char **argv) ++{ ++ unsigned int coverage; ++ ++ if (argc != 1) ++ return 1; ++ ++ coverage = strtoul(argv[0], NULL, 10); ++ if (coverage > 255) ++ return 1; ++ ++ NLA_PUT_U8(msg, NL80211_ATTR_WIPHY_COVERAGE_CLASS, coverage); ++ ++ return 0; ++ nla_put_failure: ++ return -ENOBUFS; ++} ++COMMAND(set, coverage, "", ++ NL80211_CMD_SET_WIPHY, 0, CIB_PHY, handle_coverage, ++ "Set coverage class (1 for every 3 usec of air propagation time).\n" ++ "Valid values: 0 - 255."); ++ ++static int handle_distance(struct nl80211_state *state, ++ struct nl_cb *cb, ++ struct nl_msg *msg, ++ int argc, char **argv) ++{ ++ unsigned int distance, coverage; ++ ++ if (argc != 1) ++ return 1; ++ ++ distance = strtoul(argv[0], NULL, 10); ++ ++ /* ++ * Divide double the distance by the speed of light in m/usec (300) to ++ * get round-trip time in microseconds and then divide the result by ++ * three to get coverage class as specified in IEEE 802.11-2007 table ++ * 7-27. Values are rounded upwards. ++ */ ++ coverage = (distance + 449) / 450; ++ if (coverage > 255) ++ return 1; ++ ++ NLA_PUT_U8(msg, NL80211_ATTR_WIPHY_COVERAGE_CLASS, coverage); ++ ++ return 0; ++ nla_put_failure: ++ return -ENOBUFS; ++} ++COMMAND(set, distance, "", ++ NL80211_CMD_SET_WIPHY, 0, CIB_PHY, handle_distance, ++ "Set appropriate coverage class for given link distance in meters.\n" ++ "Valid values: 0 - 114750"); -- cgit v1.2.3