* [PATCH 1/2] cfg80211: process new country regulatory flags (DFS)
From: Luis R. Rodriguez @ 2010-12-20 17:02 UTC (permalink / raw)
To: linville
Cc: kathy.giori, amod.bodas, david.quan, michael.green,
linux-wireless, Luis R. Rodriguez
In-Reply-To: <1292864555-28661-1-git-send-email-lrodriguez@atheros.com>
This lets us pick up the new country regulatory flags.
This will later be used to inform of drivers later of
DFS parameters.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
include/linux/nl80211.h | 23 +++++++++++++++++++++++
include/net/regulatory.h | 1 +
net/wireless/nl80211.c | 9 +++++++++
net/wireless/reg.c | 26 ++++++++++++++++++++++++++
4 files changed, 59 insertions(+), 0 deletions(-)
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 1cee56b..f5553ba 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -858,6 +858,9 @@ enum nl80211_commands {
* attributes, specifying what a key should be set as default as.
* See &enum nl80211_key_default_types.
*
+ * @NL80211_ATTR_REG_COUNTRY_FLAGS: Country specific regulatory flags.
+ * These are @NL80211_CFLAG_DFS_*
+ *
* @NL80211_ATTR_MAX: highest attribute number currently defined
* @__NL80211_ATTR_AFTER_LAST: internal use
*/
@@ -1040,6 +1043,8 @@ enum nl80211_attrs {
NL80211_ATTR_MAX_REMAIN_ON_CHANNEL_DURATION,
+ NL80211_ATTR_REG_COUNTRY_FLAGS,
+
/* add attributes here, update the policy in nl80211.c */
__NL80211_ATTR_AFTER_LAST,
@@ -1477,6 +1482,24 @@ enum nl80211_reg_rule_flags {
};
/**
+ * enum nl80211_cflags - country regulatory flags
+ *
+ * @NL80211_CFLAG_DFS_FCC_: Country follows DFS master rules from FCC
+ * @NL80211_CFLAG_DFS_FCC_: Country follows DFS master rules from ETSI
+ * @NL80211_CFLAG_DFS_JP_: Country follows DFS master rules from JP/Telec
+ */
+enum nl80211_cflags {
+ NL80211_CFLAG_DFS_FCC = 1<<0,
+ NL80211_CFLAG_DFS_ETSI = 1<<1,
+ NL80211_CFLAG_DFS_JP = 1<<2,
+};
+
+#define NL80211_CFLAG_ALL_DFS_FLAGS \
+ (NL80211_CFLAG_DFS_FCC | \
+ NL80211_CFLAG_DFS_ETSI | \
+ NL80211_CFLAG_DFS_JP)
+
+/**
* enum nl80211_survey_info - survey information
*
* These attribute types are used with %NL80211_ATTR_SURVEY_INFO
diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index 356d6e3..9fcb603 100644
--- a/include/net/regulatory.h
+++ b/include/net/regulatory.h
@@ -85,6 +85,7 @@ struct ieee80211_reg_rule {
struct ieee80211_regdomain {
u32 n_reg_rules;
char alpha2[2];
+ u16 flags;
struct ieee80211_reg_rule reg_rules[];
};
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 594a6ac..d255499 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -172,6 +172,7 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
[NL80211_ATTR_MCAST_RATE] = { .type = NLA_U32 },
[NL80211_ATTR_OFFCHANNEL_TX_OK] = { .type = NLA_FLAG },
[NL80211_ATTR_KEY_DEFAULT_TYPES] = { .type = NLA_NESTED },
+ [NL80211_ATTR_REG_COUNTRY_FLAGS] = { .type = NLA_U16 },
};
/* policy for the key attributes */
@@ -2906,6 +2907,8 @@ static int nl80211_get_reg(struct sk_buff *skb, struct genl_info *info)
NLA_PUT_STRING(msg, NL80211_ATTR_REG_ALPHA2,
cfg80211_regdomain->alpha2);
+ NLA_PUT_U16(msg, NL80211_ATTR_REG_COUNTRY_FLAGS,
+ cfg80211_regdomain->flags);
nl_reg_rules = nla_nest_start(msg, NL80211_ATTR_REG_RULES);
if (!nl_reg_rules)
@@ -2963,6 +2966,7 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
char *alpha2 = NULL;
int rem_reg_rules = 0, r = 0;
u32 num_rules = 0, rule_idx = 0, size_of_regd;
+ u16 cflags = 0;
struct ieee80211_regdomain *rd = NULL;
if (!info->attrs[NL80211_ATTR_REG_ALPHA2])
@@ -2973,6 +2977,10 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
alpha2 = nla_data(info->attrs[NL80211_ATTR_REG_ALPHA2]);
+ if (info->attrs[NL80211_ATTR_REG_COUNTRY_FLAGS])
+ cflags =
+ nla_get_u16(info->attrs[NL80211_ATTR_REG_COUNTRY_FLAGS]);
+
nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES],
rem_reg_rules) {
num_rules++;
@@ -2999,6 +3007,7 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
rd->n_reg_rules = num_rules;
rd->alpha2[0] = alpha2[0];
rd->alpha2[1] = alpha2[1];
+ rd->flags = cflags;
nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES],
rem_reg_rules) {
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 99d4183..a3731d2 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1881,6 +1881,31 @@ static void print_rd_rules(const struct ieee80211_regdomain *rd)
}
}
+#define flag_check_print(_str) \
+ do { \
+ if (has_flag) \
+ pr_info(", "); \
+ pr_info(_str); \
+ has_flag = true; \
+ } while (0)
+
+static void print_country_flags(u16 flags)
+{
+ bool has_flag = false;
+
+ if (!(flags & NL80211_CFLAG_ALL_DFS_FLAGS))
+ return;
+
+ pr_info("DFS Master region:");
+
+ if (flags & NL80211_CFLAG_DFS_FCC)
+ flag_check_print("FCC");
+ if (flags & NL80211_CFLAG_DFS_ETSI)
+ flag_check_print("ETSI");
+ if (flags & NL80211_CFLAG_DFS_JP)
+ flag_check_print("JP");
+}
+
static void print_regdomain(const struct ieee80211_regdomain *rd)
{
@@ -1908,6 +1933,7 @@ static void print_regdomain(const struct ieee80211_regdomain *rd)
pr_info("Regulatory domain changed to country: %c%c\n",
rd->alpha2[0], rd->alpha2[1]);
}
+ print_country_flags(rd->flags);
print_rd_rules(rd);
}
--
1.7.3.2.90.gd4c43
^ permalink raw reply related
* [PATCH 2/2] cfg80211: pass DFS region to drivers through reg_notifier()
From: Luis R. Rodriguez @ 2010-12-20 17:02 UTC (permalink / raw)
To: linville
Cc: kathy.giori, amod.bodas, david.quan, michael.green,
linux-wireless, Luis R. Rodriguez
In-Reply-To: <1292864555-28661-1-git-send-email-lrodriguez@atheros.com>
This grants drivers access to the DFS region that a
regulatory domain belongs to.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
include/net/regulatory.h | 5 +++++
net/wireless/reg.c | 4 ++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index 9fcb603..3ed16c5 100644
--- a/include/net/regulatory.h
+++ b/include/net/regulatory.h
@@ -40,6 +40,10 @@ enum environment_cap {
* 99 - built by driver but a specific alpha2 cannot be determined
* 98 - result of an intersection between two regulatory domains
* 97 - regulatory domain has not yet been configured
+ * @dfs_region: If CRDA responded with a regulatory domain that requires
+ * DFS master operation on a known DFS region (NL80211_CFLAG_DFS_*),
+ * dfs_region represents that region. Drivers can use this and the
+ * @alpha2 to adjust their device's DFS parameters as they wish.
* @intersect: indicates whether the wireless core should intersect
* the requested regulatory domain with the presently set regulatory
* domain.
@@ -59,6 +63,7 @@ struct regulatory_request {
int wiphy_idx;
enum nl80211_reg_initiator initiator;
char alpha2[2];
+ u8 dfs_region;
bool intersect;
bool processed;
enum environment_cap country_ie_env;
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index a3731d2..fc842a2 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1127,8 +1127,12 @@ void wiphy_update_regulatory(struct wiphy *wiphy,
{
enum ieee80211_band band;
+ last_request->dfs_region = (cfg80211_regdomain->flags &
+ NL80211_CFLAG_ALL_DFS_FLAGS);
+
if (ignore_reg_update(wiphy, initiator))
goto out;
+
for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
if (wiphy->bands[band])
handle_band(wiphy, band, initiator);
--
1.7.3.2.90.gd4c43
^ permalink raw reply related
* [PATCH 5/8] crda: synch up nl80211.h header with upstream for country flags
From: Luis R. Rodriguez @ 2010-12-20 17:02 UTC (permalink / raw)
To: linville
Cc: kathy.giori, amod.bodas, david.quan, michael.green,
linux-wireless, Luis R. Rodriguez
In-Reply-To: <1292864555-28661-1-git-send-email-lrodriguez@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
nl80211.h | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/nl80211.h b/nl80211.h
index 1cee56b..061c9a1 100644
--- a/nl80211.h
+++ b/nl80211.h
@@ -858,6 +858,9 @@ enum nl80211_commands {
* attributes, specifying what a key should be set as default as.
* See &enum nl80211_key_default_types.
*
+ * @NL80211_ATTR_REG_COUNTRY_FLAGS: Country specific regulatory flags.
+ * These are @NL80211_CFLAG_DFS_*
+ *
* @NL80211_ATTR_MAX: highest attribute number currently defined
* @__NL80211_ATTR_AFTER_LAST: internal use
*/
@@ -1040,6 +1043,8 @@ enum nl80211_attrs {
NL80211_ATTR_MAX_REMAIN_ON_CHANNEL_DURATION,
+ NL80211_ATTR_REG_COUNTRY_FLAGS,
+
/* add attributes here, update the policy in nl80211.c */
__NL80211_ATTR_AFTER_LAST,
@@ -1477,6 +1482,24 @@ enum nl80211_reg_rule_flags {
};
/**
+ * enum nl80211_cflags - country regulatory flags
+ *
+ * @NL80211_CFLAG_DFS_FCC_: Country follows DFS master rules from FCC
+ * @NL80211_CFLAG_DFS_FCC_: Country follows DFS master rules from ETSI
+ * @NL80211_CFLAG_DFS_JP_: Country follows DFS master rules from JP/Telec
+ */
+enum nl80211_cflags {
+ NL80211_CFLAG_DFS_FCC = 1<<0,
+ NL80211_CFLAG_DFS_ETSI = 1<<1,
+ NL80211_CFLAG_DFS_JP = 1<<2,
+};
+
+#define NL80211_CFLAG_ALL_DFS_FLAGS \
+ (NL80211_CFLAG_DFS_FCC | \
+ NL80211_CFLAG_DFS_ETSI | \
+ NL80211_CFLAG_DFS_JP)
+
+/**
* enum nl80211_survey_info - survey information
*
* These attribute types are used with %NL80211_ATTR_SURVEY_INFO
--
1.7.3.2.90.gd4c43
^ permalink raw reply related
* [PATCH 1/2] iw: fix country print
From: Luis R. Rodriguez @ 2010-12-20 17:02 UTC (permalink / raw)
To: linville
Cc: kathy.giori, amod.bodas, david.quan, michael.green,
linux-wireless, Luis R. Rodriguez
In-Reply-To: <1292864555-28661-1-git-send-email-lrodriguez@atheros.com>
Using a %s to pring the alpha2 may give us some extra
data which will spew out when printing. Fix it by only
printing the two characters we know we will get.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
reg.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/reg.c b/reg.c
index 7f82e08..c4ee1c4 100644
--- a/reg.c
+++ b/reg.c
@@ -132,7 +132,7 @@ static int print_reg_handler(struct nl_msg *msg, void *arg)
}
alpha2 = nla_data(tb_msg[NL80211_ATTR_REG_ALPHA2]);
- printf("country %s:\n", alpha2);
+ printf("country %c%c:\n", alpha2[0], alpha2[1]);
nla_for_each_nested(nl_rule, tb_msg[NL80211_ATTR_REG_RULES], rem_rule) {
struct nlattr *tb_rule[NL80211_FREQUENCY_ATTR_MAX + 1];
--
1.7.3.2.90.gd4c43
^ permalink raw reply related
* [RFC 8/8] wireless-regdb: add FCC as the DFS region for US
From: Luis R. Rodriguez @ 2010-12-20 17:02 UTC (permalink / raw)
To: linville
Cc: kathy.giori, amod.bodas, david.quan, michael.green,
linux-wireless, Luis R. Rodriguez
In-Reply-To: <1292864555-28661-1-git-send-email-lrodriguez@atheros.com>
DFS master support in the US requires consideration for DFS
requirements as defined by the FCC rules.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
db.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/db.txt b/db.txt
index e63a43e..d1616ef 100644
--- a/db.txt
+++ b/db.txt
@@ -611,7 +611,7 @@ country TR:
country UA:
(2402 - 2482 @ 40), (N/A, 20)
-country US:
+country US: DFS-FCC
(2402 - 2472 @ 40), (3, 27)
(5170 - 5250 @ 40), (3, 17)
(5250 - 5330 @ 40), (3, 20), DFS
--
1.7.3.2.90.gd4c43
^ permalink raw reply related
* [PATCH 4/8] crda: synch up nl80211.h copy file
From: Luis R. Rodriguez @ 2010-12-20 17:02 UTC (permalink / raw)
To: linville
Cc: kathy.giori, amod.bodas, david.quan, michael.green,
linux-wireless, Luis R. Rodriguez
In-Reply-To: <1292864555-28661-1-git-send-email-lrodriguez@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
nl80211.h | 1218 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 1182 insertions(+), 36 deletions(-)
diff --git a/nl80211.h b/nl80211.h
index 04d4516..1cee56b 100644
--- a/nl80211.h
+++ b/nl80211.h
@@ -3,11 +3,11 @@
/*
* 802.11 netlink interface public header
*
- * Copyright 2006, 2007, 2008 Johannes Berg <johannes@sipsolutions.net>
+ * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net>
* Copyright 2008 Michael Wu <flamingice@sourmilk.net>
* Copyright 2008 Luis Carlos Cobo <luisca@cozybit.com>
* Copyright 2008 Michael Buesch <mb@bu3sch.de>
- * Copyright 2008 Luis R. Rodriguez <lrodriguez@atheros.com>
+ * Copyright 2008, 2009 Luis R. Rodriguez <lrodriguez@atheros.com>
* Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com>
* Copyright 2008 Colin McCabe <colin@cozybit.com>
*
@@ -25,6 +25,8 @@
*
*/
+#include <linux/types.h>
+
/**
* DOC: Station handling
*
@@ -38,6 +40,43 @@
*/
/**
+ * DOC: Frame transmission/registration support
+ *
+ * Frame transmission and registration support exists to allow userspace
+ * management entities such as wpa_supplicant react to management frames
+ * that are not being handled by the kernel. This includes, for example,
+ * certain classes of action frames that cannot be handled in the kernel
+ * for various reasons.
+ *
+ * Frame registration is done on a per-interface basis and registrations
+ * cannot be removed other than by closing the socket. It is possible to
+ * specify a registration filter to register, for example, only for a
+ * certain type of action frame. In particular with action frames, those
+ * that userspace registers for will not be returned as unhandled by the
+ * driver, so that the registered application has to take responsibility
+ * for doing that.
+ *
+ * The type of frame that can be registered for is also dependent on the
+ * driver and interface type. The frame types are advertised in wiphy
+ * attributes so applications know what to expect.
+ *
+ * NOTE: When an interface changes type while registrations are active,
+ * these registrations are ignored until the interface type is
+ * changed again. This means that changing the interface type can
+ * lead to a situation that couldn't otherwise be produced, but
+ * any such registrations will be dormant in the sense that they
+ * will not be serviced, i.e. they will not receive any frames.
+ *
+ * Frame transmission allows userspace to send for example the required
+ * responses to action frames. It is subject to some sanity checking,
+ * but many frames can be transmitted. When a frame was transmitted, its
+ * status is indicated to the sending socket.
+ *
+ * For more technical details, see the corresponding command descriptions
+ * below.
+ */
+
+/**
* enum nl80211_commands - supported nl80211 commands
*
* @NL80211_CMD_UNSPEC: unspecified command to catch errors
@@ -46,8 +85,12 @@
* to get a list of all present wiphys.
* @NL80211_CMD_SET_WIPHY: set wiphy parameters, needs %NL80211_ATTR_WIPHY or
* %NL80211_ATTR_IFINDEX; can be used to set %NL80211_ATTR_WIPHY_NAME,
- * %NL80211_ATTR_WIPHY_TXQ_PARAMS, %NL80211_ATTR_WIPHY_FREQ, and/or
- * %NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET.
+ * %NL80211_ATTR_WIPHY_TXQ_PARAMS, %NL80211_ATTR_WIPHY_FREQ,
+ * %NL80211_ATTR_WIPHY_CHANNEL_TYPE, %NL80211_ATTR_WIPHY_RETRY_SHORT,
+ * %NL80211_ATTR_WIPHY_RETRY_LONG, %NL80211_ATTR_WIPHY_FRAG_THRESHOLD,
+ * and/or %NL80211_ATTR_WIPHY_RTS_THRESHOLD.
+ * However, for setting the channel, see %NL80211_CMD_SET_CHANNEL
+ * instead, the support here is for backward compatibility only.
* @NL80211_CMD_NEW_WIPHY: Newly created wiphy, response to get request
* or rename notification. Has attributes %NL80211_ATTR_WIPHY and
* %NL80211_ATTR_WIPHY_NAME.
@@ -72,11 +115,11 @@
*
* @NL80211_CMD_GET_KEY: Get sequence counter information for a key specified
* by %NL80211_ATTR_KEY_IDX and/or %NL80211_ATTR_MAC.
- * @NL80211_CMD_SET_KEY: Set key attributes %NL80211_ATTR_KEY_DEFAULT or
- * %NL80211_ATTR_KEY_THRESHOLD.
+ * @NL80211_CMD_SET_KEY: Set key attributes %NL80211_ATTR_KEY_DEFAULT,
+ * %NL80211_ATTR_KEY_DEFAULT_MGMT, or %NL80211_ATTR_KEY_THRESHOLD.
* @NL80211_CMD_NEW_KEY: add a key with given %NL80211_ATTR_KEY_DATA,
- * %NL80211_ATTR_KEY_IDX, %NL80211_ATTR_MAC and %NL80211_ATTR_KEY_CIPHER
- * attributes.
+ * %NL80211_ATTR_KEY_IDX, %NL80211_ATTR_MAC, %NL80211_ATTR_KEY_CIPHER,
+ * and %NL80211_ATTR_KEY_SEQ attributes.
* @NL80211_CMD_DEL_KEY: delete a key identified by %NL80211_ATTR_KEY_IDX
* or %NL80211_ATTR_MAC.
*
@@ -84,7 +127,7 @@
* %NL80222_CMD_NEW_BEACON message)
* @NL80211_CMD_SET_BEACON: set the beacon on an access point interface
* using the %NL80211_ATTR_BEACON_INTERVAL, %NL80211_ATTR_DTIM_PERIOD,
- * %NL80211_BEACON_HEAD and %NL80211_BEACON_TAIL attributes.
+ * %NL80211_ATTR_BEACON_HEAD and %NL80211_ATTR_BEACON_TAIL attributes.
* @NL80211_CMD_NEW_BEACON: add a new beacon to an access point interface,
* parameters are like for %NL80211_CMD_SET_BEACON.
* @NL80211_CMD_DEL_BEACON: remove the beacon, stop sending it
@@ -113,6 +156,8 @@
* @NL80211_CMD_SET_BSS: Set BSS attributes for BSS identified by
* %NL80211_ATTR_IFINDEX.
*
+ * @NL80211_CMD_GET_REG: ask the wireless core to send us its currently set
+ * regulatory domain.
* @NL80211_CMD_SET_REG: Set current regulatory domain. CRDA sends this command
* after being queried by the kernel. CRDA replies by sending a regulatory
* domain structure which consists of %NL80211_ATTR_REG_ALPHA set to our
@@ -124,7 +169,7 @@
* %NL80211_ATTR_REG_RULE_POWER_MAX_ANT_GAIN and
* %NL80211_ATTR_REG_RULE_POWER_MAX_EIRP.
* @NL80211_CMD_REQ_SET_REG: ask the wireless core to set the regulatory domain
- * to the the specified ISO/IEC 3166-1 alpha2 country code. The core will
+ * to the specified ISO/IEC 3166-1 alpha2 country code. The core will
* store this as a valid request and then query userspace for it.
*
* @NL80211_CMD_GET_MESH_PARAMS: Get mesh networking properties for the
@@ -133,6 +178,227 @@
* @NL80211_CMD_SET_MESH_PARAMS: Set mesh networking properties for the
* interface identified by %NL80211_ATTR_IFINDEX
*
+ * @NL80211_CMD_SET_MGMT_EXTRA_IE: Set extra IEs for management frames. The
+ * interface is identified with %NL80211_ATTR_IFINDEX and the management
+ * frame subtype with %NL80211_ATTR_MGMT_SUBTYPE. The extra IE data to be
+ * added to the end of the specified management frame is specified with
+ * %NL80211_ATTR_IE. If the command succeeds, the requested data will be
+ * added to all specified management frames generated by
+ * kernel/firmware/driver.
+ * Note: This command has been removed and it is only reserved at this
+ * point to avoid re-using existing command number. The functionality this
+ * command was planned for has been provided with cleaner design with the
+ * option to specify additional IEs in NL80211_CMD_TRIGGER_SCAN,
+ * NL80211_CMD_AUTHENTICATE, NL80211_CMD_ASSOCIATE,
+ * NL80211_CMD_DEAUTHENTICATE, and NL80211_CMD_DISASSOCIATE.
+ *
+ * @NL80211_CMD_GET_SCAN: get scan results
+ * @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters
+ * @NL80211_CMD_NEW_SCAN_RESULTS: scan notification (as a reply to
+ * NL80211_CMD_GET_SCAN and on the "scan" multicast group)
+ * @NL80211_CMD_SCAN_ABORTED: scan was aborted, for unspecified reasons,
+ * partial scan results may be available
+ *
+ * @NL80211_CMD_GET_SURVEY: get survey resuls, e.g. channel occupation
+ * or noise level
+ * @NL80211_CMD_NEW_SURVEY_RESULTS: survey data notification (as a reply to
+ * NL80211_CMD_GET_SURVEY and on the "scan" multicast group)
+ *
+ * @NL80211_CMD_REG_CHANGE: indicates to userspace the regulatory domain
+ * has been changed and provides details of the request information
+ * that caused the change such as who initiated the regulatory request
+ * (%NL80211_ATTR_REG_INITIATOR), the wiphy_idx
+ * (%NL80211_ATTR_REG_ALPHA2) on which the request was made from if
+ * the initiator was %NL80211_REGDOM_SET_BY_COUNTRY_IE or
+ * %NL80211_REGDOM_SET_BY_DRIVER, the type of regulatory domain
+ * set (%NL80211_ATTR_REG_TYPE), if the type of regulatory domain is
+ * %NL80211_REG_TYPE_COUNTRY the alpha2 to which we have moved on
+ * to (%NL80211_ATTR_REG_ALPHA2).
+ * @NL80211_CMD_REG_BEACON_HINT: indicates to userspace that an AP beacon
+ * has been found while world roaming thus enabling active scan or
+ * any mode of operation that initiates TX (beacons) on a channel
+ * where we would not have been able to do either before. As an example
+ * if you are world roaming (regulatory domain set to world or if your
+ * driver is using a custom world roaming regulatory domain) and while
+ * doing a passive scan on the 5 GHz band you find an AP there (if not
+ * on a DFS channel) you will now be able to actively scan for that AP
+ * or use AP mode on your card on that same channel. Note that this will
+ * never be used for channels 1-11 on the 2 GHz band as they are always
+ * enabled world wide. This beacon hint is only sent if your device had
+ * either disabled active scanning or beaconing on a channel. We send to
+ * userspace the wiphy on which we removed a restriction from
+ * (%NL80211_ATTR_WIPHY) and the channel on which this occurred
+ * before (%NL80211_ATTR_FREQ_BEFORE) and after (%NL80211_ATTR_FREQ_AFTER)
+ * the beacon hint was processed.
+ *
+ * @NL80211_CMD_AUTHENTICATE: authentication request and notification.
+ * This command is used both as a command (request to authenticate) and
+ * as an event on the "mlme" multicast group indicating completion of the
+ * authentication process.
+ * When used as a command, %NL80211_ATTR_IFINDEX is used to identify the
+ * interface. %NL80211_ATTR_MAC is used to specify PeerSTAAddress (and
+ * BSSID in case of station mode). %NL80211_ATTR_SSID is used to specify
+ * the SSID (mainly for association, but is included in authentication
+ * request, too, to help BSS selection. %NL80211_ATTR_WIPHY_FREQ is used
+ * to specify the frequence of the channel in MHz. %NL80211_ATTR_AUTH_TYPE
+ * is used to specify the authentication type. %NL80211_ATTR_IE is used to
+ * define IEs (VendorSpecificInfo, but also including RSN IE and FT IEs)
+ * to be added to the frame.
+ * When used as an event, this reports reception of an Authentication
+ * frame in station and IBSS modes when the local MLME processed the
+ * frame, i.e., it was for the local STA and was received in correct
+ * state. This is similar to MLME-AUTHENTICATE.confirm primitive in the
+ * MLME SAP interface (kernel providing MLME, userspace SME). The
+ * included %NL80211_ATTR_FRAME attribute contains the management frame
+ * (including both the header and frame body, but not FCS). This event is
+ * also used to indicate if the authentication attempt timed out. In that
+ * case the %NL80211_ATTR_FRAME attribute is replaced with a
+ * %NL80211_ATTR_TIMED_OUT flag (and %NL80211_ATTR_MAC to indicate which
+ * pending authentication timed out).
+ * @NL80211_CMD_ASSOCIATE: association request and notification; like
+ * NL80211_CMD_AUTHENTICATE but for Association and Reassociation
+ * (similar to MLME-ASSOCIATE.request, MLME-REASSOCIATE.request,
+ * MLME-ASSOCIATE.confirm or MLME-REASSOCIATE.confirm primitives).
+ * @NL80211_CMD_DEAUTHENTICATE: deauthentication request and notification; like
+ * NL80211_CMD_AUTHENTICATE but for Deauthentication frames (similar to
+ * MLME-DEAUTHENTICATION.request and MLME-DEAUTHENTICATE.indication
+ * primitives).
+ * @NL80211_CMD_DISASSOCIATE: disassociation request and notification; like
+ * NL80211_CMD_AUTHENTICATE but for Disassociation frames (similar to
+ * MLME-DISASSOCIATE.request and MLME-DISASSOCIATE.indication primitives).
+ *
+ * @NL80211_CMD_MICHAEL_MIC_FAILURE: notification of a locally detected Michael
+ * MIC (part of TKIP) failure; sent on the "mlme" multicast group; the
+ * event includes %NL80211_ATTR_MAC to describe the source MAC address of
+ * the frame with invalid MIC, %NL80211_ATTR_KEY_TYPE to show the key
+ * type, %NL80211_ATTR_KEY_IDX to indicate the key identifier, and
+ * %NL80211_ATTR_KEY_SEQ to indicate the TSC value of the frame; this
+ * event matches with MLME-MICHAELMICFAILURE.indication() primitive
+ *
+ * @NL80211_CMD_JOIN_IBSS: Join a new IBSS -- given at least an SSID and a
+ * FREQ attribute (for the initial frequency if no peer can be found)
+ * and optionally a MAC (as BSSID) and FREQ_FIXED attribute if those
+ * should be fixed rather than automatically determined. Can only be
+ * executed on a network interface that is UP, and fixed BSSID/FREQ
+ * may be rejected. Another optional parameter is the beacon interval,
+ * given in the %NL80211_ATTR_BEACON_INTERVAL attribute, which if not
+ * given defaults to 100 TU (102.4ms).
+ * @NL80211_CMD_LEAVE_IBSS: Leave the IBSS -- no special arguments, the IBSS is
+ * determined by the network interface.
+ *
+ * @NL80211_CMD_TESTMODE: testmode command, takes a wiphy (or ifindex) attribute
+ * to identify the device, and the TESTDATA blob attribute to pass through
+ * to the driver.
+ *
+ * @NL80211_CMD_CONNECT: connection request and notification; this command
+ * requests to connect to a specified network but without separating
+ * auth and assoc steps. For this, you need to specify the SSID in a
+ * %NL80211_ATTR_SSID attribute, and can optionally specify the association
+ * IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_MAC,
+ * %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,
+ * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE and
+ * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT.
+ * It is also sent as an event, with the BSSID and response IEs when the
+ * connection is established or failed to be established. This can be
+ * determined by the STATUS_CODE attribute.
+ * @NL80211_CMD_ROAM: request that the card roam (currently not implemented),
+ * sent as an event when the card/driver roamed by itself.
+ * @NL80211_CMD_DISCONNECT: drop a given connection; also used to notify
+ * userspace that a connection was dropped by the AP or due to other
+ * reasons, for this the %NL80211_ATTR_DISCONNECTED_BY_AP and
+ * %NL80211_ATTR_REASON_CODE attributes are used.
+ *
+ * @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_IFINDEX is used to specify which interface (and thus
+ * 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_REGISTER_FRAME: Register for receiving certain mgmt frames
+ * (via @NL80211_CMD_FRAME) for processing in userspace. This command
+ * requires an interface index, a frame type attribute (optional for
+ * backward compatibility reasons, if not given assumes action frames)
+ * and a match attribute containing the first few bytes of the frame
+ * that should match, e.g. a single byte for only a category match or
+ * four bytes for vendor frames including the OUI. The registration
+ * cannot be dropped, but is removed automatically when the netlink
+ * socket is closed. Multiple registrations can be made.
+ * @NL80211_CMD_REGISTER_ACTION: Alias for @NL80211_CMD_REGISTER_FRAME for
+ * backward compatibility
+ * @NL80211_CMD_FRAME: Management frame TX request and RX notification. This
+ * command is used both as a request to transmit a management frame and
+ * as an event indicating reception of a frame that was not processed in
+ * kernel code, but is for us (i.e., which may need to be processed in a
+ * user space application). %NL80211_ATTR_FRAME is used to specify the
+ * frame contents (including header). %NL80211_ATTR_WIPHY_FREQ (and
+ * optionally %NL80211_ATTR_WIPHY_CHANNEL_TYPE) is used to indicate on
+ * which channel the frame is to be transmitted or was received. If this
+ * channel is not the current channel (remain-on-channel or the
+ * operational channel) the device will switch to the given channel and
+ * transmit the frame, optionally waiting for a response for the time
+ * specified using %NL80211_ATTR_DURATION. When called, this operation
+ * returns a cookie (%NL80211_ATTR_COOKIE) that will be included with the
+ * TX status event pertaining to the TX request.
+ * @NL80211_CMD_FRAME_WAIT_CANCEL: When an off-channel TX was requested, this
+ * command may be used with the corresponding cookie to cancel the wait
+ * time if it is known that it is no longer necessary.
+ * @NL80211_CMD_ACTION: Alias for @NL80211_CMD_FRAME for backward compatibility.
+ * @NL80211_CMD_FRAME_TX_STATUS: Report TX status of a management frame
+ * transmitted with %NL80211_CMD_FRAME. %NL80211_ATTR_COOKIE identifies
+ * the TX command and %NL80211_ATTR_FRAME includes the contents of the
+ * frame. %NL80211_ATTR_ACK flag is included if the recipient acknowledged
+ * the frame.
+ * @NL80211_CMD_ACTION_TX_STATUS: Alias for @NL80211_CMD_FRAME_TX_STATUS for
+ * backward compatibility.
+ * @NL80211_CMD_SET_CQM: Connection quality monitor configuration. This command
+ * is used to configure connection quality monitoring notification trigger
+ * levels.
+ * @NL80211_CMD_NOTIFY_CQM: Connection quality monitor notification. This
+ * command is used as an event to indicate the that a trigger level was
+ * reached.
+ * @NL80211_CMD_SET_CHANNEL: Set the channel (using %NL80211_ATTR_WIPHY_FREQ
+ * and %NL80211_ATTR_WIPHY_CHANNEL_TYPE) the given interface (identifed
+ * by %NL80211_ATTR_IFINDEX) shall operate on.
+ * In case multiple channels are supported by the device, the mechanism
+ * with which it switches channels is implementation-defined.
+ * When a monitor interface is given, it can only switch channel while
+ * no other interfaces are operating to avoid disturbing the operation
+ * of any other interfaces, and other interfaces will again take
+ * precedence when they are used.
+ *
+ * @NL80211_CMD_SET_WDS_PEER: Set the MAC address of the peer on a WDS interface.
+ *
+ * @NL80211_CMD_JOIN_MESH: Join a mesh. The mesh ID must be given, and initial
+ * mesh config parameters may be given.
+ * @NL80211_CMD_LEAVE_MESH: Leave the mesh network -- no special arguments, the
+ * network is determined by the network interface.
+ *
* @NL80211_CMD_MAX: highest used command number
* @__NL80211_CMD_AFTER_LAST: internal use
*/
@@ -178,6 +444,70 @@ enum nl80211_commands {
NL80211_CMD_GET_MESH_PARAMS,
NL80211_CMD_SET_MESH_PARAMS,
+ NL80211_CMD_SET_MGMT_EXTRA_IE /* reserved; not used */,
+
+ NL80211_CMD_GET_REG,
+
+ NL80211_CMD_GET_SCAN,
+ NL80211_CMD_TRIGGER_SCAN,
+ NL80211_CMD_NEW_SCAN_RESULTS,
+ NL80211_CMD_SCAN_ABORTED,
+
+ NL80211_CMD_REG_CHANGE,
+
+ NL80211_CMD_AUTHENTICATE,
+ NL80211_CMD_ASSOCIATE,
+ NL80211_CMD_DEAUTHENTICATE,
+ NL80211_CMD_DISASSOCIATE,
+
+ NL80211_CMD_MICHAEL_MIC_FAILURE,
+
+ NL80211_CMD_REG_BEACON_HINT,
+
+ NL80211_CMD_JOIN_IBSS,
+ NL80211_CMD_LEAVE_IBSS,
+
+ NL80211_CMD_TESTMODE,
+
+ NL80211_CMD_CONNECT,
+ NL80211_CMD_ROAM,
+ NL80211_CMD_DISCONNECT,
+
+ NL80211_CMD_SET_WIPHY_NETNS,
+
+ 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,
+
+ NL80211_CMD_REGISTER_FRAME,
+ NL80211_CMD_REGISTER_ACTION = NL80211_CMD_REGISTER_FRAME,
+ NL80211_CMD_FRAME,
+ NL80211_CMD_ACTION = NL80211_CMD_FRAME,
+ NL80211_CMD_FRAME_TX_STATUS,
+ NL80211_CMD_ACTION_TX_STATUS = NL80211_CMD_FRAME_TX_STATUS,
+
+ NL80211_CMD_SET_POWER_SAVE,
+ NL80211_CMD_GET_POWER_SAVE,
+
+ NL80211_CMD_SET_CQM,
+ NL80211_CMD_NOTIFY_CQM,
+
+ NL80211_CMD_SET_CHANNEL,
+ NL80211_CMD_SET_WDS_PEER,
+
+ NL80211_CMD_FRAME_WAIT_CANCEL,
+
+ NL80211_CMD_JOIN_MESH,
+ NL80211_CMD_LEAVE_MESH,
+
/* add new commands above here */
/* used to define NL80211_CMD_MAX below */
@@ -190,6 +520,13 @@ enum nl80211_commands {
* here
*/
#define NL80211_CMD_SET_BSS NL80211_CMD_SET_BSS
+#define NL80211_CMD_SET_MGMT_EXTRA_IE NL80211_CMD_SET_MGMT_EXTRA_IE
+#define NL80211_CMD_REG_CHANGE NL80211_CMD_REG_CHANGE
+#define NL80211_CMD_AUTHENTICATE NL80211_CMD_AUTHENTICATE
+#define NL80211_CMD_ASSOCIATE NL80211_CMD_ASSOCIATE
+#define NL80211_CMD_DEAUTHENTICATE NL80211_CMD_DEAUTHENTICATE
+#define NL80211_CMD_DISASSOCIATE NL80211_CMD_DISASSOCIATE
+#define NL80211_CMD_REG_BEACON_HINT NL80211_CMD_REG_BEACON_HINT
/**
* enum nl80211_attrs - nl80211 netlink attributes
@@ -201,13 +538,27 @@ enum nl80211_commands {
* @NL80211_ATTR_WIPHY_NAME: wiphy name (used for renaming)
* @NL80211_ATTR_WIPHY_TXQ_PARAMS: a nested array of TX queue parameters
* @NL80211_ATTR_WIPHY_FREQ: frequency of the selected channel in MHz
- * @NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET: included with NL80211_ATTR_WIPHY_FREQ
+ * @NL80211_ATTR_WIPHY_CHANNEL_TYPE: included with NL80211_ATTR_WIPHY_FREQ
* if HT20 or HT40 are allowed (i.e., 802.11n disabled if not included):
- * NL80211_SEC_CHAN_NO_HT = HT not allowed (i.e., same as not including
+ * NL80211_CHAN_NO_HT = HT not allowed (i.e., same as not including
* this attribute)
- * NL80211_SEC_CHAN_DISABLED = HT20 only
- * NL80211_SEC_CHAN_BELOW = secondary channel is below the primary channel
- * NL80211_SEC_CHAN_ABOVE = secondary channel is above the primary channel
+ * NL80211_CHAN_HT20 = HT20 only
+ * NL80211_CHAN_HT40MINUS = secondary channel is below the primary channel
+ * NL80211_CHAN_HT40PLUS = secondary channel is above the primary channel
+ * @NL80211_ATTR_WIPHY_RETRY_SHORT: TX retry limit for frames whose length is
+ * less than or equal to the RTS threshold; allowed range: 1..255;
+ * dot11ShortRetryLimit; u8
+ * @NL80211_ATTR_WIPHY_RETRY_LONG: TX retry limit for frames whose length is
+ * greater than the RTS threshold; allowed range: 1..255;
+ * dot11ShortLongLimit; u8
+ * @NL80211_ATTR_WIPHY_FRAG_THRESHOLD: fragmentation threshold, i.e., maximum
+ * length in octets for frames; allowed range: 256..8000, disable
+ * fragmentation with (u32)-1; dot11FragmentationThreshold; u32
+ * @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
@@ -231,7 +582,7 @@ enum nl80211_commands {
*
* @NL80211_ATTR_STA_AID: Association ID for the station (u16)
* @NL80211_ATTR_STA_FLAGS: flags, nested element with NLA_FLAG attributes of
- * &enum nl80211_sta_flags.
+ * &enum nl80211_sta_flags (deprecated, use %NL80211_ATTR_STA_FLAGS2)
* @NL80211_ATTR_STA_LISTEN_INTERVAL: listen interval as defined by
* IEEE 802.11 7.3.1.6 (u16).
* @NL80211_ATTR_STA_SUPPORTED_RATES: supported rates, array of supported
@@ -284,6 +635,229 @@ enum nl80211_commands {
* supported interface types, each a flag attribute with the number
* of the interface mode.
*
+ * @NL80211_ATTR_MGMT_SUBTYPE: Management frame subtype for
+ * %NL80211_CMD_SET_MGMT_EXTRA_IE.
+ *
+ * @NL80211_ATTR_IE: Information element(s) data (used, e.g., with
+ * %NL80211_CMD_SET_MGMT_EXTRA_IE).
+ *
+ * @NL80211_ATTR_MAX_NUM_SCAN_SSIDS: number of SSIDs you can scan with
+ * a single scan request, a wiphy attribute.
+ * @NL80211_ATTR_MAX_SCAN_IE_LEN: maximum length of information elements
+ * that can be added to a scan request
+ *
+ * @NL80211_ATTR_SCAN_FREQUENCIES: nested attribute with frequencies (in MHz)
+ * @NL80211_ATTR_SCAN_SSIDS: nested attribute with SSIDs, leave out for passive
+ * scanning and include a zero-length SSID (wildcard) for wildcard scan
+ * @NL80211_ATTR_BSS: scan result BSS
+ *
+ * @NL80211_ATTR_REG_INITIATOR: indicates who requested the regulatory domain
+ * currently in effect. This could be any of the %NL80211_REGDOM_SET_BY_*
+ * @NL80211_ATTR_REG_TYPE: indicates the type of the regulatory domain currently
+ * set. This can be one of the nl80211_reg_type (%NL80211_REGDOM_TYPE_*)
+ *
+ * @NL80211_ATTR_SUPPORTED_COMMANDS: wiphy attribute that specifies
+ * an array of command numbers (i.e. a mapping index to command number)
+ * that the driver for the given wiphy supports.
+ *
+ * @NL80211_ATTR_FRAME: frame data (binary attribute), including frame header
+ * and body, but not FCS; used, e.g., with NL80211_CMD_AUTHENTICATE and
+ * NL80211_CMD_ASSOCIATE events
+ * @NL80211_ATTR_SSID: SSID (binary attribute, 0..32 octets)
+ * @NL80211_ATTR_AUTH_TYPE: AuthenticationType, see &enum nl80211_auth_type,
+ * represented as a u32
+ * @NL80211_ATTR_REASON_CODE: ReasonCode for %NL80211_CMD_DEAUTHENTICATE and
+ * %NL80211_CMD_DISASSOCIATE, u16
+ *
+ * @NL80211_ATTR_KEY_TYPE: Key Type, see &enum nl80211_key_type, represented as
+ * a u32
+ *
+ * @NL80211_ATTR_FREQ_BEFORE: A channel which has suffered a regulatory change
+ * due to considerations from a beacon hint. This attribute reflects
+ * the state of the channel _before_ the beacon hint processing. This
+ * attributes consists of a nested attribute containing
+ * NL80211_FREQUENCY_ATTR_*
+ * @NL80211_ATTR_FREQ_AFTER: A channel which has suffered a regulatory change
+ * due to considerations from a beacon hint. This attribute reflects
+ * the state of the channel _after_ the beacon hint processing. This
+ * attributes consists of a nested attribute containing
+ * NL80211_FREQUENCY_ATTR_*
+ *
+ * @NL80211_ATTR_CIPHER_SUITES: a set of u32 values indicating the supported
+ * cipher suites
+ *
+ * @NL80211_ATTR_FREQ_FIXED: a flag indicating the IBSS should not try to look
+ * for other networks on different channels
+ *
+ * @NL80211_ATTR_TIMED_OUT: a flag indicating than an operation timed out; this
+ * is used, e.g., with %NL80211_CMD_AUTHENTICATE event
+ *
+ * @NL80211_ATTR_USE_MFP: Whether management frame protection (IEEE 802.11w) is
+ * used for the association (&enum nl80211_mfp, represented as a u32);
+ * this attribute can be used
+ * with %NL80211_CMD_ASSOCIATE request
+ *
+ * @NL80211_ATTR_STA_FLAGS2: Attribute containing a
+ * &struct nl80211_sta_flag_update.
+ *
+ * @NL80211_ATTR_CONTROL_PORT: A flag indicating whether user space controls
+ * IEEE 802.1X port, i.e., sets/clears %NL80211_STA_FLAG_AUTHORIZED, in
+ * station mode. If the flag is included in %NL80211_CMD_ASSOCIATE
+ * request, the driver will assume that the port is unauthorized until
+ * authorized by user space. Otherwise, port is marked authorized by
+ * default in station mode.
+ * @NL80211_ATTR_CONTROL_PORT_ETHERTYPE: A 16-bit value indicating the
+ * ethertype that will be used for key negotiation. It can be
+ * specified with the associate and connect commands. If it is not
+ * specified, the value defaults to 0x888E (PAE, 802.1X). This
+ * attribute is also used as a flag in the wiphy information to
+ * indicate that protocols other than PAE are supported.
+ * @NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT: When included along with
+ * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE, indicates that the custom
+ * ethertype frames used for key negotiation must not be encrypted.
+ *
+ * @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver.
+ * We recommend using nested, driver-specific attributes within this.
+ *
+ * @NL80211_ATTR_DISCONNECTED_BY_AP: A flag indicating that the DISCONNECT
+ * event was due to the AP disconnecting the station, and not due to
+ * a local disconnect request.
+ * @NL80211_ATTR_STATUS_CODE: StatusCode for the %NL80211_CMD_CONNECT
+ * event (u16)
+ * @NL80211_ATTR_PRIVACY: Flag attribute, used with connect(), indicating
+ * that protected APs should be used.
+ *
+ * @NL80211_ATTR_CIPHERS_PAIRWISE: Used with CONNECT and ASSOCIATE to
+ * indicate which unicast key ciphers will be used with the connection
+ * (an array of u32).
+ * @NL80211_ATTR_CIPHER_GROUP: Used with CONNECT and ASSOCIATE to indicate
+ * which group key cipher will be used with the connection (a u32).
+ * @NL80211_ATTR_WPA_VERSIONS: Used with CONNECT and ASSOCIATE to indicate
+ * which WPA version(s) the AP we want to associate with is using
+ * (a u32 with flags from &enum nl80211_wpa_versions).
+ * @NL80211_ATTR_AKM_SUITES: Used with CONNECT and ASSOCIATE to indicate
+ * which key management algorithm(s) to use (an array of u32).
+ *
+ * @NL80211_ATTR_REQ_IE: (Re)association request information elements as
+ * sent out by the card, for ROAM and successful CONNECT events.
+ * @NL80211_ATTR_RESP_IE: (Re)association response information elements as
+ * sent by peer, for ROAM and successful CONNECT events.
+ *
+ * @NL80211_ATTR_PREV_BSSID: previous BSSID, to be used by in ASSOCIATE
+ * commands to specify using a reassociate frame
+ *
+ * @NL80211_ATTR_KEY: key information in a nested attribute with
+ * %NL80211_KEY_* sub-attributes
+ * @NL80211_ATTR_KEYS: array of keys for static WEP keys for connect()
+ * and join_ibss(), key information is in a nested attribute each
+ * with %NL80211_KEY_* sub-attributes
+ *
+ * @NL80211_ATTR_PID: Process ID of a network namespace.
+ *
+ * @NL80211_ATTR_GENERATION: Used to indicate consistent snapshots for
+ * dumps. This number increases whenever the object list being
+ * dumped changes, and as such userspace can verify that it has
+ * obtained a complete and consistent snapshot by verifying that
+ * all dump messages contain the same generation number. If it
+ * changed then the list changed and the dump should be repeated
+ * completely from scratch.
+ *
+ * @NL80211_ATTR_4ADDR: Use 4-address frames on a virtual interface
+ *
+ * @NL80211_ATTR_SURVEY_INFO: survey information about a channel, part of
+ * 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_MAX_REMAIN_ON_CHANNEL_DURATION: Device attribute that
+ * specifies the maximum duration that can be requested with the
+ * remain-on-channel 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_FRAME_MATCH: A binary attribute which typically must contain
+ * at least one byte, currently used with @NL80211_CMD_REGISTER_FRAME.
+ * @NL80211_ATTR_FRAME_TYPE: A u16 indicating the frame type/subtype for the
+ * @NL80211_CMD_REGISTER_FRAME command.
+ * @NL80211_ATTR_TX_FRAME_TYPES: wiphy capability attribute, which is a
+ * nested attribute of %NL80211_ATTR_FRAME_TYPE attributes, containing
+ * information about which frame types can be transmitted with
+ * %NL80211_CMD_FRAME.
+ * @NL80211_ATTR_RX_FRAME_TYPES: wiphy capability attribute, which is a
+ * nested attribute of %NL80211_ATTR_FRAME_TYPE attributes, containing
+ * information about which frame types can be registered for RX.
+ *
+ * @NL80211_ATTR_ACK: Flag attribute indicating that the frame was
+ * acknowledged by the recipient.
+ *
+ * @NL80211_ATTR_CQM: connection quality monitor configuration in a
+ * nested attribute with %NL80211_ATTR_CQM_* sub-attributes.
+ *
+ * @NL80211_ATTR_LOCAL_STATE_CHANGE: Flag attribute to indicate that a command
+ * is requesting a local authentication/association state change without
+ * invoking actual management frame exchange. This can be used with
+ * NL80211_CMD_AUTHENTICATE, NL80211_CMD_DEAUTHENTICATE,
+ * NL80211_CMD_DISASSOCIATE.
+ *
+ * @NL80211_ATTR_AP_ISOLATE: (AP mode) Do not forward traffic between stations
+ * connected to this BSS.
+ *
+ * @NL80211_ATTR_WIPHY_TX_POWER_SETTING: Transmit power setting type. See
+ * &enum nl80211_tx_power_setting for possible values.
+ * @NL80211_ATTR_WIPHY_TX_POWER_LEVEL: Transmit power level in signed mBm units.
+ * This is used in association with @NL80211_ATTR_WIPHY_TX_POWER_SETTING
+ * for non-automatic settings.
+ *
+ * @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_OFFCHANNEL_TX_OK: For management frame TX, the frame may be
+ * transmitted on another channel when the channel given doesn't match
+ * the current channel. If the current channel doesn't match and this
+ * flag isn't set, the frame will be rejected. This is also used as an
+ * nl80211 capability flag.
+ *
+ * @NL80211_ATTR_BSS_HTOPMODE: HT operation mode (u16)
+ *
+ * @NL80211_ATTR_KEY_DEFAULT_TYPES: A nested attribute containing flags
+ * attributes, specifying what a key should be set as default as.
+ * See &enum nl80211_key_default_types.
+ *
* @NL80211_ATTR_MAX: highest attribute number currently defined
* @__NL80211_ATTR_AFTER_LAST: internal use
*/
@@ -344,7 +918,127 @@ enum nl80211_attrs {
NL80211_ATTR_WIPHY_TXQ_PARAMS,
NL80211_ATTR_WIPHY_FREQ,
- NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET,
+ NL80211_ATTR_WIPHY_CHANNEL_TYPE,
+
+ NL80211_ATTR_KEY_DEFAULT_MGMT,
+
+ NL80211_ATTR_MGMT_SUBTYPE,
+ NL80211_ATTR_IE,
+
+ NL80211_ATTR_MAX_NUM_SCAN_SSIDS,
+
+ NL80211_ATTR_SCAN_FREQUENCIES,
+ NL80211_ATTR_SCAN_SSIDS,
+ NL80211_ATTR_GENERATION, /* replaces old SCAN_GENERATION */
+ NL80211_ATTR_BSS,
+
+ NL80211_ATTR_REG_INITIATOR,
+ NL80211_ATTR_REG_TYPE,
+
+ NL80211_ATTR_SUPPORTED_COMMANDS,
+
+ NL80211_ATTR_FRAME,
+ NL80211_ATTR_SSID,
+ NL80211_ATTR_AUTH_TYPE,
+ NL80211_ATTR_REASON_CODE,
+
+ NL80211_ATTR_KEY_TYPE,
+
+ NL80211_ATTR_MAX_SCAN_IE_LEN,
+ NL80211_ATTR_CIPHER_SUITES,
+
+ NL80211_ATTR_FREQ_BEFORE,
+ NL80211_ATTR_FREQ_AFTER,
+
+ NL80211_ATTR_FREQ_FIXED,
+
+
+ NL80211_ATTR_WIPHY_RETRY_SHORT,
+ NL80211_ATTR_WIPHY_RETRY_LONG,
+ NL80211_ATTR_WIPHY_FRAG_THRESHOLD,
+ NL80211_ATTR_WIPHY_RTS_THRESHOLD,
+
+ NL80211_ATTR_TIMED_OUT,
+
+ NL80211_ATTR_USE_MFP,
+
+ NL80211_ATTR_STA_FLAGS2,
+
+ NL80211_ATTR_CONTROL_PORT,
+
+ NL80211_ATTR_TESTDATA,
+
+ NL80211_ATTR_PRIVACY,
+
+ NL80211_ATTR_DISCONNECTED_BY_AP,
+ NL80211_ATTR_STATUS_CODE,
+
+ NL80211_ATTR_CIPHER_SUITES_PAIRWISE,
+ NL80211_ATTR_CIPHER_SUITE_GROUP,
+ NL80211_ATTR_WPA_VERSIONS,
+ NL80211_ATTR_AKM_SUITES,
+
+ NL80211_ATTR_REQ_IE,
+ NL80211_ATTR_RESP_IE,
+
+ NL80211_ATTR_PREV_BSSID,
+
+ NL80211_ATTR_KEY,
+ NL80211_ATTR_KEYS,
+
+ NL80211_ATTR_PID,
+
+ NL80211_ATTR_4ADDR,
+
+ 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,
+
+ NL80211_ATTR_FRAME_MATCH,
+
+ NL80211_ATTR_ACK,
+
+ NL80211_ATTR_PS_STATE,
+
+ NL80211_ATTR_CQM,
+
+ NL80211_ATTR_LOCAL_STATE_CHANGE,
+
+ NL80211_ATTR_AP_ISOLATE,
+
+ NL80211_ATTR_WIPHY_TX_POWER_SETTING,
+ NL80211_ATTR_WIPHY_TX_POWER_LEVEL,
+
+ NL80211_ATTR_TX_FRAME_TYPES,
+ NL80211_ATTR_RX_FRAME_TYPES,
+ NL80211_ATTR_FRAME_TYPE,
+
+ NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
+ NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT,
+
+ NL80211_ATTR_SUPPORT_IBSS_RSN,
+
+ NL80211_ATTR_WIPHY_ANTENNA_TX,
+ NL80211_ATTR_WIPHY_ANTENNA_RX,
+
+ NL80211_ATTR_MCAST_RATE,
+
+ NL80211_ATTR_OFFCHANNEL_TX_OK,
+
+ NL80211_ATTR_BSS_HT_OPMODE,
+
+ NL80211_ATTR_KEY_DEFAULT_TYPES,
+
+ NL80211_ATTR_MAX_REMAIN_ON_CHANNEL_DURATION,
/* add attributes here, update the policy in nl80211.c */
@@ -352,15 +1046,33 @@ enum nl80211_attrs {
NL80211_ATTR_MAX = __NL80211_ATTR_AFTER_LAST - 1
};
+/* source-level API compatibility */
+#define NL80211_ATTR_SCAN_GENERATION NL80211_ATTR_GENERATION
+
/*
* Allow user space programs to use #ifdef on new attributes by defining them
* here
*/
+#define NL80211_CMD_CONNECT NL80211_CMD_CONNECT
#define NL80211_ATTR_HT_CAPABILITY NL80211_ATTR_HT_CAPABILITY
#define NL80211_ATTR_BSS_BASIC_RATES NL80211_ATTR_BSS_BASIC_RATES
#define NL80211_ATTR_WIPHY_TXQ_PARAMS NL80211_ATTR_WIPHY_TXQ_PARAMS
#define NL80211_ATTR_WIPHY_FREQ NL80211_ATTR_WIPHY_FREQ
-#define NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET
+#define NL80211_ATTR_WIPHY_CHANNEL_TYPE NL80211_ATTR_WIPHY_CHANNEL_TYPE
+#define NL80211_ATTR_MGMT_SUBTYPE NL80211_ATTR_MGMT_SUBTYPE
+#define NL80211_ATTR_IE NL80211_ATTR_IE
+#define NL80211_ATTR_REG_INITIATOR NL80211_ATTR_REG_INITIATOR
+#define NL80211_ATTR_REG_TYPE NL80211_ATTR_REG_TYPE
+#define NL80211_ATTR_FRAME NL80211_ATTR_FRAME
+#define NL80211_ATTR_SSID NL80211_ATTR_SSID
+#define NL80211_ATTR_AUTH_TYPE NL80211_ATTR_AUTH_TYPE
+#define NL80211_ATTR_REASON_CODE NL80211_ATTR_REASON_CODE
+#define NL80211_ATTR_CIPHER_SUITES_PAIRWISE NL80211_ATTR_CIPHER_SUITES_PAIRWISE
+#define NL80211_ATTR_CIPHER_SUITE_GROUP NL80211_ATTR_CIPHER_SUITE_GROUP
+#define NL80211_ATTR_WPA_VERSIONS NL80211_ATTR_WPA_VERSIONS
+#define NL80211_ATTR_AKM_SUITES NL80211_ATTR_AKM_SUITES
+#define NL80211_ATTR_KEY NL80211_ATTR_KEY
+#define NL80211_ATTR_KEYS NL80211_ATTR_KEYS
#define NL80211_MAX_SUPP_RATES 32
#define NL80211_MAX_SUPP_REG_RULES 32
@@ -369,6 +1081,9 @@ enum nl80211_attrs {
#define NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY 24
#define NL80211_HT_CAPABILITY_LEN 26
+#define NL80211_MAX_NR_CIPHER_SUITES 5
+#define NL80211_MAX_NR_AKM_SUITES 2
+
/**
* enum nl80211_iftype - (virtual) interface types
*
@@ -380,8 +1095,10 @@ enum nl80211_attrs {
* @NL80211_IFTYPE_WDS: wireless distribution interface
* @NL80211_IFTYPE_MONITOR: monitor interface receiving all frames
* @NL80211_IFTYPE_MESH_POINT: mesh point
+ * @NL80211_IFTYPE_P2P_CLIENT: P2P client
+ * @NL80211_IFTYPE_P2P_GO: P2P group owner
* @NL80211_IFTYPE_MAX: highest interface type number currently defined
- * @__NL80211_IFTYPE_AFTER_LAST: internal use
+ * @NUM_NL80211_IFTYPES: number of defined interface types
*
* These values are used with the %NL80211_ATTR_IFTYPE
* to set the type of an interface.
@@ -396,10 +1113,12 @@ enum nl80211_iftype {
NL80211_IFTYPE_WDS,
NL80211_IFTYPE_MONITOR,
NL80211_IFTYPE_MESH_POINT,
+ NL80211_IFTYPE_P2P_CLIENT,
+ NL80211_IFTYPE_P2P_GO,
/* keep last */
- __NL80211_IFTYPE_AFTER_LAST,
- NL80211_IFTYPE_MAX = __NL80211_IFTYPE_AFTER_LAST - 1
+ NUM_NL80211_IFTYPES,
+ NL80211_IFTYPE_MAX = NUM_NL80211_IFTYPES - 1
};
/**
@@ -408,16 +1127,21 @@ enum nl80211_iftype {
* Station flags. When a station is added to an AP interface, it is
* assumed to be already associated (and hence authenticated.)
*
+ * @__NL80211_STA_FLAG_INVALID: attribute number 0 is reserved
* @NL80211_STA_FLAG_AUTHORIZED: station is authorized (802.1X)
* @NL80211_STA_FLAG_SHORT_PREAMBLE: station is capable of receiving frames
* with short barker preamble
* @NL80211_STA_FLAG_WME: station is WME/QoS capable
+ * @NL80211_STA_FLAG_MFP: station uses management frame protection
+ * @NL80211_STA_FLAG_MAX: highest station flag number currently defined
+ * @__NL80211_STA_FLAG_AFTER_LAST: internal use
*/
enum nl80211_sta_flags {
__NL80211_STA_FLAG_INVALID,
NL80211_STA_FLAG_AUTHORIZED,
NL80211_STA_FLAG_SHORT_PREAMBLE,
NL80211_STA_FLAG_WME,
+ NL80211_STA_FLAG_MFP,
/* keep last */
__NL80211_STA_FLAG_AFTER_LAST,
@@ -425,6 +1149,44 @@ enum nl80211_sta_flags {
};
/**
+ * struct nl80211_sta_flag_update - station flags mask/set
+ * @mask: mask of station flags to set
+ * @set: which values to set them to
+ *
+ * Both mask and set contain bits as per &enum nl80211_sta_flags.
+ */
+struct nl80211_sta_flag_update {
+ __u32 mask;
+ __u32 set;
+} __attribute__((packed));
+
+/**
+ * enum nl80211_rate_info - bitrate information
+ *
+ * These attribute types are used with %NL80211_STA_INFO_TXRATE
+ * when getting information about the bitrate of a station.
+ *
+ * @__NL80211_RATE_INFO_INVALID: attribute number 0 is reserved
+ * @NL80211_RATE_INFO_BITRATE: total bitrate (u16, 100kbit/s)
+ * @NL80211_RATE_INFO_MCS: mcs index for 802.11n (u8)
+ * @NL80211_RATE_INFO_40_MHZ_WIDTH: 40 Mhz dualchannel bitrate
+ * @NL80211_RATE_INFO_SHORT_GI: 400ns guard interval
+ * @NL80211_RATE_INFO_MAX: highest rate_info number currently defined
+ * @__NL80211_RATE_INFO_AFTER_LAST: internal use
+ */
+enum nl80211_rate_info {
+ __NL80211_RATE_INFO_INVALID,
+ NL80211_RATE_INFO_BITRATE,
+ NL80211_RATE_INFO_MCS,
+ NL80211_RATE_INFO_40_MHZ_WIDTH,
+ NL80211_RATE_INFO_SHORT_GI,
+
+ /* keep last */
+ __NL80211_RATE_INFO_AFTER_LAST,
+ NL80211_RATE_INFO_MAX = __NL80211_RATE_INFO_AFTER_LAST - 1
+};
+
+/**
* enum nl80211_sta_info - station information
*
* These attribute types are used with %NL80211_ATTR_STA_INFO
@@ -436,6 +1198,15 @@ enum nl80211_sta_flags {
* @NL80211_STA_INFO_TX_BYTES: total transmitted bytes (u32, to this station)
* @__NL80211_STA_INFO_AFTER_LAST: internal
* @NL80211_STA_INFO_MAX: highest possible station info attribute
+ * @NL80211_STA_INFO_SIGNAL: signal strength of last received PPDU (u8, dBm)
+ * @NL80211_STA_INFO_TX_BITRATE: current unicast tx rate, nested attribute
+ * containing info as possible, see &enum nl80211_sta_info_txrate.
+ * @NL80211_STA_INFO_RX_PACKETS: total received packet (u32, from this station)
+ * @NL80211_STA_INFO_TX_PACKETS: total transmitted packets (u32, to this
+ * station)
+ * @NL80211_STA_INFO_TX_RETRIES: total retries (u32, to this station)
+ * @NL80211_STA_INFO_TX_FAILED: total failed packets (u32, to this station)
+ * @NL80211_STA_INFO_SIGNAL_AVG: signal strength average (u8, dBm)
*/
enum nl80211_sta_info {
__NL80211_STA_INFO_INVALID,
@@ -445,6 +1216,13 @@ enum nl80211_sta_info {
NL80211_STA_INFO_LLID,
NL80211_STA_INFO_PLID,
NL80211_STA_INFO_PLINK_STATE,
+ NL80211_STA_INFO_SIGNAL,
+ NL80211_STA_INFO_TX_BITRATE,
+ NL80211_STA_INFO_RX_PACKETS,
+ NL80211_STA_INFO_TX_PACKETS,
+ NL80211_STA_INFO_TX_RETRIES,
+ NL80211_STA_INFO_TX_FAILED,
+ NL80211_STA_INFO_SIGNAL_AVG,
/* keep last */
__NL80211_STA_INFO_AFTER_LAST,
@@ -456,14 +1234,14 @@ enum nl80211_sta_info {
*
* @NL80211_MPATH_FLAG_ACTIVE: the mesh path is active
* @NL80211_MPATH_FLAG_RESOLVING: the mesh path discovery process is running
- * @NL80211_MPATH_FLAG_DSN_VALID: the mesh path contains a valid DSN
+ * @NL80211_MPATH_FLAG_SN_VALID: the mesh path contains a valid SN
* @NL80211_MPATH_FLAG_FIXED: the mesh path has been manually set
* @NL80211_MPATH_FLAG_RESOLVED: the mesh path discovery process succeeded
*/
enum nl80211_mpath_flags {
NL80211_MPATH_FLAG_ACTIVE = 1<<0,
NL80211_MPATH_FLAG_RESOLVING = 1<<1,
- NL80211_MPATH_FLAG_DSN_VALID = 1<<2,
+ NL80211_MPATH_FLAG_SN_VALID = 1<<2,
NL80211_MPATH_FLAG_FIXED = 1<<3,
NL80211_MPATH_FLAG_RESOLVED = 1<<4,
};
@@ -475,19 +1253,22 @@ enum nl80211_mpath_flags {
* information about a mesh path.
*
* @__NL80211_MPATH_INFO_INVALID: attribute number 0 is reserved
- * @NL80211_ATTR_MPATH_FRAME_QLEN: number of queued frames for this destination
- * @NL80211_ATTR_MPATH_DSN: destination sequence number
- * @NL80211_ATTR_MPATH_METRIC: metric (cost) of this mesh path
- * @NL80211_ATTR_MPATH_EXPTIME: expiration time for the path, in msec from now
- * @NL80211_ATTR_MPATH_FLAGS: mesh path flags, enumerated in
+ * @NL80211_MPATH_INFO_FRAME_QLEN: number of queued frames for this destination
+ * @NL80211_MPATH_INFO_SN: destination sequence number
+ * @NL80211_MPATH_INFO_METRIC: metric (cost) of this mesh path
+ * @NL80211_MPATH_INFO_EXPTIME: expiration time for the path, in msec from now
+ * @NL80211_MPATH_INFO_FLAGS: mesh path flags, enumerated in
* &enum nl80211_mpath_flags;
- * @NL80211_ATTR_MPATH_DISCOVERY_TIMEOUT: total path discovery timeout, in msec
- * @NL80211_ATTR_MPATH_DISCOVERY_RETRIES: mesh path discovery retries
+ * @NL80211_MPATH_INFO_DISCOVERY_TIMEOUT: total path discovery timeout, in msec
+ * @NL80211_MPATH_INFO_DISCOVERY_RETRIES: mesh path discovery retries
+ * @NL80211_MPATH_INFO_MAX: highest mesh path information attribute number
+ * currently defind
+ * @__NL80211_MPATH_INFO_AFTER_LAST: internal use
*/
enum nl80211_mpath_info {
__NL80211_MPATH_INFO_INVALID,
NL80211_MPATH_INFO_FRAME_QLEN,
- NL80211_MPATH_INFO_DSN,
+ NL80211_MPATH_INFO_SN,
NL80211_MPATH_INFO_METRIC,
NL80211_MPATH_INFO_EXPTIME,
NL80211_MPATH_INFO_FLAGS,
@@ -511,6 +1292,8 @@ enum nl80211_mpath_info {
* @NL80211_BAND_ATTR_HT_CAPA: HT capabilities, as in the HT information IE
* @NL80211_BAND_ATTR_HT_AMPDU_FACTOR: A-MPDU factor, as in 11n
* @NL80211_BAND_ATTR_HT_AMPDU_DENSITY: A-MPDU density, as in 11n
+ * @NL80211_BAND_ATTR_MAX: highest band attribute currently defined
+ * @__NL80211_BAND_ATTR_AFTER_LAST: internal use
*/
enum nl80211_band_attr {
__NL80211_BAND_ATTR_INVALID,
@@ -531,6 +1314,7 @@ enum nl80211_band_attr {
/**
* enum nl80211_frequency_attr - frequency attributes
+ * @__NL80211_FREQUENCY_ATTR_INVALID: attribute number 0 is reserved
* @NL80211_FREQUENCY_ATTR_FREQ: Frequency in MHz
* @NL80211_FREQUENCY_ATTR_DISABLED: Channel is disabled in current
* regulatory domain.
@@ -542,6 +1326,9 @@ enum nl80211_band_attr {
* on this channel in current regulatory domain.
* @NL80211_FREQUENCY_ATTR_MAX_TX_POWER: Maximum transmission power in mBm
* (100 * dBm).
+ * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
+ * currently defined
+ * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
*/
enum nl80211_frequency_attr {
__NL80211_FREQUENCY_ATTR_INVALID,
@@ -561,9 +1348,13 @@ enum nl80211_frequency_attr {
/**
* enum nl80211_bitrate_attr - bitrate attributes
+ * @__NL80211_BITRATE_ATTR_INVALID: attribute number 0 is reserved
* @NL80211_BITRATE_ATTR_RATE: Bitrate in units of 100 kbps
* @NL80211_BITRATE_ATTR_2GHZ_SHORTPREAMBLE: Short preamble supported
* in 2.4 GHz band.
+ * @NL80211_BITRATE_ATTR_MAX: highest bitrate attribute number
+ * currently defined
+ * @__NL80211_BITRATE_ATTR_AFTER_LAST: internal use
*/
enum nl80211_bitrate_attr {
__NL80211_BITRATE_ATTR_INVALID,
@@ -576,7 +1367,54 @@ enum nl80211_bitrate_attr {
};
/**
+ * enum nl80211_initiator - Indicates the initiator of a reg domain request
+ * @NL80211_REGDOM_SET_BY_CORE: Core queried CRDA for a dynamic world
+ * regulatory domain.
+ * @NL80211_REGDOM_SET_BY_USER: User asked the wireless core to set the
+ * regulatory domain.
+ * @NL80211_REGDOM_SET_BY_DRIVER: a wireless drivers has hinted to the
+ * 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. 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,
+ NL80211_REGDOM_SET_BY_USER,
+ NL80211_REGDOM_SET_BY_DRIVER,
+ NL80211_REGDOM_SET_BY_COUNTRY_IE,
+};
+
+/**
+ * enum nl80211_reg_type - specifies the type of regulatory domain
+ * @NL80211_REGDOM_TYPE_COUNTRY: the regulatory domain set is one that pertains
+ * to a specific country. When this is set you can count on the
+ * ISO / IEC 3166 alpha2 country code being valid.
+ * @NL80211_REGDOM_TYPE_WORLD: the regulatory set domain is the world regulatory
+ * domain.
+ * @NL80211_REGDOM_TYPE_CUSTOM_WORLD: the regulatory domain set is a custom
+ * driver specific world regulatory domain. These do not apply system-wide
+ * and are only applicable to the individual devices which have requested
+ * them to be applied.
+ * @NL80211_REGDOM_TYPE_INTERSECTION: the regulatory domain set is the product
+ * of an intersection between two regulatory domains -- the previously
+ * set regulatory domain on the system and the last accepted regulatory
+ * domain request to be processed.
+ */
+enum nl80211_reg_type {
+ NL80211_REGDOM_TYPE_COUNTRY,
+ NL80211_REGDOM_TYPE_WORLD,
+ NL80211_REGDOM_TYPE_CUSTOM_WORLD,
+ NL80211_REGDOM_TYPE_INTERSECTION,
+};
+
+/**
* enum nl80211_reg_rule_attr - regulatory rule attributes
+ * @__NL80211_REG_RULE_ATTR_INVALID: attribute number 0 is reserved
* @NL80211_ATTR_REG_RULE_FLAGS: a set of flags which specify additional
* considerations for a given frequency range. These are the
* &enum nl80211_reg_rule_flags.
@@ -593,6 +1431,9 @@ enum nl80211_bitrate_attr {
* If you don't have one then don't send this.
* @NL80211_ATTR_POWER_RULE_MAX_EIRP: the maximum allowed EIRP for
* a given frequency range. The value is in mBm (100 * dBm).
+ * @NL80211_REG_RULE_ATTR_MAX: highest regulatory rule attribute number
+ * currently defined
+ * @__NL80211_REG_RULE_ATTR_AFTER_LAST: internal use
*/
enum nl80211_reg_rule_attr {
__NL80211_REG_RULE_ATTR_INVALID,
@@ -636,6 +1477,46 @@ enum nl80211_reg_rule_flags {
};
/**
+ * enum nl80211_survey_info - survey information
+ *
+ * These attribute types are used with %NL80211_ATTR_SURVEY_INFO
+ * when getting information about a survey.
+ *
+ * @__NL80211_SURVEY_INFO_INVALID: attribute number 0 is reserved
+ * @NL80211_SURVEY_INFO_FREQUENCY: center frequency of channel
+ * @NL80211_SURVEY_INFO_NOISE: noise level of channel (u8, dBm)
+ * @NL80211_SURVEY_INFO_IN_USE: channel is currently being used
+ * @NL80211_SURVEY_INFO_CHANNEL_TIME: amount of time (in ms) that the radio
+ * spent on this channel
+ * @NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY: amount of the time the primary
+ * channel was sensed busy (either due to activity or energy detect)
+ * @NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY: amount of time the extension
+ * channel was sensed busy
+ * @NL80211_SURVEY_INFO_CHANNEL_TIME_RX: amount of time the radio spent
+ * receiving data
+ * @NL80211_SURVEY_INFO_CHANNEL_TIME_TX: amount of time the radio spent
+ * transmitting data
+ * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number
+ * currently defined
+ * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use
+ */
+enum nl80211_survey_info {
+ __NL80211_SURVEY_INFO_INVALID,
+ NL80211_SURVEY_INFO_FREQUENCY,
+ NL80211_SURVEY_INFO_NOISE,
+ NL80211_SURVEY_INFO_IN_USE,
+ NL80211_SURVEY_INFO_CHANNEL_TIME,
+ NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY,
+ NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY,
+ NL80211_SURVEY_INFO_CHANNEL_TIME_RX,
+ NL80211_SURVEY_INFO_CHANNEL_TIME_TX,
+
+ /* keep last */
+ __NL80211_SURVEY_INFO_AFTER_LAST,
+ NL80211_SURVEY_INFO_MAX = __NL80211_SURVEY_INFO_AFTER_LAST - 1
+};
+
+/**
* enum nl80211_mntr_flags - monitor configuration flags
*
* Monitor configuration flags.
@@ -691,6 +1572,9 @@ enum nl80211_mntr_flags {
* @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh
* point.
*
+ * @NL80211_MESHCONF_ELEMENT_TTL: specifies the value of TTL field set at a
+ * source mesh point for path selection elements.
+ *
* @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically
* open peer links when we detect compatible mesh peers.
*
@@ -715,6 +1599,8 @@ enum nl80211_mntr_flags {
* @NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: The interval of time (in TUs)
* that it takes for an HWMP information element to propagate across the mesh
*
+ * @NL80211_MESHCONF_ROOTMODE: whether root mode is enabled or not
+ *
* @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
*
* @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
@@ -734,6 +1620,8 @@ enum nl80211_meshconf_params {
NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,
NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,
NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,
+ NL80211_MESHCONF_HWMP_ROOTMODE,
+ NL80211_MESHCONF_ELEMENT_TTL,
/* keep last */
__NL80211_MESHCONF_ATTR_AFTER_LAST,
@@ -774,10 +1662,268 @@ enum nl80211_txq_q {
NL80211_TXQ_Q_BK
};
-enum nl80211_sec_chan_offset {
- NL80211_SEC_CHAN_NO_HT /* No HT */,
- NL80211_SEC_CHAN_DISABLED /* HT20 only */,
- NL80211_SEC_CHAN_BELOW /* HT40- */,
- NL80211_SEC_CHAN_ABOVE /* HT40+ */
+enum nl80211_channel_type {
+ NL80211_CHAN_NO_HT,
+ NL80211_CHAN_HT20,
+ NL80211_CHAN_HT40MINUS,
+ NL80211_CHAN_HT40PLUS
+};
+
+/**
+ * enum nl80211_bss - netlink attributes for a BSS
+ *
+ * @__NL80211_BSS_INVALID: invalid
+ * @NL80211_BSS_BSSID: BSSID of the BSS (6 octets)
+ * @NL80211_BSS_FREQUENCY: frequency in MHz (u32)
+ * @NL80211_BSS_TSF: TSF of the received probe response/beacon (u64)
+ * @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);
+ * 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
+ */
+enum nl80211_bss {
+ __NL80211_BSS_INVALID,
+ NL80211_BSS_BSSID,
+ NL80211_BSS_FREQUENCY,
+ NL80211_BSS_TSF,
+ NL80211_BSS_BEACON_INTERVAL,
+ NL80211_BSS_CAPABILITY,
+ NL80211_BSS_INFORMATION_ELEMENTS,
+ NL80211_BSS_SIGNAL_MBM,
+ NL80211_BSS_SIGNAL_UNSPEC,
+ NL80211_BSS_STATUS,
+ NL80211_BSS_SEEN_MS_AGO,
+ NL80211_BSS_BEACON_IES,
+
+ /* keep last */
+ __NL80211_BSS_AFTER_LAST,
+ NL80211_BSS_MAX = __NL80211_BSS_AFTER_LAST - 1
+};
+
+/**
+ * enum nl80211_bss_status - BSS "status"
+ * @NL80211_BSS_STATUS_AUTHENTICATED: Authenticated with this BSS.
+ * @NL80211_BSS_STATUS_ASSOCIATED: Associated with this BSS.
+ * @NL80211_BSS_STATUS_IBSS_JOINED: Joined to this IBSS.
+ *
+ * The BSS status is a BSS attribute in scan dumps, which
+ * indicates the status the interface has wrt. this BSS.
+ */
+enum nl80211_bss_status {
+ NL80211_BSS_STATUS_AUTHENTICATED,
+ NL80211_BSS_STATUS_ASSOCIATED,
+ NL80211_BSS_STATUS_IBSS_JOINED,
+};
+
+/**
+ * enum nl80211_auth_type - AuthenticationType
+ *
+ * @NL80211_AUTHTYPE_OPEN_SYSTEM: Open System authentication
+ * @NL80211_AUTHTYPE_SHARED_KEY: Shared Key authentication (WEP only)
+ * @NL80211_AUTHTYPE_FT: Fast BSS Transition (IEEE 802.11r)
+ * @NL80211_AUTHTYPE_NETWORK_EAP: Network EAP (some Cisco APs and mainly LEAP)
+ * @__NL80211_AUTHTYPE_NUM: internal
+ * @NL80211_AUTHTYPE_MAX: maximum valid auth algorithm
+ * @NL80211_AUTHTYPE_AUTOMATIC: determine automatically (if necessary by
+ * trying multiple times); this is invalid in netlink -- leave out
+ * the attribute for this on CONNECT commands.
+ */
+enum nl80211_auth_type {
+ NL80211_AUTHTYPE_OPEN_SYSTEM,
+ NL80211_AUTHTYPE_SHARED_KEY,
+ NL80211_AUTHTYPE_FT,
+ NL80211_AUTHTYPE_NETWORK_EAP,
+
+ /* keep last */
+ __NL80211_AUTHTYPE_NUM,
+ NL80211_AUTHTYPE_MAX = __NL80211_AUTHTYPE_NUM - 1,
+ NL80211_AUTHTYPE_AUTOMATIC
+};
+
+/**
+ * enum nl80211_key_type - Key Type
+ * @NL80211_KEYTYPE_GROUP: Group (broadcast/multicast) key
+ * @NL80211_KEYTYPE_PAIRWISE: Pairwise (unicast/individual) key
+ * @NL80211_KEYTYPE_PEERKEY: PeerKey (DLS)
+ * @NUM_NL80211_KEYTYPES: number of defined key types
+ */
+enum nl80211_key_type {
+ NL80211_KEYTYPE_GROUP,
+ NL80211_KEYTYPE_PAIRWISE,
+ NL80211_KEYTYPE_PEERKEY,
+
+ NUM_NL80211_KEYTYPES
+};
+
+/**
+ * enum nl80211_mfp - Management frame protection state
+ * @NL80211_MFP_NO: Management frame protection not used
+ * @NL80211_MFP_REQUIRED: Management frame protection required
+ */
+enum nl80211_mfp {
+ NL80211_MFP_NO,
+ NL80211_MFP_REQUIRED,
+};
+
+enum nl80211_wpa_versions {
+ NL80211_WPA_VERSION_1 = 1 << 0,
+ NL80211_WPA_VERSION_2 = 1 << 1,
};
+
+/**
+ * enum nl80211_key_default_types - key default types
+ * @__NL80211_KEY_DEFAULT_TYPE_INVALID: invalid
+ * @NL80211_KEY_DEFAULT_TYPE_UNICAST: key should be used as default
+ * unicast key
+ * @NL80211_KEY_DEFAULT_TYPE_MULTICAST: key should be used as default
+ * multicast key
+ * @NUM_NL80211_KEY_DEFAULT_TYPES: number of default types
+ */
+enum nl80211_key_default_types {
+ __NL80211_KEY_DEFAULT_TYPE_INVALID,
+ NL80211_KEY_DEFAULT_TYPE_UNICAST,
+ NL80211_KEY_DEFAULT_TYPE_MULTICAST,
+
+ NUM_NL80211_KEY_DEFAULT_TYPES
+};
+
+/**
+ * enum nl80211_key_attributes - key attributes
+ * @__NL80211_KEY_INVALID: invalid
+ * @NL80211_KEY_DATA: (temporal) key data; for TKIP this consists of
+ * 16 bytes encryption key followed by 8 bytes each for TX and RX MIC
+ * keys
+ * @NL80211_KEY_IDX: key ID (u8, 0-3)
+ * @NL80211_KEY_CIPHER: key cipher suite (u32, as defined by IEEE 802.11
+ * section 7.3.2.25.1, e.g. 0x000FAC04)
+ * @NL80211_KEY_SEQ: transmit key sequence number (IV/PN) for TKIP and
+ * CCMP keys, each six bytes in little endian
+ * @NL80211_KEY_DEFAULT: flag indicating default key
+ * @NL80211_KEY_DEFAULT_MGMT: flag indicating default management key
+ * @NL80211_KEY_TYPE: the key type from enum nl80211_key_type, if not
+ * specified the default depends on whether a MAC address was
+ * given with the command using the key or not (u32)
+ * @NL80211_KEY_DEFAULT_TYPES: A nested attribute containing flags
+ * attributes, specifying what a key should be set as default as.
+ * See &enum nl80211_key_default_types.
+ * @__NL80211_KEY_AFTER_LAST: internal
+ * @NL80211_KEY_MAX: highest key attribute
+ */
+enum nl80211_key_attributes {
+ __NL80211_KEY_INVALID,
+ NL80211_KEY_DATA,
+ NL80211_KEY_IDX,
+ NL80211_KEY_CIPHER,
+ NL80211_KEY_SEQ,
+ NL80211_KEY_DEFAULT,
+ NL80211_KEY_DEFAULT_MGMT,
+ NL80211_KEY_TYPE,
+ NL80211_KEY_DEFAULT_TYPES,
+
+ /* keep last */
+ __NL80211_KEY_AFTER_LAST,
+ 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,
+};
+
+enum nl80211_ps_state {
+ NL80211_PS_DISABLED,
+ NL80211_PS_ENABLED,
+};
+
+/**
+ * enum nl80211_attr_cqm - connection quality monitor attributes
+ * @__NL80211_ATTR_CQM_INVALID: invalid
+ * @NL80211_ATTR_CQM_RSSI_THOLD: RSSI threshold in dBm. This value specifies
+ * the threshold for the RSSI level at which an event will be sent. Zero
+ * to disable.
+ * @NL80211_ATTR_CQM_RSSI_HYST: RSSI hysteresis in dBm. This value specifies
+ * the minimum amount the RSSI level must change after an event before a
+ * new event may be issued (to reduce effects of RSSI oscillation).
+ * @NL80211_ATTR_CQM_RSSI_THRESHOLD_EVENT: RSSI threshold event
+ * @NL80211_ATTR_CQM_PKT_LOSS_EVENT: a u32 value indicating that this many
+ * consecutive packets were not acknowledged by the peer
+ * @__NL80211_ATTR_CQM_AFTER_LAST: internal
+ * @NL80211_ATTR_CQM_MAX: highest key attribute
+ */
+enum nl80211_attr_cqm {
+ __NL80211_ATTR_CQM_INVALID,
+ NL80211_ATTR_CQM_RSSI_THOLD,
+ NL80211_ATTR_CQM_RSSI_HYST,
+ NL80211_ATTR_CQM_RSSI_THRESHOLD_EVENT,
+ NL80211_ATTR_CQM_PKT_LOSS_EVENT,
+
+ /* keep last */
+ __NL80211_ATTR_CQM_AFTER_LAST,
+ NL80211_ATTR_CQM_MAX = __NL80211_ATTR_CQM_AFTER_LAST - 1
+};
+
+/**
+ * enum nl80211_cqm_rssi_threshold_event - RSSI threshold event
+ * @NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW: The RSSI level is lower than the
+ * configured threshold
+ * @NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH: The RSSI is higher than the
+ * configured threshold
+ */
+enum nl80211_cqm_rssi_threshold_event {
+ NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW,
+ NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH,
+};
+
+
+/**
+ * enum nl80211_tx_power_setting - TX power adjustment
+ * @NL80211_TX_POWER_AUTOMATIC: automatically determine transmit power
+ * @NL80211_TX_POWER_LIMITED: limit TX power by the mBm parameter
+ * @NL80211_TX_POWER_FIXED: fix TX power to the mBm parameter
+ */
+enum nl80211_tx_power_setting {
+ NL80211_TX_POWER_AUTOMATIC,
+ NL80211_TX_POWER_LIMITED,
+ NL80211_TX_POWER_FIXED,
+};
+
#endif /* __LINUX_NL80211_H */
--
1.7.3.2.90.gd4c43
^ permalink raw reply related
* [PATCH] iwlagn: fix scan tx antenna setting on 5Ghz band
From: Stanislaw Gruszka @ 2010-12-20 17:05 UTC (permalink / raw)
To: Wey-Yi Guy, Intel Linux Wireless
Cc: Johannes Berg, linux-wireless, Stanislaw Gruszka
Looks that we do not set correctly antennas when scanning
on 5Ghz band and when bluetooth is enabled, because
priv->cfg->scan_tx_antennas[band] is only defined for
IEEE80211_BAND_2GHZ. This fix choose first valid antenna.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 4bc82fc..099039c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -1499,8 +1499,7 @@ int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
priv->cfg->bt_params->advanced_bt_coexist &&
priv->bt_full_concurrent) {
/* operated as 1x1 in full concurrency mode */
- scan_tx_antennas = first_antenna(
- priv->cfg->scan_tx_antennas[band]);
+ scan_tx_antennas = first_antenna(scan_tx_antennas);
}
priv->scan_tx_ant[band] = iwl_toggle_tx_ant(priv, priv->scan_tx_ant[band],
--
1.7.1
^ permalink raw reply related
* RE: smatch stuff: potential read past the end of the buffer
From: Arend Van Spriel @ 2010-12-20 17:13 UTC (permalink / raw)
To: Dan Carpenter
Cc: Vasanthakumar Thiagarajan, linux-wireless@vger.kernel.org,
ath9k-devel@lists.ath9k.org
In-Reply-To: <20101220124217.GU1936@bicker>
Hi Dan,
Agreed. But maybe there is no usage scenario in which the boundary is actually crossed. Have to wait for ath9k developers to answer that.
Gr. AvS
________________________________________
From: Dan Carpenter [error27@gmail.com]
Sent: Monday, December 20, 2010 1:42 PM
To: Arend Van Spriel
Cc: Vasanthakumar Thiagarajan; linux-wireless@vger.kernel.org; ath9k-devel@lists.ath9k.org
Subject: Re: smatch stuff: potential read past the end of the buffer
On Mon, Dec 20, 2010 at 02:16:56AM -0800, Arend Van Spriel wrote:
> Hi Dan,
>
> Why not use min() function?
> index = min(COMP_HDR_LEN + osize, 2046);
> mchecksum = word[index] |
> (word[index + 1] << 8);
>
> Or would smatch miss this in its analysis?
That would silence the warning, but is it the right fix? I thought
maybe we should make word a larger buffer?
regards,
dan carpenter
^ permalink raw reply
* WL1271 chip
From: Brzezowski, Karen @ 2010-12-20 17:12 UTC (permalink / raw)
To: linux-wireless@vger.kernel.org; +Cc: Brzezowski, Karen
In-Reply-To: <1292843841.13129.9.camel@chilepepper>
SGkhDQpMdWNhIHN1Z2dlc3RlZCB0aGF0IEkgc2VuZCB0aGlzIHRvIGFsbCBvZiB5b3UhDQoNCkkg
bG9va2VkIGF0IGFyY2gvYXJtL21hY2gtb21hcDIvYm9hcmQtem9vbS1wZXJpcGhlcmFscy5jIGZp
bGUuLg0KSSBkaWRuJ3Qgc2VlIGFueXRoaW5nIHNwZWNpZmljIHRvIFNESU8uLg0KDQpJIHdhcyBs
b29raW5nIGF0IGxpbnV4LTIuNi4zNi4yLi4NCklzIHRoaXMgdGhlIGNvcnJlY3QgdmVyc2lvbiB0
byBsb29rIGF0Pw0KDQpQbGVhc2UgcmVhZCBiZWxvdyBmb3Igb3JpZ2luYWwgcXVlc3Rpb24uDQpU
SEFOSyB5b3UgZXZlcnlvbmUgZm9yIEFOWSBoZWxwIHlvdSBjYW4gZ2l2ZSBtZSENCkthcmVuDQoN
Ci0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0tDQpIaSBLYXJlbiwNCg0KDQo+IEhpIEx1Y2lhbm8s
DQo+ICANCj4gSeKAmW0gdmVyeSBzb3JyeSB0byBlbWFpbCAgeW91IGRpcmVjdGx5Lg0KDQpObyBw
cm9ibGVtLiAgQnV0IGl0IGlzIGFsd2F5cyBiZXR0ZXIgdG8gZW1haWwgdGhlIGxpbnV4LXdpcmVs
ZXNzQHZnZXIua2VybmVsLm9yZyBtYWlsaW5nIGxpc3QgdG9vLCBiZWNhdXNlIHRoZXJlIGFyZSBs
b3RzIG9mIG90aGVyIHBlb3BsZSB3aG8gY2FuIGhlbHAgeW91IHRoZXJlLg0KDQoNCj4gSSBhbSB2
ZXJ5IG5ldyB0byBwb3J0aW5nIGRyaXZlcnPigKYNCj4gDQo+IEkgaGF2ZSB0byBpbnRlZ3JhdGUv
cG9ydCBhIFdMMTI3MSBjaGlwIChJIHRoaW5rIGl04oCZcyBnb2luZyB0byBiZSB0aGUgDQo+IG9u
ZQ0KPiANCj4gbWFudWZhY3R1cmVkIGJ5IE11cmF0YSkuDQo+IA0KPiBJIHNlZSB0aGF0IHlvdSBt
YWludGFpbiB0aGUgd2wxMnh4IGRyaXZlcnMgb24gbGludXgtd2lyZWxlc3MgDQo+IGtlcm5lbC5v
cmcuDQo+IA0KPiAgDQo+IA0KPiBUaGUgcHJvY2Vzc29yIGlzIGlNWDIzMywgT1MgaXMgQW5kcm9p
ZCAoTGludXgpLg0KPiANCj4gIA0KPiANCj4gSSB3b3VsZCBiZSB2ZXJ5IGFwcHJlY2lhdGl2ZSBp
ZiB5b3UgY291bGQgZ2l2ZSBtZSBzb21lIA0KPiBhZHZpY2UvaW5zdHJ1Y3Rpb25zL2RvY3VtZW50
YXRpb24NCj4gDQo+IHRoYXQgd291bGQgaGVscCBtZSBvbiB1bmRlcnN0YW5kL3N0YXJ0L2NvbXBs
ZXRlIHRoaXMgdGFzay4NCg0KV2VsbCwgdGhlIHdsMTJ4eCBkcml2ZXIgc2hvdWxkIHdvcmsgbW9y
ZSBvciBsZXNzIG91dC1vZi10aGUtYm94LiAgVGhlIG9ubHkgdGhpbmcgeW91IG5lZWQgdG8gZG8g
aXMgdG8gc2V0IHVwIHRoZSBTRElPIGNvbm5lY3Rpb24gdG8geW91ciBjYXJkIChhc3N1bWluZyB0
aGF0IHlvdSdyZSB1c2luZyB0aGUgU0RJTyBidXMgdG8gY29ubmVjdCBpdCkuICBJJ20gbm90IGZh
bWlsaWFyIHdpdGggdGhlIGlNWDIzMywgYnV0IHdpdGggT01BUCwgaXQncyBwcmV0dHkgc2ltcGxl
LiAgWW91IGNhbiBzZWUgdGhlIGFyY2gvYXJtL21hY2gtb21hcDIvYm9hcmQtem9vbS1wZXJpcGhl
cmFscy5jIGZpbGUgaW4gdGhlIExpbnV4IGtlcm5lbCBmb3IgYW4gZXhhbXBsZSBvbiBob3cgdG8g
c2V0IGl0IHVwIGZvciB0aGUgWm9vbSBib2FyZCAoT01BUC1iYXNlZCkuDQoNCg0KLS0NCkNoZWVy
cywNCkx1Y2EuDQoNCg0K
^ permalink raw reply
* [PATCH 1/2] ath9k_hw: Fix incorrect macversion and macrev checks
From: Senthil Balasubramanian @ 2010-12-20 17:37 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Senthil Balasubramanian, Stable Kernel
There are few places where we are checking for macversion and revsions
before RTC is powered ON. However we are reading the macversion and
revisions only after RTC is powered ON and so both macversion and
revisions are actully zero and this leads to incorrect srev checks.
fix this by reading the macversion and revisisons even before we start
using them. There is no reason why should we delay reading this info
until RTC is powered on as this is just a register information.
Cc: Stable Kernel <stable@kernel.org>
Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
---
drivers/net/wireless/ath/ath9k/hw.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index ddda76f..c9b7f1e 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -1078,13 +1078,13 @@ static bool ath9k_hw_set_reset_power_on(struct ath_hw *ah)
return false;
}
- ath9k_hw_read_revisions(ah);
-
return ath9k_hw_set_reset(ah, ATH9K_RESET_WARM);
}
static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type)
{
+ ath9k_hw_read_revisions(ah);
+
if (AR_SREV_9300_20_OR_LATER(ah)) {
REG_WRITE(ah, AR_WA, ah->WARegVal);
udelay(10);
--
1.7.3.4
^ permalink raw reply related
* [PATCH 2/2] ath9k_hw: read and backup AR_WA register value even before chip reset on.
From: Senthil Balasubramanian @ 2010-12-20 17:37 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Senthil Balasubramanian, Stable Kernel
In-Reply-To: <1292866656-2253-1-git-send-email-senthilkumar@atheros.com>
We need to read and backup AR_WA register value permanently and reading
this after the chip is awakened results in this register being zeroed out.
This seems to fix the ASPM with L1 enabled issue that we have observed.
The laptop becomes very slow and hangs mostly with ASPM L1 enabled without
this fix.
Cc: Stable Kernel <stable@kernel.org>
Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
---
drivers/net/wireless/ath/ath9k/hw.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index c9b7f1e..c6eed46 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -491,6 +491,15 @@ static int __ath9k_hw_init(struct ath_hw *ah)
if (ah->hw_version.devid == AR5416_AR9100_DEVID)
ah->hw_version.macVersion = AR_SREV_VERSION_9100;
+ /*
+ * Read back AR_WA into a permanent copy and set bits 14 and 17.
+ * We need to do this to avoid RMW of this register. We cannot
+ * read the reg when chip is asleep.
+ */
+ ah->WARegVal = REG_READ(ah, AR_WA);
+ ah->WARegVal |= (AR_WA_D3_L1_DISABLE |
+ AR_WA_ASPM_TIMER_BASED_DISABLE);
+
if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON)) {
ath_err(common, "Couldn't reset chip\n");
return -EIO;
@@ -559,14 +568,6 @@ static int __ath9k_hw_init(struct ath_hw *ah)
ath9k_hw_init_mode_regs(ah);
- /*
- * Read back AR_WA into a permanent copy and set bits 14 and 17.
- * We need to do this to avoid RMW of this register. We cannot
- * read the reg when chip is asleep.
- */
- ah->WARegVal = REG_READ(ah, AR_WA);
- ah->WARegVal |= (AR_WA_D3_L1_DISABLE |
- AR_WA_ASPM_TIMER_BASED_DISABLE);
if (ah->is_pciexpress)
ath9k_hw_configpcipowersave(ah, 0, 0);
--
1.7.3.4
^ permalink raw reply related
* RE: WL1271 chip
From: Arend Van Spriel @ 2010-12-20 17:47 UTC (permalink / raw)
To: Brzezowski, Karen, linux-wireless@vger.kernel.org
In-Reply-To: <0826983CC0CB074798C42E77D8ACD07F01AEA8@pdtms1.pdt.com>
SSBhbSBhbHNvIG5vdCBmYW1pbGlhciB3aXRoIGkuTVgyMzMsIGJ1dCBnb29nbGluZyBpdCB0aGlz
IHNlZW1zIHRvIGJlIGEgRnJlZXNjYWxlIGFwcCBwcm9jZXNzb3Igd2l0aCBBUk05MjZFSi1TIGNv
cmUgYW5kIGl0IGhhcyBTRElPIHJldjIuMCBjb21wbGlhbnQgaW50ZXJmYWNlIGludGVncmF0ZWQu
IFRoZXJlIGEgYXJjaC9hcm0vbWFjaC1pbXggZGlyZWN0b3J5IGNvbnRhaW5pbmcgaS5NWDI3IHBy
b2Nlc3NvciB3aGljaCBoYXMgc29tZSBzaW1pbGFyaXRpZXMgKHNhbWUgY29yZSBhbmQgTU1DL1NE
IGludGVyZmFjZXMpLiBTbyBpdCBjb3VsZCBiZSBhIGdvb2Qgc3RhcnRpbmcgcG9pbnQgZm9yIHlv
dXIgcG9ydGluZyBlZmZvcnQuDQoNCkFub3RoZXIgaGludCBtYXkgYmUgdGhhdCBTRElPIGlzIHJl
bGF0ZWQgdG8gTU1DL1NELiBTbyBpbiBib2FyZC16b29tLXBlcmlwaGVyYWxzLmMgeW91IHdpbGwg
ZmluZCBtb3JlIHdoZW4gc2VhcmNoaW5nIGZvciAnbW1jJy4gZWc6DQoNCnN0YXRpYyBzdHJ1Y3Qg
b21hcDJfaHNtbWNfaW5mbyBtbWNbXSBfX2luaXRkYXRhID0gew0KICAgICAgICAgICA6DQogICAg
ICAgICAgIDoNCiAgICAgICAgew0KICAgICAgICAgICAgICAgIC5uYW1lICAgICAgICAgICA9ICJ3
bDEyNzEiLA0KICAgICAgICAgICAgICAgIC5tbWMgICAgICAgICAgICA9IDMsDQogICAgICAgICAg
ICAgICAgLmNhcHMgICAgICAgICAgID0gTU1DX0NBUF80X0JJVF9EQVRBLA0KICAgICAgICAgICAg
ICAgIC5ncGlvX3dwICAgICAgICA9IC1FSU5WQUwsDQogICAgICAgICAgICAgICAgLmdwaW9fY2Qg
ICAgICAgID0gLUVJTlZBTCwNCiAgICAgICAgICAgICAgICAubm9ucmVtb3ZhYmxlICAgPSB0cnVl
LA0KICAgICAgICB9LA0KICAgICAgICB7fSAgICAgIC8qIFRlcm1pbmF0b3IgKi8NCn07DQoNCkdy
LiBBdlMNCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18NCkZyb206IGxp
bnV4LXdpcmVsZXNzLW93bmVyQHZnZXIua2VybmVsLm9yZyBbbGludXgtd2lyZWxlc3Mtb3duZXJA
dmdlci5rZXJuZWwub3JnXSBPbiBCZWhhbGYgT2YgQnJ6ZXpvd3NraSwgS2FyZW4gW0thcmVuLkJy
emV6b3dza2lAcGR0LmNvbV0NClNlbnQ6IE1vbmRheSwgRGVjZW1iZXIgMjAsIDIwMTAgNjoxMiBQ
TQ0KVG86IGxpbnV4LXdpcmVsZXNzQHZnZXIua2VybmVsLm9yZw0KQ2M6IEJyemV6b3dza2ksIEth
cmVuDQpTdWJqZWN0OiBXTDEyNzEgY2hpcA0KDQpIaSENCkx1Y2Egc3VnZ2VzdGVkIHRoYXQgSSBz
ZW5kIHRoaXMgdG8gYWxsIG9mIHlvdSENCg0KSSBsb29rZWQgYXQgYXJjaC9hcm0vbWFjaC1vbWFw
Mi9ib2FyZC16b29tLXBlcmlwaGVyYWxzLmMgZmlsZS4uDQpJIGRpZG4ndCBzZWUgYW55dGhpbmcg
c3BlY2lmaWMgdG8gU0RJTy4uDQoNCkkgd2FzIGxvb2tpbmcgYXQgbGludXgtMi42LjM2LjIuLg0K
SXMgdGhpcyB0aGUgY29ycmVjdCB2ZXJzaW9uIHRvIGxvb2sgYXQ/DQoNClBsZWFzZSByZWFkIGJl
bG93IGZvciBvcmlnaW5hbCBxdWVzdGlvbi4NClRIQU5LIHlvdSBldmVyeW9uZSBmb3IgQU5ZIGhl
bHAgeW91IGNhbiBnaXZlIG1lIQ0KS2FyZW4NCg0KLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0N
CkhpIEthcmVuLA0KDQoNCj4gSGkgTHVjaWFubywNCj4NCj4gSeKAmW0gdmVyeSBzb3JyeSB0byBl
bWFpbCAgeW91IGRpcmVjdGx5Lg0KDQpObyBwcm9ibGVtLiAgQnV0IGl0IGlzIGFsd2F5cyBiZXR0
ZXIgdG8gZW1haWwgdGhlIGxpbnV4LXdpcmVsZXNzQHZnZXIua2VybmVsLm9yZyBtYWlsaW5nIGxp
c3QgdG9vLCBiZWNhdXNlIHRoZXJlIGFyZSBsb3RzIG9mIG90aGVyIHBlb3BsZSB3aG8gY2FuIGhl
bHAgeW91IHRoZXJlLg0KDQoNCj4gSSBhbSB2ZXJ5IG5ldyB0byBwb3J0aW5nIGRyaXZlcnPigKYN
Cj4NCj4gSSBoYXZlIHRvIGludGVncmF0ZS9wb3J0IGEgV0wxMjcxIGNoaXAgKEkgdGhpbmsgaXTi
gJlzIGdvaW5nIHRvIGJlIHRoZQ0KPiBvbmUNCj4NCj4gbWFudWZhY3R1cmVkIGJ5IE11cmF0YSku
DQo+DQo+IEkgc2VlIHRoYXQgeW91IG1haW50YWluIHRoZSB3bDEyeHggZHJpdmVycyBvbiBsaW51
eC13aXJlbGVzcw0KPiBrZXJuZWwub3JnLg0KPg0KPg0KPg0KPiBUaGUgcHJvY2Vzc29yIGlzIGlN
WDIzMywgT1MgaXMgQW5kcm9pZCAoTGludXgpLg0KPg0KPg0KPg0KPiBJIHdvdWxkIGJlIHZlcnkg
YXBwcmVjaWF0aXZlIGlmIHlvdSBjb3VsZCBnaXZlIG1lIHNvbWUNCj4gYWR2aWNlL2luc3RydWN0
aW9ucy9kb2N1bWVudGF0aW9uDQo+DQo+IHRoYXQgd291bGQgaGVscCBtZSBvbiB1bmRlcnN0YW5k
L3N0YXJ0L2NvbXBsZXRlIHRoaXMgdGFzay4NCg0KV2VsbCwgdGhlIHdsMTJ4eCBkcml2ZXIgc2hv
dWxkIHdvcmsgbW9yZSBvciBsZXNzIG91dC1vZi10aGUtYm94LiAgVGhlIG9ubHkgdGhpbmcgeW91
IG5lZWQgdG8gZG8gaXMgdG8gc2V0IHVwIHRoZSBTRElPIGNvbm5lY3Rpb24gdG8geW91ciBjYXJk
IChhc3N1bWluZyB0aGF0IHlvdSdyZSB1c2luZyB0aGUgU0RJTyBidXMgdG8gY29ubmVjdCBpdCku
ICBJJ20gbm90IGZhbWlsaWFyIHdpdGggdGhlIGlNWDIzMywgYnV0IHdpdGggT01BUCwgaXQncyBw
cmV0dHkgc2ltcGxlLiAgWW91IGNhbiBzZWUgdGhlIGFyY2gvYXJtL21hY2gtb21hcDIvYm9hcmQt
em9vbS1wZXJpcGhlcmFscy5jIGZpbGUgaW4gdGhlIExpbnV4IGtlcm5lbCBmb3IgYW4gZXhhbXBs
ZSBvbiBob3cgdG8gc2V0IGl0IHVwIGZvciB0aGUgWm9vbSBib2FyZCAoT01BUC1iYXNlZCkuDQoN
Cg0KLS0NCkNoZWVycywNCkx1Y2EuDQoNCg0KTu+/ve+/ve+/ve+/ve+/vXLvv73vv71577+977+9
77+9Yu+/vVjvv73vv73Hp3bvv71e77+9Kd66ey5u77+9K++/ve+/ve+/ve+/vXvvv73vv70q3pXv
v70s77+9e2F577+9HcqH2pnvv70sagfvv73vv71m77+977+977+9aO+/ve+/ve+/vXrvv70e77+9
d++/ve+/ve+/vSDvv73vv73vv71qOit277+977+977+9d++/vWrvv71t77+977+977+977+9B++/
ve+/ve+/ve+/vXpaK++/ve+/ve+/ve+/ve+/vd2iaiLvv73vv70h77+9aQ0K
^ permalink raw reply
* Re: [PATCH] iwlagn: fix scan tx antenna setting on 5Ghz band
From: Guy, Wey-Yi @ 2010-12-20 18:13 UTC (permalink / raw)
To: Stanislaw Gruszka
Cc: Intel Linux Wireless, Johannes Berg,
linux-wireless@vger.kernel.org
In-Reply-To: <1292864713-2756-1-git-send-email-sgruszka@redhat.com>
Hi Stanislaw,
On Mon, 2010-12-20 at 09:05 -0800, Stanislaw Gruszka wrote:
> Looks that we do not set correctly antennas when scanning
> on 5Ghz band and when bluetooth is enabled, because
> priv->cfg->scan_tx_antennas[band] is only defined for
> IEEE80211_BAND_2GHZ. This fix choose first valid antenna.
>
> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
> ---
> drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
> index 4bc82fc..099039c 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
> @@ -1499,8 +1499,7 @@ int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
> priv->cfg->bt_params->advanced_bt_coexist &&
> priv->bt_full_concurrent) {
> /* operated as 1x1 in full concurrency mode */
> - scan_tx_antennas = first_antenna(
> - priv->cfg->scan_tx_antennas[band]);
> + scan_tx_antennas = first_antenna(scan_tx_antennas);
If its is 2.4, we need to use the correct tx antenna, I think we can
remove this block of code all together since check already done above.
if (priv->cfg->scan_tx_antennas[band])
scan_tx_antennas = priv->cfg->scan_tx_antennas[band];
Wey
^ permalink raw reply
* Re: [PATCH 1/2] ath9k_hw: Fix incorrect macversion and macrev checks
From: Felix Fietkau @ 2010-12-20 18:19 UTC (permalink / raw)
To: Senthil Balasubramanian; +Cc: linville, linux-wireless
In-Reply-To: <1292866656-2253-1-git-send-email-senthilkumar@atheros.com>
On 2010-12-20 6:37 PM, Senthil Balasubramanian wrote:
> There are few places where we are checking for macversion and revsions
> before RTC is powered ON. However we are reading the macversion and
> revisions only after RTC is powered ON and so both macversion and
> revisions are actully zero and this leads to incorrect srev checks.
>
> fix this by reading the macversion and revisisons even before we start
> using them. There is no reason why should we delay reading this info
> until RTC is powered on as this is just a register information.
>
> Cc: Stable Kernel <stable@kernel.org>
> Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
> ---
> drivers/net/wireless/ath/ath9k/hw.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
> index ddda76f..c9b7f1e 100644
> --- a/drivers/net/wireless/ath/ath9k/hw.c
> +++ b/drivers/net/wireless/ath/ath9k/hw.c
> @@ -1078,13 +1078,13 @@ static bool ath9k_hw_set_reset_power_on(struct ath_hw *ah)
> return false;
> }
>
> - ath9k_hw_read_revisions(ah);
> -
> return ath9k_hw_set_reset(ah, ATH9K_RESET_WARM);
> }
>
> static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type)
> {
> + ath9k_hw_read_revisions(ah);
> +
> if (AR_SREV_9300_20_OR_LATER(ah)) {
> REG_WRITE(ah, AR_WA, ah->WARegVal);
> udelay(10);
Why re-read the revision on every reset?
- Felix
^ permalink raw reply
* Re: vendor IEs?
From: Daniel Halperin @ 2010-12-20 18:20 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: linux-wireless
In-Reply-To: <AANLkTikXT-Cq622DCKyGz-H1TAkbq7AD1DCzToosNfVs@mail.gmail.com>
On Mon, Dec 20, 2010 at 7:44 AM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
> On Sun, Dec 19, 2010 at 4:53 PM, Daniel Halperin
> <dhalperi@cs.washington.edu> wrote:
>> Is there a compiled list of vendor-specific IEs out there? Googling
>> didn't offer much help.
>
> If you would like, feel free to peg them on the wireless.kernel.org somewhere :)
If I find such a list, I'll be happy to. Right now I don't have
anything to add ;)
Dan
^ permalink raw reply
* Re: vendor IEs?
From: Luis R. Rodriguez @ 2010-12-20 19:22 UTC (permalink / raw)
To: Daniel Halperin; +Cc: linux-wireless
In-Reply-To: <AANLkTi=qzvJ0m1r3ueRbod3i98v0eZexyvwgYUUTC23u@mail.gmail.com>
On Mon, Dec 20, 2010 at 1:20 PM, Daniel Halperin
<dhalperi@cs.washington.edu> wrote:
> On Mon, Dec 20, 2010 at 7:44 AM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
>> On Sun, Dec 19, 2010 at 4:53 PM, Daniel Halperin
>> <dhalperi@cs.washington.edu> wrote:
>>> Is there a compiled list of vendor-specific IEs out there? Googling
>>> didn't offer much help.
>>
>> If you would like, feel free to peg them on the wireless.kernel.org somewhere :)
>
> If I find such a list, I'll be happy to. Right now I don't have
> anything to add ;)
And then send patches to iw? :)
Luis
^ permalink raw reply
* Re: vendor IEs?
From: Daniel Halperin @ 2010-12-20 19:25 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: linux-wireless
In-Reply-To: <AANLkTi=SrWMZkJ4dsen25BtXihBxYV2JzV5FyMnWA4dj@mail.gmail.com>
On Mon, Dec 20, 2010 at 11:22 AM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
> On Mon, Dec 20, 2010 at 1:20 PM, Daniel Halperin
> <dhalperi@cs.washington.edu> wrote:
>> On Mon, Dec 20, 2010 at 7:44 AM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
>>> On Sun, Dec 19, 2010 at 4:53 PM, Daniel Halperin
>>> <dhalperi@cs.washington.edu> wrote:
>>>> Is there a compiled list of vendor-specific IEs out there? Googling
>>>> didn't offer much help.
>>>
>>> If you would like, feel free to peg them on the wireless.kernel.org somewhere :)
>>
>> If I find such a list, I'll be happy to. Right now I don't have
>> anything to add ;)
>
> And then send patches to iw? :)
>
Wow, you manipulator :p. ACK :)
Dan
^ permalink raw reply
* [PATCH 1/3] mwifiex: solve kernel dump issue for debugfs command 'debug'
From: Bing Zhao @ 2010-12-20 19:26 UTC (permalink / raw)
To: linux-wireless
Cc: John W. Linville, Johannes Berg, Amitkumar Karwar, Kiran Divekar,
Frank Huang, Bing Zhao
From: Amitkumar Karwar <akarwar@marvell.com>
Issue is when card is reinserted (without unloading the driver),
"cat /debugfs/mwifiex/mlan0/debug" command gives kernel dump.
Actually while handling this command some elements of "struct
mwifiex_adapter *adapter"and "struct mwifiex_debug_info *info"
are read by adding structure address to element offset
and displayed them to console.
When the card is reinserted, mwifiex_dev_debugfs_init() function
is called and addresses used for reading those elements (which are
correct ones) are unnecessorily incremented by structure addresses.
Fixed this issue by using separate variable to store final address
while reading structure elements instead of incrementing same
variable.
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
---
drivers/net/wireless/mwifiex/debugfs.c | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/mwifiex/debugfs.c b/drivers/net/wireless/mwifiex/debugfs.c
index 9d23c68..2b642f1 100644
--- a/drivers/net/wireless/mwifiex/debugfs.c
+++ b/drivers/net/wireless/mwifiex/debugfs.c
@@ -430,7 +430,11 @@ mwifiex_debug_read(struct file *file, char __user *ubuf,
p += sprintf(p, "%s=", d[i].name);
size = d[i].size / d[i].num;
- addr = d[i].addr;
+
+ if (i < (num_of_items - 3))
+ addr = d[i].addr + (size_t) &info;
+ else /* The last 3 items are struct mwifiex_adapter variables */
+ addr = d[i].addr + (size_t) priv->adapter;
for (j = 0; j < d[i].num; j++) {
switch (size) {
@@ -2459,8 +2463,6 @@ MWIFIEX_DFS_FILE_READ_OPS(esuppmode);
void
mwifiex_dev_debugfs_init(struct mwifiex_private *priv)
{
- int i;
-
ENTER();
if (!mwifiex_dfs_dir || !priv)
@@ -2472,14 +2474,6 @@ mwifiex_dev_debugfs_init(struct mwifiex_private *priv)
if (!priv->dfs_dev_dir)
goto exit;
- /* The last 3 items are struct mwifiex_adapter variables */
- for (i = 0; i < num_of_items - 3; i++)
- items[i].addr += (size_t) &info;
-
- for (; i < num_of_items; i++)
- items[i].addr += (size_t) priv->adapter;
-
-
MWIFIEX_DFS_ADD_FILE(info);
MWIFIEX_DFS_ADD_FILE(debug);
MWIFIEX_DFS_ADD_FILE(deepsleep);
--
1.7.0.2
^ permalink raw reply related
* [PATCH 2/3] mwifiex: remove set operation for debugfs command 'debug'
From: Bing Zhao @ 2010-12-20 19:26 UTC (permalink / raw)
To: linux-wireless
Cc: John W. Linville, Johannes Berg, Amitkumar Karwar, Kiran Divekar,
Frank Huang, Bing Zhao
In-Reply-To: <1292873207-9318-1-git-send-email-bzhao@marvell.com>
From: Amitkumar Karwar <akarwar@marvell.com>
Debugfs command 'debug' gives useful information for debugging
purpose. Since there is no use case of set operation for this
command, the support is removed.
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
---
drivers/net/wireless/mwifiex/debugfs.c | 98 +-----------------------------
drivers/net/wireless/mwifiex/main.h | 4 -
drivers/net/wireless/mwifiex/sta_ioctl.c | 44 -------------
drivers/net/wireless/mwifiex/util.c | 73 +----------------------
4 files changed, 2 insertions(+), 217 deletions(-)
diff --git a/drivers/net/wireless/mwifiex/debugfs.c b/drivers/net/wireless/mwifiex/debugfs.c
index 2b642f1..597cb26 100644
--- a/drivers/net/wireless/mwifiex/debugfs.c
+++ b/drivers/net/wireless/mwifiex/debugfs.c
@@ -510,102 +510,6 @@ exit:
}
/*
- * Proc debug file write handler.
- *
- * This function is called when the 'debug' file is opened for writing
- *
- * This function can be used to overwrite/set debug parameters. It does
- * not validate if a debug parameter can be changed or not. It just sends
- * the change request to firmware.
- */
-static ssize_t
-mwifiex_debug_write(struct file *file, const char __user *ubuf,
- size_t count, loff_t *ppos)
-{
- struct mwifiex_private *priv =
- (struct mwifiex_private *) file->private_data;
- char *buf, *p, *p0, *p1, *p2;
- struct mwifiex_debug_data *d = &items[0];
- ssize_t ret = 0;
- unsigned long val;
- int i;
-
- ENTER();
-
- buf = kzalloc(count, GFP_KERNEL);
- if (!buf) {
- ret = -EFAULT;
- goto exit;
- }
-
- if (copy_from_user(buf, ubuf, count)) {
- kfree(buf);
- PRINTM(MERROR, "%s: copy_from_user failed\n", __func__);
- ret = -EFAULT;
- goto exit;
- }
-
- for (p0 = buf, i = 0; i < num_of_items; i++) {
- /* skip array */
- if (d[i].num > 1)
- continue;
-
- do {
- p = strstr(p0, d[i].name);
- if (!p)
- break;
-
- p1 = strchr(p, '\n');
- if (!p1)
- break;
-
- p0 = p1++;
-
- p2 = strchr(p, '=');
- if (!p2)
- break;
- p2++;
-
- ret = strict_strtoul(p2, 0, &val);
- if (ret < 0) {
- PRINTM(MERROR, "strict_strtoul fail %d\n", ret);
- ret = -EFAULT;
- }
-
- switch (d[i].size) {
- case 1:
- *((u8 *) d[i].addr) = (u8) val;
- break;
- case 2:
- *((u16 *) d[i].addr) = (u16) val;
- break;
- case 4:
- *((u32 *) d[i].addr) = (u32) val;
- break;
- case 8:
- *((long long *) d[i].addr) = (long long) val;
- break;
- default:
- break;
- }
- } while (1);
- }
-
- kfree(buf);
-
- /* Set debug information */
- if (mwifiex_set_debug_info(priv, MWIFIEX_PROC_WAIT, &info)) {
- PRINTM(MERROR, "%s: mwifiex_set_debug_info\n", __func__);
- ret = -EFAULT;
- goto exit;
- }
-
- LEAVE();
-exit:
- return count;
-}
-
-/*
* Proc txaggrpio file write handler.
*
* This function is called when the 'txaggrprio' file is opened for writing
@@ -2434,7 +2338,7 @@ static const struct file_operations mwifiex_dfs_##name##_fops = { \
MWIFIEX_DFS_FILE_READ_OPS(info);
-MWIFIEX_DFS_FILE_OPS(debug);
+MWIFIEX_DFS_FILE_READ_OPS(debug);
MWIFIEX_DFS_FILE_OPS(deepsleep);
MWIFIEX_DFS_FILE_OPS(hscfg);
MWIFIEX_DFS_FILE_OPS(amsduaggrctrl);
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 646cc55..f43372f 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -996,10 +996,6 @@ enum mwifiex_status mwifiex_get_debug_info(struct mwifiex_private *priv,
u8 wait_option,
struct mwifiex_debug_info
*debug_info);
-enum mwifiex_status mwifiex_set_debug_info(struct mwifiex_private *priv,
- u8 wait_option,
- struct mwifiex_debug_info
- *debug_info);
enum mwifiex_status mwifiex_disconnect(struct mwifiex_private *, u8, u8 *);
enum mwifiex_status mwifiex_bss_start(struct mwifiex_private *priv,
u8 wait_option,
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index 4a13ccc..f1676bb 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -546,50 +546,6 @@ mwifiex_get_debug_info(struct mwifiex_private *priv, u8 wait_option,
}
/*
- * Sends IOCTL request to set debug information.
- *
- * This function allocates the IOCTL request buffer, fills it
- * with requisite parameters and calls the IOCTL handler.
- */
-enum mwifiex_status
-mwifiex_set_debug_info(struct mwifiex_private *priv, u8 wait_option,
- struct mwifiex_debug_info *debug_info)
-{
- struct mwifiex_ioctl_req *req = NULL;
- struct mwifiex_ds_get_info *info = NULL;
- enum mwifiex_status status = MWIFIEX_STATUS_SUCCESS;
-
- ENTER();
-
- if (!debug_info) {
- LEAVE();
- return MWIFIEX_STATUS_FAILURE;
- }
-
- /* Allocate an IOCTL request buffer */
- req = mwifiex_alloc_ioctl_req(sizeof(struct mwifiex_ds_get_info));
- if (req == NULL) {
- LEAVE();
- return MWIFIEX_STATUS_FAILURE;
- }
-
- /* Fill request buffer */
- info = (struct mwifiex_ds_get_info *) req->buffer;
- info->sub_command = MWIFIEX_OID_GET_DEBUG_INFO;
- memcpy(&info->param.debug_info, debug_info,
- sizeof(struct mwifiex_debug_info));
- req->req_id = MWIFIEX_IOCTL_GET_INFO;
- req->action = MWIFIEX_ACT_SET;
-
- status = mwifiex_request_ioctl(priv, req, wait_option);
-
- if (req && (status != MWIFIEX_STATUS_PENDING))
- kfree(req);
- LEAVE();
- return status;
-}
-
-/*
* Sends IOCTL request to get Host Sleep parameters.
*
* This function allocates the IOCTL request buffer, fills it
diff --git a/drivers/net/wireless/mwifiex/util.c b/drivers/net/wireless/mwifiex/util.c
index 9af28b3..9ef5b74 100644
--- a/drivers/net/wireless/mwifiex/util.c
+++ b/drivers/net/wireless/mwifiex/util.c
@@ -296,78 +296,7 @@ mwifiex_get_info_debug_info(struct mwifiex_adapter *adapter,
info = (struct mwifiex_ds_get_info *) ioctl_req->buffer;
- if (ioctl_req->action == MWIFIEX_ACT_SET) {
- memcpy(priv->wmm.packets_out,
- info->param.debug_info.packets_out,
- sizeof(priv->wmm.packets_out));
- adapter->max_tx_buf_size =
- (u16) info->param.debug_info.max_tx_buf_size;
- adapter->tx_buf_size =
- (u16) info->param.debug_info.tx_buf_size;
- adapter->curr_tx_buf_size =
- (u16) info->param.debug_info.curr_tx_buf_size;
- adapter->ps_mode = info->param.debug_info.ps_mode;
- adapter->ps_state = info->param.debug_info.ps_state;
- adapter->is_deep_sleep = info->param.debug_info.is_deep_sleep;
- adapter->pm_wakeup_card_req =
- info->param.debug_info.pm_wakeup_card_req;
- adapter->pm_wakeup_fw_try =
- info->param.debug_info.pm_wakeup_fw_try;
- adapter->is_hs_configured =
- info->param.debug_info.is_hs_configured;
- adapter->hs_activated = info->param.debug_info.hs_activated;
-
- adapter->dbg.num_cmd_host_to_card_failure =
- info->param.debug_info.num_cmd_host_to_card_failure;
- adapter->dbg.num_cmd_sleep_cfm_host_to_card_failure =
- info->param.debug_info.
- num_cmd_sleep_cfm_host_to_card_failure;
- adapter->dbg.num_tx_host_to_card_failure =
- info->param.debug_info.num_tx_host_to_card_failure;
- adapter->dbg.num_event_deauth =
- info->param.debug_info.num_event_deauth;
- adapter->dbg.num_event_disassoc =
- info->param.debug_info.num_event_disassoc;
- adapter->dbg.num_event_link_lost =
- info->param.debug_info.num_event_link_lost;
- adapter->dbg.num_cmd_deauth =
- info->param.debug_info.num_cmd_deauth;
- adapter->dbg.num_cmd_assoc_success =
- info->param.debug_info.num_cmd_assoc_success;
- adapter->dbg.num_cmd_assoc_failure =
- info->param.debug_info.num_cmd_assoc_failure;
- adapter->dbg.num_tx_timeout =
- info->param.debug_info.num_tx_timeout;
- adapter->dbg.num_cmd_timeout =
- info->param.debug_info.num_cmd_timeout;
- adapter->dbg.timeout_cmd_id =
- info->param.debug_info.timeout_cmd_id;
- adapter->dbg.timeout_cmd_act =
- info->param.debug_info.timeout_cmd_act;
- memcpy(adapter->dbg.last_cmd_id,
- info->param.debug_info.last_cmd_id,
- sizeof(adapter->dbg.last_cmd_id));
- memcpy(adapter->dbg.last_cmd_act,
- info->param.debug_info.last_cmd_act,
- sizeof(adapter->dbg.last_cmd_act));
- adapter->dbg.last_cmd_index =
- info->param.debug_info.last_cmd_index;
- memcpy(adapter->dbg.last_cmd_resp_id,
- info->param.debug_info.last_cmd_resp_id,
- sizeof(adapter->dbg.last_cmd_resp_id));
- adapter->dbg.last_cmd_resp_index =
- info->param.debug_info.last_cmd_resp_index;
- memcpy(adapter->dbg.last_event,
- info->param.debug_info.last_event,
- sizeof(adapter->dbg.last_event));
- adapter->dbg.last_event_index =
- info->param.debug_info.last_event_index;
-
- adapter->data_sent = info->param.debug_info.data_sent;
- adapter->cmd_sent = info->param.debug_info.cmd_sent;
- adapter->cmd_resp_received =
- info->param.debug_info.cmd_resp_received;
- } else { /* MWIFIEX_ACT_GET */
+ if (ioctl_req->action == MWIFIEX_ACT_GET) {
memcpy(info->param.debug_info.packets_out,
priv->wmm.packets_out,
sizeof(priv->wmm.packets_out));
--
1.7.0.2
^ permalink raw reply related
* [PATCH 3/3] mwifiex: remove struct mwifiex_drv_timer and associated
From: Bing Zhao @ 2010-12-20 19:26 UTC (permalink / raw)
To: linux-wireless
Cc: John W. Linville, Johannes Berg, Amitkumar Karwar, Kiran Divekar,
Frank Huang, Bing Zhao
In-Reply-To: <1292873207-9318-1-git-send-email-bzhao@marvell.com>
The struct mwifiex_drv_timer and its allocations are unnecessary
as we can use struct timer_list directly. All stuff associated
with this structure also removed.
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: Kiran Divekar <dkiran@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
---
drivers/net/wireless/mwifiex/11n_rxreorder.c | 53 ++++----------------------
drivers/net/wireless/mwifiex/cmdevt.c | 19 +--------
drivers/net/wireless/mwifiex/init.c | 10 +----
drivers/net/wireless/mwifiex/main.c | 44 ++-------------------
drivers/net/wireless/mwifiex/main.h | 8 +--
drivers/net/wireless/mwifiex/sta_event.c | 3 +-
drivers/net/wireless/mwifiex/util.h | 32 ---------------
7 files changed, 20 insertions(+), 149 deletions(-)
diff --git a/drivers/net/wireless/mwifiex/11n_rxreorder.c b/drivers/net/wireless/mwifiex/11n_rxreorder.c
index 9d72135..8da7a29 100644
--- a/drivers/net/wireless/mwifiex/11n_rxreorder.c
+++ b/drivers/net/wireless/mwifiex/11n_rxreorder.c
@@ -185,16 +185,7 @@ mwifiex_11n_delete_rx_reorder_tbl_entry(struct mwifiex_private *priv,
rx_reor_tbl_ptr->win_size)
&(MAX_TID_VALUE - 1));
- if (rx_reor_tbl_ptr->timer_context.timer) {
- if (rx_reor_tbl_ptr->timer_context.timer_is_set) {
- del_timer(&rx_reor_tbl_ptr->timer_context.timer->tl);
- rx_reor_tbl_ptr->timer_context.timer->timer_is_canceled
- = true;
- rx_reor_tbl_ptr->timer_context.timer->time_period = 0;
- }
-
- kfree(rx_reor_tbl_ptr->timer_context.timer);
- }
+ del_timer(&rx_reor_tbl_ptr->timer_context.timer);
PRINTM(MDAT_D, "Delete rx_reor_tbl_ptr: %p\n", rx_reor_tbl_ptr);
mwifiex_util_unlink_list(&priv->rx_reorder_tbl_ptr,
@@ -267,13 +258,12 @@ mwifiex_11n_find_last_seq_num(struct mwifiex_rx_reorder_tbl *rx_reorder_tbl_ptr)
* them and then dumps the Rx reordering table.
*/
static void
-mwifiex_flush_data(void *context)
+mwifiex_flush_data(unsigned long context)
{
struct reorder_tmr_cnxt *reorder_cnxt =
(struct reorder_tmr_cnxt *) context;
int start_win;
- reorder_cnxt->timer_is_set = false;
mwifiex_11n_display_tbl_ptr(reorder_cnxt->priv->adapter,
reorder_cnxt->ptr);
@@ -363,27 +353,12 @@ mwifiex_11n_create_rx_reorder_tbl(struct mwifiex_private *priv, u8 *ta,
PRINTM(MDAT_D, "Create ReorderPtr: %p\n", new_node);
new_node->timer_context.ptr = new_node;
new_node->timer_context.priv = priv;
- new_node->timer_context.timer_is_set = false;
-
- new_node->timer_context.timer =
- kmalloc(sizeof(struct mwifiex_drv_timer), GFP_KERNEL);
- if (!new_node->timer_context.timer) {
- LEAVE();
- return;
- }
- init_timer(&new_node->timer_context.timer->tl);
- new_node->timer_context.timer->tl.function =
- mwifiex_timer_handler;
- new_node->timer_context.timer->tl.data = (unsigned long)
- new_node->timer_context.timer;
- new_node->timer_context.timer->timer_function =
+ init_timer(&new_node->timer_context.timer);
+ new_node->timer_context.timer.function =
mwifiex_flush_data;
- new_node->timer_context.timer->function_context =
- &new_node->timer_context;
- new_node->timer_context.timer->timer_is_canceled = true;
- new_node->timer_context.timer->time_period = 0;
- new_node->timer_context.timer->timer_is_periodic = false;
+ new_node->timer_context.timer.data =
+ (unsigned long) &new_node->timer_context;
for (i = 0; i < win_size; ++i)
new_node->rx_reorder_ptr[i] = NULL;
@@ -556,21 +531,9 @@ mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv,
start_win = rx_reor_tbl_ptr->start_win;
win_size = rx_reor_tbl_ptr->win_size;
end_win = ((start_win + win_size) - 1) & (MAX_TID_VALUE - 1);
- if (rx_reor_tbl_ptr->timer_context.timer_is_set) {
- del_timer(&rx_reor_tbl_ptr->timer_context.timer->tl);
- rx_reor_tbl_ptr->timer_context.timer->timer_is_canceled
- = true;
- rx_reor_tbl_ptr->timer_context.timer->time_period = 0;
- }
- rx_reor_tbl_ptr->timer_context.timer->timer_is_periodic
- = false;
- rx_reor_tbl_ptr->timer_context.timer->time_period
- = MIN_FLUSH_TIMER_MS * win_size;
- mod_timer(&rx_reor_tbl_ptr->timer_context.timer->tl, jiffies
+ del_timer(&rx_reor_tbl_ptr->timer_context.timer);
+ mod_timer(&rx_reor_tbl_ptr->timer_context.timer, jiffies
+ (MIN_FLUSH_TIMER_MS * win_size * HZ) / 1000);
- rx_reor_tbl_ptr->timer_context.timer->timer_is_canceled
- = false;
- rx_reor_tbl_ptr->timer_context.timer_is_set = true;
PRINTM(MDAT_D, "TID %d, TA %02x:%02x:%02x:%02x:%02x:%02x\n",
tid, ta[0], ta[1], ta[2], ta[3], ta[4], ta[5]);
diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c
index cfdf206..1f70cef 100644
--- a/drivers/net/wireless/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/mwifiex/cmdevt.c
@@ -312,13 +312,8 @@ mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv,
cmd_code &= HostCmd_CMD_ID_MASK;
/* Setup the timer after transmit command */
- adapter->mwifiex_cmd_timer->timer_is_periodic = false;
- adapter->mwifiex_cmd_timer->time_period = MWIFIEX_TIMER_10S;
- mod_timer(&adapter->mwifiex_cmd_timer->tl,
+ mod_timer(&adapter->cmd_timer,
jiffies + (MWIFIEX_TIMER_10S * HZ) / 1000);
- adapter->mwifiex_cmd_timer->timer_is_canceled = false;
-
- adapter->cmd_timer_is_set = true;
ret = MWIFIEX_STATUS_SUCCESS;
@@ -905,14 +900,7 @@ mwifiex_process_cmdresp(struct mwifiex_adapter *adapter)
ENTER();
/* Now we got response from FW, cancel the command timer */
- if (adapter->cmd_timer_is_set) {
- /* Cancel command timeout timer */
- del_timer(&adapter->mwifiex_cmd_timer->tl);
- adapter->mwifiex_cmd_timer->timer_is_canceled = true;
- adapter->mwifiex_cmd_timer->time_period = 0;
- /* Cancel command timeout timer */
- adapter->cmd_timer_is_set = false;
- }
+ del_timer(&adapter->cmd_timer);
if (!adapter->curr_cmd || !adapter->curr_cmd->resp_buf) {
resp = (struct host_cmd_ds_command *) adapter->upld_buf;
@@ -1044,7 +1032,7 @@ done:
* It will re-send the same command again.
*/
void
-mwifiex_cmd_timeout_func(void *function_context)
+mwifiex_cmd_timeout_func(unsigned long function_context)
{
struct mwifiex_adapter *adapter =
(struct mwifiex_adapter *) function_context;
@@ -1055,7 +1043,6 @@ mwifiex_cmd_timeout_func(void *function_context)
ENTER();
- adapter->cmd_timer_is_set = false;
adapter->num_cmd_timeout++;
adapter->dbg.num_cmd_timeout++;
if (!adapter->curr_cmd) {
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index b7fdd18..7b0b10c 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -231,8 +231,6 @@ mwifiex_init_adapter(struct mwifiex_adapter *adapter)
adapter->event_received = false;
adapter->data_received = false;
- adapter->cmd_timer_is_set = false;
-
adapter->surprise_removed = false;
adapter->hw_status = MWIFIEX_HW_STATUS_INITIALIZING;
@@ -358,13 +356,7 @@ mwifiex_free_adapter(struct mwifiex_adapter *adapter)
PRINTM(MINFO, "Free Command buffer\n");
mwifiex_free_cmd_buffer(adapter);
- if (adapter->cmd_timer_is_set) {
- /* Cancel command timeout timer */
- del_timer(&adapter->mwifiex_cmd_timer->tl);
- adapter->mwifiex_cmd_timer->timer_is_canceled = true;
- adapter->mwifiex_cmd_timer->time_period = 0;
- adapter->cmd_timer_is_set = false;
- }
+ del_timer(&adapter->cmd_timer);
PRINTM(MINFO, "Free ScanTable\n");
kfree(adapter->scan_table);
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index 4e1ac6f..6f03f95 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -148,23 +148,9 @@ mwifiex_register(void *card,
goto error;
}
- /* Initialize timers */
- adapter->mwifiex_cmd_timer =
- kmalloc(sizeof(struct mwifiex_drv_timer), GFP_KERNEL);
- if (!adapter->mwifiex_cmd_timer) {
- LEAVE();
- return MWIFIEX_STATUS_FAILURE;
- }
- init_timer(&adapter->mwifiex_cmd_timer->tl);
- adapter->mwifiex_cmd_timer->tl.function = mwifiex_timer_handler;
- adapter->mwifiex_cmd_timer->tl.data =
- (unsigned long) adapter->mwifiex_cmd_timer;
-
- adapter->mwifiex_cmd_timer->timer_function = mwifiex_cmd_timeout_func;
- adapter->mwifiex_cmd_timer->function_context = adapter;
- adapter->mwifiex_cmd_timer->timer_is_canceled = true;
- adapter->mwifiex_cmd_timer->time_period = 0;
- adapter->mwifiex_cmd_timer->timer_is_periodic = false;
+ init_timer(&adapter->cmd_timer);
+ adapter->cmd_timer.function = mwifiex_cmd_timeout_func;
+ adapter->cmd_timer.data = (unsigned long) adapter;
/* Return pointer of struct mwifiex_adapter */
*padapter = adapter;
@@ -173,18 +159,6 @@ mwifiex_register(void *card,
error:
PRINTM(MINFO, "Leave mwifiex_register with error\n");
- /* Free timers */
- if (adapter->mwifiex_cmd_timer) {
- if (!adapter->mwifiex_cmd_timer->timer_is_canceled
- && adapter->mwifiex_cmd_timer->time_period) {
- PRINTM(MWARN, "mwifiex free timer w/o stop timer!\n");
- del_timer(&adapter->mwifiex_cmd_timer->tl);
- adapter->mwifiex_cmd_timer->timer_is_canceled = true;
- adapter->mwifiex_cmd_timer->time_period = 0;
- }
- kfree(adapter->mwifiex_cmd_timer);
- }
-
/* Free lock variables */
wlan_free_lock_list(adapter);
for (i = 0; i < MWIFIEX_MAX_BSS_NUM; i++)
@@ -215,17 +189,7 @@ mwifiex_unregister(struct mwifiex_adapter *adapter)
ENTER();
- /* Free timers */
- if (adapter->mwifiex_cmd_timer) {
- if (!adapter->mwifiex_cmd_timer->timer_is_canceled
- && adapter->mwifiex_cmd_timer->time_period) {
- PRINTM(MWARN, "mwifiex free timer w/o stop timer!\n");
- del_timer(&adapter->mwifiex_cmd_timer->tl);
- adapter->mwifiex_cmd_timer->timer_is_canceled = true;
- adapter->mwifiex_cmd_timer->time_period = 0;
- }
- kfree(adapter->mwifiex_cmd_timer);
- }
+ del_timer(&adapter->cmd_timer);
/* Free lock variables */
wlan_free_lock_list(adapter);
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index f43372f..8e9fb0b 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -462,8 +462,7 @@ struct mwifiex_tx_ba_stream_tbl {
struct mwifiex_rx_reorder_tbl;
struct reorder_tmr_cnxt {
- struct mwifiex_drv_timer *timer;
- u8 timer_is_set;
+ struct timer_list timer;
struct mwifiex_rx_reorder_tbl *ptr;
struct mwifiex_private *priv;
};
@@ -576,8 +575,7 @@ struct mwifiex_adapter {
spinlock_t mwifiex_cmd_lock;
u32 num_cmd_timeout;
u16 last_init_cmd;
- struct mwifiex_drv_timer *mwifiex_cmd_timer;
- u8 cmd_timer_is_set;
+ struct timer_list cmd_timer;
struct mwifiex_list_head cmd_free_q;
struct mwifiex_list_head cmd_pending_q;
struct mwifiex_list_head scan_pending_q;
@@ -686,7 +684,7 @@ enum mwifiex_status mwifiex_prepare_cmd(struct mwifiex_private *priv,
u32 cmd_oid,
void *ioctl_buf, void *data_buf);
-void mwifiex_cmd_timeout_func(void *FunctionContext);
+void mwifiex_cmd_timeout_func(unsigned long function_context);
enum mwifiex_status mwifiex_misc_ioctl_host_cmd(struct mwifiex_adapter
*adapter,
diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c
index f4384d5..4cd4169 100644
--- a/drivers/net/wireless/mwifiex/sta_event.c
+++ b/drivers/net/wireless/mwifiex/sta_event.c
@@ -119,8 +119,7 @@ mwifiex_reset_connect_state(struct mwifiex_private *priv)
adapter->tx_lock_flag = false;
adapter->pps_uapsd_mode = false;
- if (adapter->num_cmd_timeout && adapter->curr_cmd &&
- !adapter->cmd_timer_is_set) {
+ if (adapter->num_cmd_timeout && adapter->curr_cmd) {
LEAVE();
return;
}
diff --git a/drivers/net/wireless/mwifiex/util.h b/drivers/net/wireless/mwifiex/util.h
index 9996398..12ba9f9 100644
--- a/drivers/net/wireless/mwifiex/util.h
+++ b/drivers/net/wireless/mwifiex/util.h
@@ -149,36 +149,4 @@ mwifiex_util_free_list_head(struct mwifiex_list_head *head)
head->next = NULL;
head->prev = head->next;
}
-
-struct mwifiex_drv_timer {
- struct timer_list tl;
- void (*timer_function) (void *context);
- void *function_context;
- u32 time_period;
- u32 timer_is_periodic;
- u32 timer_is_canceled;
-};
-
-/*
- * Timer handler.
- *
- * This function calls the timer callback function and reassigns the
- * timer if it is periodic.
- */
-static inline void
-mwifiex_timer_handler(unsigned long fcontext)
-{
- struct mwifiex_drv_timer *timer = (struct mwifiex_drv_timer *) fcontext;
-
- timer->timer_function(timer->function_context);
-
- if (timer->timer_is_periodic) {
- mod_timer(&timer->tl,
- jiffies + ((timer->time_period * HZ) / 1000));
- } else {
- timer->timer_is_canceled = true;
- timer->time_period = 0;
- }
-}
-
#endif /* !_MWIFIEX_UTIL_H_ */
--
1.7.0.2
^ permalink raw reply related
* new stuff for 2.6.38 needs to be posted _now_
From: John W. Linville @ 2010-12-20 19:30 UTC (permalink / raw)
To: linux-wireless
You may have noticed that Linus has released 2.6.37-rc6. So, the
merge window is around the corner!
For those that need a reminder, the opening of the merge window is a
_deadline_ for new features. Once the merge window opens, only fixes
will be accepted for 2.6.38. In fact, any non-fix patches need to
already be in wireless-next-2.6 when the merge window opens if you want
them in 2.6.38. That means you need to get them posted _now_, so they
can be reviewed and I can find time to merge them before the deadline.
You have been warned...this means you!
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply
* Re: Recent suspend/resume fix for which devices?
From: Jonas H. @ 2010-12-20 19:53 UTC (permalink / raw)
To: linux-wireless
In-Reply-To: <20101220141531.GB10104@tuxdriver.com>
On 12/20/2010 03:15 PM, John W. Linville wrote:
>> My question is: Does that fix also apply to my card? I realize the
>> patch only applies to ath9k_htc but I couldn't figure what "htc"
>> stands for in this context.
>
> Probably not. Did you try reverting it?
I didn't, because I dislike compilation on netbooks. ;)
>> If it doesn't, does this mailing list also function as a bug tracker?
>
> Sorta, but not really. There is a bugzilla instance at bugzilla.kernel.org.
Thanks, filed a bug there: https://bugzilla.kernel.org/show_bug.cgi?id=25342
^ permalink raw reply
* RE: WL1271 chip
From: Arend Van Spriel @ 2010-12-20 19:58 UTC (permalink / raw)
To: Brzezowski, Karen; +Cc: linux-wireless@vger.kernel.org
In-Reply-To: <0826983CC0CB074798C42E77D8ACD07F01AF50@pdtms1.pdt.com>
SnVzdCBjaGVja2VkIG9uIGtlcm5lbC5vcmcgYW5kIGluZGVlZCBpdCBpcyBub3QgaW4gbGludXgt
Mi42LjM2LjIgKHN0YWJsZSksIGJ1dCBpdCBpcyBpbiAyLjYuMzctcmM2IChtYWluLWxpbmUpLg0K
DQpHci4gQXZTDQpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fDQpGcm9t
OiBCcnplem93c2tpLCBLYXJlbiBbS2FyZW4uQnJ6ZXpvd3NraUBwZHQuY29tXQ0KU2VudDogTW9u
ZGF5LCBEZWNlbWJlciAyMCwgMjAxMCA3OjAwIFBNDQpUbzogQXJlbmQgVmFuIFNwcmllbA0KU3Vi
amVjdDogUkU6IFdMMTI3MSBjaGlwDQoNCkNvdWxkIHlvdSB0ZWxsIG1lIHdoZXJlIHlvdSBmb3Vu
ZCB0aGlzIGJvYXJkLXpvb20tcGVyaXBoZXJhbHMuYz8NCkkgaGF2ZSB0aGUgbGludXgtMi42LjM2
LjIgY29kZSBhbmQgdGhlIHdsMTI3MSBpcyBub3QgaW4gdGhhdCBmaWxlLi4NCjotKQ0KdGhhbmtz
IQ0KS2FyZW4NCg0KLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCkZyb206IEFyZW5kIFZhbiBT
cHJpZWwgW21haWx0bzphcmVuZEBicm9hZGNvbS5jb21dDQpTZW50OiBNb25kYXksIERlY2VtYmVy
IDIwLCAyMDEwIDExOjQ3IEFNDQpUbzogQnJ6ZXpvd3NraSwgS2FyZW47IGxpbnV4LXdpcmVsZXNz
QHZnZXIua2VybmVsLm9yZw0KU3ViamVjdDogUkU6IFdMMTI3MSBjaGlwDQoNCkkgYW0gYWxzbyBu
b3QgZmFtaWxpYXIgd2l0aCBpLk1YMjMzLCBidXQgZ29vZ2xpbmcgaXQgdGhpcyBzZWVtcyB0byBi
ZSBhIEZyZWVzY2FsZSBhcHAgcHJvY2Vzc29yIHdpdGggQVJNOTI2RUotUyBjb3JlIGFuZCBpdCBo
YXMgU0RJTyByZXYyLjAgY29tcGxpYW50IGludGVyZmFjZSBpbnRlZ3JhdGVkLiBUaGVyZSBhIGFy
Y2gvYXJtL21hY2gtaW14IGRpcmVjdG9yeSBjb250YWluaW5nIGkuTVgyNyBwcm9jZXNzb3Igd2hp
Y2ggaGFzIHNvbWUgc2ltaWxhcml0aWVzIChzYW1lIGNvcmUgYW5kIE1NQy9TRCBpbnRlcmZhY2Vz
KS4gU28gaXQgY291bGQgYmUgYSBnb29kIHN0YXJ0aW5nIHBvaW50IGZvciB5b3VyIHBvcnRpbmcg
ZWZmb3J0Lg0KDQpBbm90aGVyIGhpbnQgbWF5IGJlIHRoYXQgU0RJTyBpcyByZWxhdGVkIHRvIE1N
Qy9TRC4gU28gaW4gYm9hcmQtem9vbS1wZXJpcGhlcmFscy5jIHlvdSB3aWxsIGZpbmQgbW9yZSB3
aGVuIHNlYXJjaGluZyBmb3IgJ21tYycuIGVnOg0KDQpzdGF0aWMgc3RydWN0IG9tYXAyX2hzbW1j
X2luZm8gbW1jW10gX19pbml0ZGF0YSA9IHsNCiAgICAgICAgICAgOg0KICAgICAgICAgICA6DQog
ICAgICAgIHsNCiAgICAgICAgICAgICAgICAubmFtZSAgICAgICAgICAgPSAid2wxMjcxIiwNCiAg
ICAgICAgICAgICAgICAubW1jICAgICAgICAgICAgPSAzLA0KICAgICAgICAgICAgICAgIC5jYXBz
ICAgICAgICAgICA9IE1NQ19DQVBfNF9CSVRfREFUQSwNCiAgICAgICAgICAgICAgICAuZ3Bpb193
cCAgICAgICAgPSAtRUlOVkFMLA0KICAgICAgICAgICAgICAgIC5ncGlvX2NkICAgICAgICA9IC1F
SU5WQUwsDQogICAgICAgICAgICAgICAgLm5vbnJlbW92YWJsZSAgID0gdHJ1ZSwNCiAgICAgICAg
fSwNCiAgICAgICAge30gICAgICAvKiBUZXJtaW5hdG9yICovDQp9Ow0KDQpHci4gQXZTDQpfX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fDQpGcm9tOiBsaW51eC13aXJlbGVz
cy1vd25lckB2Z2VyLmtlcm5lbC5vcmcgW2xpbnV4LXdpcmVsZXNzLW93bmVyQHZnZXIua2VybmVs
Lm9yZ10gT24gQmVoYWxmIE9mIEJyemV6b3dza2ksIEthcmVuIFtLYXJlbi5Ccnplem93c2tpQHBk
dC5jb21dDQpTZW50OiBNb25kYXksIERlY2VtYmVyIDIwLCAyMDEwIDY6MTIgUE0NClRvOiBsaW51
eC13aXJlbGVzc0B2Z2VyLmtlcm5lbC5vcmcNCkNjOiBCcnplem93c2tpLCBLYXJlbg0KU3ViamVj
dDogV0wxMjcxIGNoaXANCg0KSGkhDQpMdWNhIHN1Z2dlc3RlZCB0aGF0IEkgc2VuZCB0aGlzIHRv
IGFsbCBvZiB5b3UhDQoNCkkgbG9va2VkIGF0IGFyY2gvYXJtL21hY2gtb21hcDIvYm9hcmQtem9v
bS1wZXJpcGhlcmFscy5jIGZpbGUuLg0KSSBkaWRuJ3Qgc2VlIGFueXRoaW5nIHNwZWNpZmljIHRv
IFNESU8uLg0KDQpJIHdhcyBsb29raW5nIGF0IGxpbnV4LTIuNi4zNi4yLi4NCklzIHRoaXMgdGhl
IGNvcnJlY3QgdmVyc2lvbiB0byBsb29rIGF0Pw0KDQpQbGVhc2UgcmVhZCBiZWxvdyBmb3Igb3Jp
Z2luYWwgcXVlc3Rpb24uDQpUSEFOSyB5b3UgZXZlcnlvbmUgZm9yIEFOWSBoZWxwIHlvdSBjYW4g
Z2l2ZSBtZSENCkthcmVuDQoNCi0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0tDQpIaSBLYXJlbiwN
Cg0KDQo+IEhpIEx1Y2lhbm8sDQo+DQo+IEnigJltIHZlcnkgc29ycnkgdG8gZW1haWwgIHlvdSBk
aXJlY3RseS4NCg0KTm8gcHJvYmxlbS4gIEJ1dCBpdCBpcyBhbHdheXMgYmV0dGVyIHRvIGVtYWls
IHRoZSBsaW51eC13aXJlbGVzc0B2Z2VyLmtlcm5lbC5vcmcgbWFpbGluZyBsaXN0IHRvbywgYmVj
YXVzZSB0aGVyZSBhcmUgbG90cyBvZiBvdGhlciBwZW9wbGUgd2hvIGNhbiBoZWxwIHlvdSB0aGVy
ZS4NCg0KDQo+IEkgYW0gdmVyeSBuZXcgdG8gcG9ydGluZyBkcml2ZXJz4oCmDQo+DQo+IEkgaGF2
ZSB0byBpbnRlZ3JhdGUvcG9ydCBhIFdMMTI3MSBjaGlwIChJIHRoaW5rIGl04oCZcyBnb2luZyB0
byBiZSB0aGUNCj4gb25lDQo+DQo+IG1hbnVmYWN0dXJlZCBieSBNdXJhdGEpLg0KPg0KPiBJIHNl
ZSB0aGF0IHlvdSBtYWludGFpbiB0aGUgd2wxMnh4IGRyaXZlcnMgb24gbGludXgtd2lyZWxlc3MN
Cj4ga2VybmVsLm9yZy4NCj4NCj4NCj4NCj4gVGhlIHByb2Nlc3NvciBpcyBpTVgyMzMsIE9TIGlz
IEFuZHJvaWQgKExpbnV4KS4NCj4NCj4NCj4NCj4gSSB3b3VsZCBiZSB2ZXJ5IGFwcHJlY2lhdGl2
ZSBpZiB5b3UgY291bGQgZ2l2ZSBtZSBzb21lDQo+IGFkdmljZS9pbnN0cnVjdGlvbnMvZG9jdW1l
bnRhdGlvbg0KPg0KPiB0aGF0IHdvdWxkIGhlbHAgbWUgb24gdW5kZXJzdGFuZC9zdGFydC9jb21w
bGV0ZSB0aGlzIHRhc2suDQoNCldlbGwsIHRoZSB3bDEyeHggZHJpdmVyIHNob3VsZCB3b3JrIG1v
cmUgb3IgbGVzcyBvdXQtb2YtdGhlLWJveC4gIFRoZSBvbmx5IHRoaW5nIHlvdSBuZWVkIHRvIGRv
IGlzIHRvIHNldCB1cCB0aGUgU0RJTyBjb25uZWN0aW9uIHRvIHlvdXIgY2FyZCAoYXNzdW1pbmcg
dGhhdCB5b3UncmUgdXNpbmcgdGhlIFNESU8gYnVzIHRvIGNvbm5lY3QgaXQpLiAgSSdtIG5vdCBm
YW1pbGlhciB3aXRoIHRoZSBpTVgyMzMsIGJ1dCB3aXRoIE9NQVAsIGl0J3MgcHJldHR5IHNpbXBs
ZS4gIFlvdSBjYW4gc2VlIHRoZSBhcmNoL2FybS9tYWNoLW9tYXAyL2JvYXJkLXpvb20tcGVyaXBo
ZXJhbHMuYyBmaWxlIGluIHRoZSBMaW51eCBrZXJuZWwgZm9yIGFuIGV4YW1wbGUgb24gaG93IHRv
IHNldCBpdCB1cCBmb3IgdGhlIFpvb20gYm9hcmQgKE9NQVAtYmFzZWQpLg0KDQoNCi0tDQpDaGVl
cnMsDQpMdWNhLg0KDQoNCk4gICAgIHIgIHkgICBiIFggIMendiBeICneunsubiArICAgIHsgICre
lSAsIHtheSAdyofamSAsaiAgIGYgICBoICAgeiAeIHcgICAgICAgajordiAgIHcgaiBtICAgICAg
ICAgelorICAgICDdomoiICAhIGkgEmYgIMecICAgbyAgeSAPICkNCg==
^ permalink raw reply
* Compat-wireless release for 2010-12-20 is baked
From: Compat-wireless cronjob account @ 2010-12-20 20:07 UTC (permalink / raw)
To: linux-wireless
>From git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/compat-wireless-2.6
dd8c5e7..cf835d5 master -> origin/master
* [new tag] compat-wireless-2010-12-20 -> compat-wireless-2010-12-20
>From git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next
c3a9014..5d491fa history -> origin/history
+ e935fc8...8ee7e11 master -> origin/master (forced update)
b3444d1..55ec86f stable -> origin/stable
* [new tag] next-20101220 -> next-20101220
compat-wireless code metrics
777014 - Total upstream lines of code being pulled
2223 - backport code changes
1946 - backport code additions
277 - backport code deletions
6669 - backport from compat module
8892 - total backport code
1.1444 - % of code consists of backport work
1532 - Crap changes not yet posted
1489 - Crap additions not yet posted
43 - Crap deletions not yet posted
0.1972 - % of crap code
Base tree: linux-next.git
Base tree version: next-20101220
compat-wireless release: compat-wireless-2010-12-20-pc
^ permalink raw reply
* [PATCH] rtl818x: move rtl8180 and rtl8187 to separate subdirectories
From: John W. Linville @ 2010-12-20 20:22 UTC (permalink / raw)
To: linux-wireless
Cc: Herton Ronaldo Krzesinski, Hin-Tak Leung, Larry Finger,
John W. Linville
These drivers share one header file, but nothing else. Worse, both
drivers use the rtl8225 part with different register settings. The
results has been some ugly naming -- let's simplify that.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
drivers/net/wireless/rtl818x/Makefile | 9 ++-------
drivers/net/wireless/rtl818x/rtl8180/Makefile | 5 +++++
.../rtl818x/{rtl8180_dev.c => rtl8180/dev.c} | 8 ++++----
.../{rtl8180_grf5101.c => rtl8180/grf5101.c} | 2 +-
.../{rtl8180_grf5101.h => rtl8180/grf5101.h} | 0
.../{rtl8180_max2820.c => rtl8180/max2820.c} | 2 +-
.../{rtl8180_max2820.h => rtl8180/max2820.h} | 0
.../net/wireless/rtl818x/{ => rtl8180}/rtl8180.h | 0
.../{rtl8180_rtl8225.c => rtl8180/rtl8225.c} | 2 +-
.../{rtl8180_rtl8225.h => rtl8180/rtl8225.h} | 0
.../rtl818x/{rtl8180_sa2400.c => rtl8180/sa2400.c} | 2 +-
.../rtl818x/{rtl8180_sa2400.h => rtl8180/sa2400.h} | 0
drivers/net/wireless/rtl818x/rtl8187/Makefile | 5 +++++
.../rtl818x/{rtl8187_dev.c => rtl8187/dev.c} | 6 +++---
.../rtl818x/{rtl8187_leds.c => rtl8187/leds.c} | 2 +-
.../rtl818x/{rtl8187_leds.h => rtl8187/leds.h} | 0
.../rtl818x/{rtl8187_rfkill.c => rtl8187/rfkill.c} | 2 +-
.../rtl818x/{rtl8187_rfkill.h => rtl8187/rfkill.h} | 0
.../net/wireless/rtl818x/{ => rtl8187}/rtl8187.h | 2 +-
.../{rtl8187_rtl8225.c => rtl8187/rtl8225.c} | 2 +-
.../{rtl8187_rtl8225.h => rtl8187/rtl8225.h} | 0
21 files changed, 27 insertions(+), 22 deletions(-)
create mode 100644 drivers/net/wireless/rtl818x/rtl8180/Makefile
rename drivers/net/wireless/rtl818x/{rtl8180_dev.c => rtl8180/dev.c} (99%)
rename drivers/net/wireless/rtl818x/{rtl8180_grf5101.c => rtl8180/grf5101.c} (99%)
rename drivers/net/wireless/rtl818x/{rtl8180_grf5101.h => rtl8180/grf5101.h} (100%)
rename drivers/net/wireless/rtl818x/{rtl8180_max2820.c => rtl8180/max2820.c} (99%)
rename drivers/net/wireless/rtl818x/{rtl8180_max2820.h => rtl8180/max2820.h} (100%)
rename drivers/net/wireless/rtl818x/{ => rtl8180}/rtl8180.h (100%)
rename drivers/net/wireless/rtl818x/{rtl8180_rtl8225.c => rtl8180/rtl8225.c} (99%)
rename drivers/net/wireless/rtl818x/{rtl8180_rtl8225.h => rtl8180/rtl8225.h} (100%)
rename drivers/net/wireless/rtl818x/{rtl8180_sa2400.c => rtl8180/sa2400.c} (99%)
rename drivers/net/wireless/rtl818x/{rtl8180_sa2400.h => rtl8180/sa2400.h} (100%)
create mode 100644 drivers/net/wireless/rtl818x/rtl8187/Makefile
rename drivers/net/wireless/rtl818x/{rtl8187_dev.c => rtl8187/dev.c} (99%)
rename drivers/net/wireless/rtl818x/{rtl8187_leds.c => rtl8187/leds.c} (99%)
rename drivers/net/wireless/rtl818x/{rtl8187_leds.h => rtl8187/leds.h} (100%)
rename drivers/net/wireless/rtl818x/{rtl8187_rfkill.c => rtl8187/rfkill.c} (98%)
rename drivers/net/wireless/rtl818x/{rtl8187_rfkill.h => rtl8187/rfkill.h} (100%)
rename drivers/net/wireless/rtl818x/{ => rtl8187}/rtl8187.h (99%)
rename drivers/net/wireless/rtl818x/{rtl8187_rtl8225.c => rtl8187/rtl8225.c} (99%)
rename drivers/net/wireless/rtl818x/{rtl8187_rtl8225.h => rtl8187/rtl8225.h} (100%)
diff --git a/drivers/net/wireless/rtl818x/Makefile b/drivers/net/wireless/rtl818x/Makefile
index 93cbfbe..9975690 100644
--- a/drivers/net/wireless/rtl818x/Makefile
+++ b/drivers/net/wireless/rtl818x/Makefile
@@ -1,7 +1,2 @@
-rtl8180-objs := rtl8180_dev.o rtl8180_rtl8225.o rtl8180_sa2400.o rtl8180_max2820.o rtl8180_grf5101.o
-rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o rtl8187_leds.o rtl8187_rfkill.o
-
-obj-$(CONFIG_RTL8180) += rtl8180.o
-obj-$(CONFIG_RTL8187) += rtl8187.o
-
-
+obj-$(CONFIG_RTL8180) += rtl8180/
+obj-$(CONFIG_RTL8187) += rtl8187/
diff --git a/drivers/net/wireless/rtl818x/rtl8180/Makefile b/drivers/net/wireless/rtl818x/rtl8180/Makefile
new file mode 100644
index 0000000..cb4fb85
--- /dev/null
+++ b/drivers/net/wireless/rtl818x/rtl8180/Makefile
@@ -0,0 +1,5 @@
+rtl8180-objs := dev.o rtl8225.o sa2400.o max2820.o grf5101.o
+
+obj-$(CONFIG_RTL8180) += rtl8180.o
+
+ccflags-y += -Idrivers/net/wireless/rtl818x
diff --git a/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c
similarity index 99%
rename from drivers/net/wireless/rtl818x/rtl8180_dev.c
rename to drivers/net/wireless/rtl818x/rtl8180/dev.c
index 707c688..5851cbc 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c
@@ -24,10 +24,10 @@
#include <net/mac80211.h>
#include "rtl8180.h"
-#include "rtl8180_rtl8225.h"
-#include "rtl8180_sa2400.h"
-#include "rtl8180_max2820.h"
-#include "rtl8180_grf5101.h"
+#include "rtl8225.h"
+#include "sa2400.h"
+#include "max2820.h"
+#include "grf5101.h"
MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>");
MODULE_AUTHOR("Andrea Merello <andreamrl@tiscali.it>");
diff --git a/drivers/net/wireless/rtl818x/rtl8180_grf5101.c b/drivers/net/wireless/rtl818x/rtl8180/grf5101.c
similarity index 99%
rename from drivers/net/wireless/rtl818x/rtl8180_grf5101.c
rename to drivers/net/wireless/rtl818x/rtl8180/grf5101.c
index 5cab9df..5ee7589 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_grf5101.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/grf5101.c
@@ -25,7 +25,7 @@
#include <net/mac80211.h>
#include "rtl8180.h"
-#include "rtl8180_grf5101.h"
+#include "grf5101.h"
static const int grf5101_encode[] = {
0x0, 0x8, 0x4, 0xC,
diff --git a/drivers/net/wireless/rtl818x/rtl8180_grf5101.h b/drivers/net/wireless/rtl818x/rtl8180/grf5101.h
similarity index 100%
rename from drivers/net/wireless/rtl818x/rtl8180_grf5101.h
rename to drivers/net/wireless/rtl818x/rtl8180/grf5101.h
diff --git a/drivers/net/wireless/rtl818x/rtl8180_max2820.c b/drivers/net/wireless/rtl818x/rtl8180/max2820.c
similarity index 99%
rename from drivers/net/wireless/rtl818x/rtl8180_max2820.c
rename to drivers/net/wireless/rtl818x/rtl8180/max2820.c
index 16c4655..667b336 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_max2820.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/max2820.c
@@ -24,7 +24,7 @@
#include <net/mac80211.h>
#include "rtl8180.h"
-#include "rtl8180_max2820.h"
+#include "max2820.h"
static const u32 max2820_chan[] = {
12, /* CH 1 */
diff --git a/drivers/net/wireless/rtl818x/rtl8180_max2820.h b/drivers/net/wireless/rtl818x/rtl8180/max2820.h
similarity index 100%
rename from drivers/net/wireless/rtl818x/rtl8180_max2820.h
rename to drivers/net/wireless/rtl818x/rtl8180/max2820.h
diff --git a/drivers/net/wireless/rtl818x/rtl8180.h b/drivers/net/wireless/rtl818x/rtl8180/rtl8180.h
similarity index 100%
rename from drivers/net/wireless/rtl818x/rtl8180.h
rename to drivers/net/wireless/rtl818x/rtl8180/rtl8180.h
diff --git a/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c b/drivers/net/wireless/rtl818x/rtl8180/rtl8225.c
similarity index 99%
rename from drivers/net/wireless/rtl818x/rtl8180_rtl8225.c
rename to drivers/net/wireless/rtl818x/rtl8180/rtl8225.c
index 69e4d47..7c4574b 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/rtl8225.c
@@ -21,7 +21,7 @@
#include <net/mac80211.h>
#include "rtl8180.h"
-#include "rtl8180_rtl8225.h"
+#include "rtl8225.h"
static void rtl8225_write(struct ieee80211_hw *dev, u8 addr, u16 data)
{
diff --git a/drivers/net/wireless/rtl818x/rtl8180_rtl8225.h b/drivers/net/wireless/rtl818x/rtl8180/rtl8225.h
similarity index 100%
rename from drivers/net/wireless/rtl818x/rtl8180_rtl8225.h
rename to drivers/net/wireless/rtl818x/rtl8180/rtl8225.h
diff --git a/drivers/net/wireless/rtl818x/rtl8180_sa2400.c b/drivers/net/wireless/rtl818x/rtl8180/sa2400.c
similarity index 99%
rename from drivers/net/wireless/rtl818x/rtl8180_sa2400.c
rename to drivers/net/wireless/rtl818x/rtl8180/sa2400.c
index d064fcc..44771a62 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_sa2400.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/sa2400.c
@@ -25,7 +25,7 @@
#include <net/mac80211.h>
#include "rtl8180.h"
-#include "rtl8180_sa2400.h"
+#include "sa2400.h"
static const u32 sa2400_chan[] = {
0x00096c, /* ch1 */
diff --git a/drivers/net/wireless/rtl818x/rtl8180_sa2400.h b/drivers/net/wireless/rtl818x/rtl8180/sa2400.h
similarity index 100%
rename from drivers/net/wireless/rtl818x/rtl8180_sa2400.h
rename to drivers/net/wireless/rtl818x/rtl8180/sa2400.h
diff --git a/drivers/net/wireless/rtl818x/rtl8187/Makefile b/drivers/net/wireless/rtl818x/rtl8187/Makefile
new file mode 100644
index 0000000..7b62992
--- /dev/null
+++ b/drivers/net/wireless/rtl818x/rtl8187/Makefile
@@ -0,0 +1,5 @@
+rtl8187-objs := dev.o rtl8225.o leds.o rfkill.o
+
+obj-$(CONFIG_RTL8187) += rtl8187.o
+
+ccflags-y += -Idrivers/net/wireless/rtl818x
diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187/dev.c
similarity index 99%
rename from drivers/net/wireless/rtl818x/rtl8187_dev.c
rename to drivers/net/wireless/rtl818x/rtl8187/dev.c
index eeee244..6b82cac 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
@@ -29,11 +29,11 @@
#include <net/mac80211.h>
#include "rtl8187.h"
-#include "rtl8187_rtl8225.h"
+#include "rtl8225.h"
#ifdef CONFIG_RTL8187_LEDS
-#include "rtl8187_leds.h"
+#include "leds.h"
#endif
-#include "rtl8187_rfkill.h"
+#include "rfkill.h"
MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>");
MODULE_AUTHOR("Andrea Merello <andreamrl@tiscali.it>");
diff --git a/drivers/net/wireless/rtl818x/rtl8187_leds.c b/drivers/net/wireless/rtl818x/rtl8187/leds.c
similarity index 99%
rename from drivers/net/wireless/rtl818x/rtl8187_leds.c
rename to drivers/net/wireless/rtl818x/rtl8187/leds.c
index 4637337..2e0de2f 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_leds.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/leds.c
@@ -20,7 +20,7 @@
#include <linux/eeprom_93cx6.h>
#include "rtl8187.h"
-#include "rtl8187_leds.h"
+#include "leds.h"
static void led_turn_on(struct work_struct *work)
{
diff --git a/drivers/net/wireless/rtl818x/rtl8187_leds.h b/drivers/net/wireless/rtl818x/rtl8187/leds.h
similarity index 100%
rename from drivers/net/wireless/rtl818x/rtl8187_leds.h
rename to drivers/net/wireless/rtl818x/rtl8187/leds.h
diff --git a/drivers/net/wireless/rtl818x/rtl8187_rfkill.c b/drivers/net/wireless/rtl818x/rtl8187/rfkill.c
similarity index 98%
rename from drivers/net/wireless/rtl818x/rtl8187_rfkill.c
rename to drivers/net/wireless/rtl818x/rtl8187/rfkill.c
index 03555e1..3411671 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_rfkill.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/rfkill.c
@@ -18,7 +18,7 @@
#include <net/mac80211.h>
#include "rtl8187.h"
-#include "rtl8187_rfkill.h"
+#include "rfkill.h"
static bool rtl8187_is_radio_enabled(struct rtl8187_priv *priv)
{
diff --git a/drivers/net/wireless/rtl818x/rtl8187_rfkill.h b/drivers/net/wireless/rtl818x/rtl8187/rfkill.h
similarity index 100%
rename from drivers/net/wireless/rtl818x/rtl8187_rfkill.h
rename to drivers/net/wireless/rtl818x/rtl8187/rfkill.h
diff --git a/drivers/net/wireless/rtl818x/rtl8187.h b/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
similarity index 99%
rename from drivers/net/wireless/rtl818x/rtl8187.h
rename to drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
index 9887816..0d7b142 100644
--- a/drivers/net/wireless/rtl818x/rtl8187.h
+++ b/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
@@ -16,7 +16,7 @@
#define RTL8187_H
#include "rtl818x.h"
-#include "rtl8187_leds.h"
+#include "leds.h"
#define RTL8187_EEPROM_TXPWR_BASE 0x05
#define RTL8187_EEPROM_MAC_ADDR 0x07
diff --git a/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c b/drivers/net/wireless/rtl818x/rtl8187/rtl8225.c
similarity index 99%
rename from drivers/net/wireless/rtl818x/rtl8187_rtl8225.c
rename to drivers/net/wireless/rtl818x/rtl8187/rtl8225.c
index 5c6666f..908903f 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/rtl8225.c
@@ -21,7 +21,7 @@
#include <net/mac80211.h>
#include "rtl8187.h"
-#include "rtl8187_rtl8225.h"
+#include "rtl8225.h"
static void rtl8225_write_bitbang(struct ieee80211_hw *dev, u8 addr, u16 data)
{
diff --git a/drivers/net/wireless/rtl818x/rtl8187_rtl8225.h b/drivers/net/wireless/rtl818x/rtl8187/rtl8225.h
similarity index 100%
rename from drivers/net/wireless/rtl818x/rtl8187_rtl8225.h
rename to drivers/net/wireless/rtl818x/rtl8187/rtl8225.h
--
1.7.3.3
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox