parent
81e363bf50
commit
fff8912b59
|
|
@ -1,41 +1,27 @@
|
||||||
--- a/nl80211.h
|
--- a/nl80211.h
|
||||||
+++ b/nl80211.h
|
+++ b/nl80211.h
|
||||||
@@ -2373,6 +2373,9 @@ enum nl80211_commands {
|
@@ -2527,6 +2527,13 @@ enum nl80211_commands {
|
||||||
* the allowed channel bandwidth configurations. (u8 attribute)
|
* override mask. Used with NL80211_ATTR_S1G_CAPABILITY in
|
||||||
* Defined by IEEE P802.11ay/D4.0 section 9.4.2.251, Table 13.
|
* NL80211_CMD_ASSOCIATE or NL80211_CMD_CONNECT.
|
||||||
*
|
*
|
||||||
|
+ * @NL80211_ATTR_RECONNECT_REQUESTED: flag attribute, used with deauth and
|
||||||
|
+ * disassoc events to indicate that an immediate reconnect to the AP
|
||||||
|
+ * is desired.
|
||||||
|
+ *
|
||||||
+ * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
|
+ * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
|
||||||
+ * transmit power to stay within regulatory limits. u32, dBi.
|
+ * transmit power to stay within regulatory limits. u32, dBi.
|
||||||
+ *
|
+ *
|
||||||
* @NUM_NL80211_ATTR: total number of nl80211_attrs available
|
* @NUM_NL80211_ATTR: total number of nl80211_attrs available
|
||||||
* @NL80211_ATTR_MAX: highest attribute number currently defined
|
* @NL80211_ATTR_MAX: highest attribute number currently defined
|
||||||
* @__NL80211_ATTR_AFTER_LAST: internal use
|
* @__NL80211_ATTR_AFTER_LAST: internal use
|
||||||
@@ -2835,6 +2838,8 @@ enum nl80211_attrs {
|
@@ -3016,6 +3023,10 @@ enum nl80211_attrs {
|
||||||
NL80211_ATTR_WIPHY_EDMG_CHANNELS,
|
NL80211_ATTR_S1G_CAPABILITY,
|
||||||
NL80211_ATTR_WIPHY_EDMG_BW_CONFIG,
|
NL80211_ATTR_S1G_CAPABILITY_MASK,
|
||||||
|
|
||||||
|
+ NL80211_ATTR_RECONNECT_REQUESTED,
|
||||||
|
+
|
||||||
+ NL80211_ATTR_WIPHY_ANTENNA_GAIN,
|
+ NL80211_ATTR_WIPHY_ANTENNA_GAIN,
|
||||||
+
|
+
|
||||||
/* add attributes here, update the policy in nl80211.c */
|
/* add attributes here, update the policy in nl80211.c */
|
||||||
|
|
||||||
__NL80211_ATTR_AFTER_LAST,
|
__NL80211_ATTR_AFTER_LAST,
|
||||||
@@ -5484,6 +5489,10 @@ enum nl80211_feature_flags {
|
|
||||||
* @NL80211_EXT_FEATURE_SAE_OFFLOAD: Device wants to do SAE authentication in
|
|
||||||
* station mode (SAE password is passed as part of the connect command).
|
|
||||||
*
|
|
||||||
+ * @NL80211_EXT_FEATURE_AQL: The driver supports the Airtime Queue Limit (AQL)
|
|
||||||
+ * feature, which prevents bufferbloat by using the expected transmission
|
|
||||||
+ * time to limit the amount of data buffered in the hardware.
|
|
||||||
+ *
|
|
||||||
* @NUM_NL80211_EXT_FEATURES: number of extended features.
|
|
||||||
* @MAX_NL80211_EXT_FEATURES: highest extended feature index.
|
|
||||||
*/
|
|
||||||
@@ -5529,6 +5538,8 @@ enum nl80211_ext_feature_index {
|
|
||||||
NL80211_EXT_FEATURE_EXT_KEY_ID,
|
|
||||||
NL80211_EXT_FEATURE_STA_TX_PWR,
|
|
||||||
NL80211_EXT_FEATURE_SAE_OFFLOAD,
|
|
||||||
+ NL80211_EXT_FEATURE_VLAN_OFFLOAD,
|
|
||||||
+ NL80211_EXT_FEATURE_AQL,
|
|
||||||
|
|
||||||
/* add new features before the definition below */
|
|
||||||
NUM_NL80211_EXT_FEATURES,
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/event.c
|
--- a/event.c
|
||||||
+++ b/event.c
|
+++ b/event.c
|
||||||
@@ -699,6 +699,7 @@ static int print_event(struct nl_msg *ms
|
@@ -944,6 +944,7 @@ static int print_event(struct nl_msg *ms
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (gnlh->cmd) {
|
switch (gnlh->cmd) {
|
||||||
|
|
@ -8,15 +8,15 @@
|
||||||
case NL80211_CMD_NEW_WIPHY:
|
case NL80211_CMD_NEW_WIPHY:
|
||||||
printf("renamed to %s\n", nla_get_string(tb[NL80211_ATTR_WIPHY_NAME]));
|
printf("renamed to %s\n", nla_get_string(tb[NL80211_ATTR_WIPHY_NAME]));
|
||||||
break;
|
break;
|
||||||
@@ -734,6 +735,7 @@ static int print_event(struct nl_msg *ms
|
@@ -979,6 +980,7 @@ static int print_event(struct nl_msg *ms
|
||||||
case NL80211_CMD_SCHED_SCAN_RESULTS:
|
case NL80211_CMD_SCHED_SCAN_RESULTS:
|
||||||
printf("got scheduled scan results\n");
|
printf("got scheduled scan results\n");
|
||||||
break;
|
break;
|
||||||
+#endif
|
+#endif
|
||||||
|
case NL80211_CMD_WIPHY_REG_CHANGE:
|
||||||
case NL80211_CMD_REG_CHANGE:
|
case NL80211_CMD_REG_CHANGE:
|
||||||
printf("regulatory domain change: ");
|
if (gnlh->cmd == NL80211_CMD_WIPHY_REG_CHANGE)
|
||||||
|
@@ -1061,6 +1063,7 @@ static int print_event(struct nl_msg *ms
|
||||||
@@ -812,6 +814,7 @@ static int print_event(struct nl_msg *ms
|
|
||||||
mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC]));
|
mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC]));
|
||||||
printf("del station %s\n", macbuf);
|
printf("del station %s\n", macbuf);
|
||||||
break;
|
break;
|
||||||
|
|
@ -24,10 +24,10 @@
|
||||||
case NL80211_CMD_JOIN_IBSS:
|
case NL80211_CMD_JOIN_IBSS:
|
||||||
mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC]));
|
mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC]));
|
||||||
printf("IBSS %s joined\n", macbuf);
|
printf("IBSS %s joined\n", macbuf);
|
||||||
@@ -989,9 +992,9 @@ static int print_event(struct nl_msg *ms
|
@@ -1254,9 +1257,9 @@ static int print_event(struct nl_msg *ms
|
||||||
parse_nan_match(tb);
|
case NL80211_CMD_CH_SWITCH_NOTIFY:
|
||||||
|
parse_ch_switch_notify(tb, gnlh->cmd);
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
+#endif
|
+#endif
|
||||||
default:
|
default:
|
||||||
- printf("unknown event %d (%s)\n",
|
- printf("unknown event %d (%s)\n",
|
||||||
|
|
@ -38,23 +38,7 @@
|
||||||
|
|
||||||
--- a/info.c
|
--- a/info.c
|
||||||
+++ b/info.c
|
+++ b/info.c
|
||||||
@@ -164,6 +164,7 @@ static int print_phy_handler(struct nl_m
|
@@ -216,6 +216,7 @@ next:
|
||||||
tb_band[NL80211_BAND_ATTR_VHT_MCS_SET])
|
|
||||||
print_vht_info(nla_get_u32(tb_band[NL80211_BAND_ATTR_VHT_CAPA]),
|
|
||||||
nla_data(tb_band[NL80211_BAND_ATTR_VHT_MCS_SET]));
|
|
||||||
+#ifdef IW_FULL
|
|
||||||
if (tb_band[NL80211_BAND_ATTR_IFTYPE_DATA]) {
|
|
||||||
struct nlattr *nl_iftype;
|
|
||||||
int rem_band;
|
|
||||||
@@ -171,6 +172,7 @@ static int print_phy_handler(struct nl_m
|
|
||||||
nla_for_each_nested(nl_iftype, tb_band[NL80211_BAND_ATTR_IFTYPE_DATA], rem_band)
|
|
||||||
print_he_info(nl_iftype);
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
if (tb_band[NL80211_BAND_ATTR_FREQS]) {
|
|
||||||
if (!band_had_freq) {
|
|
||||||
printf("\t\tFrequencies:\n");
|
|
||||||
@@ -213,6 +215,7 @@ next:
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -62,7 +46,7 @@
|
||||||
if (tb_band[NL80211_BAND_ATTR_RATES]) {
|
if (tb_band[NL80211_BAND_ATTR_RATES]) {
|
||||||
printf("\t\tBitrates (non-HT):\n");
|
printf("\t\tBitrates (non-HT):\n");
|
||||||
nla_for_each_nested(nl_rate, tb_band[NL80211_BAND_ATTR_RATES], rem_rate) {
|
nla_for_each_nested(nl_rate, tb_band[NL80211_BAND_ATTR_RATES], rem_rate) {
|
||||||
@@ -229,6 +232,7 @@ next:
|
@@ -232,6 +233,7 @@ next:
|
||||||
printf("\n");
|
printf("\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -70,7 +54,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -294,6 +298,7 @@ next:
|
@@ -297,6 +299,7 @@ next:
|
||||||
printf("\tCoverage class: %d (up to %dm)\n", coverage, 450 * coverage);
|
printf("\tCoverage class: %d (up to %dm)\n", coverage, 450 * coverage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -78,7 +62,7 @@
|
||||||
if (tb_msg[NL80211_ATTR_CIPHER_SUITES]) {
|
if (tb_msg[NL80211_ATTR_CIPHER_SUITES]) {
|
||||||
int num = nla_len(tb_msg[NL80211_ATTR_CIPHER_SUITES]) / sizeof(__u32);
|
int num = nla_len(tb_msg[NL80211_ATTR_CIPHER_SUITES]) / sizeof(__u32);
|
||||||
int i;
|
int i;
|
||||||
@@ -305,6 +310,7 @@ next:
|
@@ -308,6 +311,7 @@ next:
|
||||||
cipher_name(ciphers[i]));
|
cipher_name(ciphers[i]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -86,7 +70,7 @@
|
||||||
|
|
||||||
if (tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX] &&
|
if (tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX] &&
|
||||||
tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX])
|
tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX])
|
||||||
@@ -324,11 +330,13 @@ next:
|
@@ -327,11 +331,13 @@ next:
|
||||||
printf("\t\t * %s\n", iftype_name(nla_type(nl_mode)));
|
printf("\t\t * %s\n", iftype_name(nla_type(nl_mode)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -100,7 +84,7 @@
|
||||||
|
|
||||||
if (tb_msg[NL80211_ATTR_INTERFACE_COMBINATIONS]) {
|
if (tb_msg[NL80211_ATTR_INTERFACE_COMBINATIONS]) {
|
||||||
struct nlattr *nl_combi;
|
struct nlattr *nl_combi;
|
||||||
@@ -425,6 +433,7 @@ broken_combination:
|
@@ -428,6 +434,7 @@ broken_combination:
|
||||||
printf("\tinterface combinations are not supported\n");
|
printf("\tinterface combinations are not supported\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -108,7 +92,7 @@
|
||||||
if (tb_msg[NL80211_ATTR_SUPPORTED_COMMANDS]) {
|
if (tb_msg[NL80211_ATTR_SUPPORTED_COMMANDS]) {
|
||||||
printf("\tSupported commands:\n");
|
printf("\tSupported commands:\n");
|
||||||
nla_for_each_nested(nl_cmd, tb_msg[NL80211_ATTR_SUPPORTED_COMMANDS], rem_cmd)
|
nla_for_each_nested(nl_cmd, tb_msg[NL80211_ATTR_SUPPORTED_COMMANDS], rem_cmd)
|
||||||
@@ -522,6 +531,7 @@ broken_combination:
|
@@ -525,6 +532,7 @@ broken_combination:
|
||||||
printf("\t\t * wake up on TCP connection\n");
|
printf("\t\t * wake up on TCP connection\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -116,7 +100,7 @@
|
||||||
|
|
||||||
if (tb_msg[NL80211_ATTR_ROAM_SUPPORT])
|
if (tb_msg[NL80211_ATTR_ROAM_SUPPORT])
|
||||||
printf("\tDevice supports roaming.\n");
|
printf("\tDevice supports roaming.\n");
|
||||||
@@ -560,6 +570,7 @@ broken_combination:
|
@@ -563,6 +571,7 @@ broken_combination:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -124,7 +108,7 @@
|
||||||
if (tb_msg[NL80211_ATTR_FEATURE_FLAGS]) {
|
if (tb_msg[NL80211_ATTR_FEATURE_FLAGS]) {
|
||||||
unsigned int features = nla_get_u32(tb_msg[NL80211_ATTR_FEATURE_FLAGS]);
|
unsigned int features = nla_get_u32(tb_msg[NL80211_ATTR_FEATURE_FLAGS]);
|
||||||
|
|
||||||
@@ -624,6 +635,7 @@ broken_combination:
|
@@ -627,6 +636,7 @@ broken_combination:
|
||||||
if (features & NL80211_FEATURE_ND_RANDOM_MAC_ADDR)
|
if (features & NL80211_FEATURE_ND_RANDOM_MAC_ADDR)
|
||||||
printf("\tDevice supports randomizing MAC-addr in net-detect scans.\n");
|
printf("\tDevice supports randomizing MAC-addr in net-detect scans.\n");
|
||||||
}
|
}
|
||||||
|
|
@ -132,7 +116,7 @@
|
||||||
|
|
||||||
if (tb_msg[NL80211_ATTR_TDLS_SUPPORT])
|
if (tb_msg[NL80211_ATTR_TDLS_SUPPORT])
|
||||||
printf("\tDevice supports T-DLS.\n");
|
printf("\tDevice supports T-DLS.\n");
|
||||||
@@ -732,6 +744,7 @@ TOPLEVEL(list, NULL, NL80211_CMD_GET_WIP
|
@@ -762,6 +772,7 @@ TOPLEVEL(list, NULL, NL80211_CMD_GET_WIP
|
||||||
"List all wireless devices and their capabilities.");
|
"List all wireless devices and their capabilities.");
|
||||||
TOPLEVEL(phy, NULL, NL80211_CMD_GET_WIPHY, NLM_F_DUMP, CIB_NONE, handle_info, NULL);
|
TOPLEVEL(phy, NULL, NL80211_CMD_GET_WIPHY, NLM_F_DUMP, CIB_NONE, handle_info, NULL);
|
||||||
|
|
||||||
|
|
@ -140,7 +124,7 @@
|
||||||
static int handle_commands(struct nl80211_state *state, struct nl_msg *msg,
|
static int handle_commands(struct nl80211_state *state, struct nl_msg *msg,
|
||||||
int argc, char **argv, enum id_input id)
|
int argc, char **argv, enum id_input id)
|
||||||
{
|
{
|
||||||
@@ -743,6 +756,7 @@ static int handle_commands(struct nl8021
|
@@ -773,6 +784,7 @@ static int handle_commands(struct nl8021
|
||||||
}
|
}
|
||||||
TOPLEVEL(commands, NULL, NL80211_CMD_GET_WIPHY, 0, CIB_NONE, handle_commands,
|
TOPLEVEL(commands, NULL, NL80211_CMD_GET_WIPHY, 0, CIB_NONE, handle_commands,
|
||||||
"list all known commands and their decimal & hex value");
|
"list all known commands and their decimal & hex value");
|
||||||
|
|
@ -150,7 +134,7 @@
|
||||||
{
|
{
|
||||||
--- a/scan.c
|
--- a/scan.c
|
||||||
+++ b/scan.c
|
+++ b/scan.c
|
||||||
@@ -1195,6 +1195,9 @@ static void print_ht_op(const uint8_t ty
|
@@ -1297,6 +1297,9 @@ static void print_ht_op(const uint8_t ty
|
||||||
printf("\t\t * secondary channel offset: %s\n",
|
printf("\t\t * secondary channel offset: %s\n",
|
||||||
ht_secondary_offset[data[1] & 0x3]);
|
ht_secondary_offset[data[1] & 0x3]);
|
||||||
printf("\t\t * STA channel width: %s\n", sta_chan_width[(data[1] & 0x4)>>2]);
|
printf("\t\t * STA channel width: %s\n", sta_chan_width[(data[1] & 0x4)>>2]);
|
||||||
|
|
@ -160,7 +144,7 @@
|
||||||
printf("\t\t * RIFS: %d\n", (data[1] & 0x8)>>3);
|
printf("\t\t * RIFS: %d\n", (data[1] & 0x8)>>3);
|
||||||
printf("\t\t * HT protection: %s\n", protection[data[2] & 0x3]);
|
printf("\t\t * HT protection: %s\n", protection[data[2] & 0x3]);
|
||||||
printf("\t\t * non-GF present: %d\n", (data[2] & 0x4) >> 2);
|
printf("\t\t * non-GF present: %d\n", (data[2] & 0x4) >> 2);
|
||||||
@@ -1522,6 +1525,14 @@ static void print_ie(const struct ie_pri
|
@@ -1707,6 +1710,14 @@ static void print_ie(const struct ie_pri
|
||||||
|
|
||||||
static const struct ie_print ieprinters[] = {
|
static const struct ie_print ieprinters[] = {
|
||||||
[0] = { "SSID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), },
|
[0] = { "SSID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), },
|
||||||
|
|
@ -175,12 +159,15 @@
|
||||||
[1] = { "Supported rates", print_supprates, 0, 255, BIT(PRINT_SCAN), },
|
[1] = { "Supported rates", print_supprates, 0, 255, BIT(PRINT_SCAN), },
|
||||||
[3] = { "DS Parameter set", print_ds, 1, 1, BIT(PRINT_SCAN), },
|
[3] = { "DS Parameter set", print_ds, 1, 1, BIT(PRINT_SCAN), },
|
||||||
[5] = { "TIM", print_tim, 4, 255, BIT(PRINT_SCAN), },
|
[5] = { "TIM", print_tim, 4, 255, BIT(PRINT_SCAN), },
|
||||||
@@ -1531,21 +1542,15 @@ static const struct ie_print ieprinters[
|
@@ -1716,26 +1727,20 @@ static const struct ie_print ieprinters[
|
||||||
[32] = { "Power constraint", print_powerconstraint, 1, 1, BIT(PRINT_SCAN), },
|
[32] = { "Power constraint", print_powerconstraint, 1, 1, BIT(PRINT_SCAN), },
|
||||||
[35] = { "TPC report", print_tpcreport, 2, 2, BIT(PRINT_SCAN), },
|
[35] = { "TPC report", print_tpcreport, 2, 2, BIT(PRINT_SCAN), },
|
||||||
[42] = { "ERP", print_erp, 1, 255, BIT(PRINT_SCAN), },
|
[42] = { "ERP", print_erp, 1, 255, BIT(PRINT_SCAN), },
|
||||||
- [45] = { "HT capabilities", print_ht_capa, 26, 26, BIT(PRINT_SCAN), },
|
- [45] = { "HT capabilities", print_ht_capa, 26, 26, BIT(PRINT_SCAN), },
|
||||||
[47] = { "ERP D4.0", print_erp, 1, 255, BIT(PRINT_SCAN), },
|
[47] = { "ERP D4.0", print_erp, 1, 255, BIT(PRINT_SCAN), },
|
||||||
|
[51] = { "AP Channel Report", print_ap_channel_report, 1, 255, BIT(PRINT_SCAN), },
|
||||||
|
[59] = { "Supported operating classes", print_supp_op_classes, 1, 255, BIT(PRINT_SCAN), },
|
||||||
|
[66] = { "Measurement Pilot Transmission", print_measurement_pilot_tx, 1, 255, BIT(PRINT_SCAN), },
|
||||||
[74] = { "Overlapping BSS scan params", print_obss_scan_params, 14, 255, BIT(PRINT_SCAN), },
|
[74] = { "Overlapping BSS scan params", print_obss_scan_params, 14, 255, BIT(PRINT_SCAN), },
|
||||||
- [61] = { "HT operation", print_ht_op, 22, 22, BIT(PRINT_SCAN), },
|
- [61] = { "HT operation", print_ht_op, 22, 22, BIT(PRINT_SCAN), },
|
||||||
- [62] = { "Secondary Channel Offset", print_secchan_offs, 1, 1, BIT(PRINT_SCAN), },
|
- [62] = { "Secondary Channel Offset", print_secchan_offs, 1, 1, BIT(PRINT_SCAN), },
|
||||||
|
|
@ -188,17 +175,19 @@
|
||||||
- [192] = { "VHT operation", print_vht_oper, 5, 255, BIT(PRINT_SCAN), },
|
- [192] = { "VHT operation", print_vht_oper, 5, 255, BIT(PRINT_SCAN), },
|
||||||
- [48] = { "RSN", print_rsn, 2, 255, BIT(PRINT_SCAN), },
|
- [48] = { "RSN", print_rsn, 2, 255, BIT(PRINT_SCAN), },
|
||||||
[50] = { "Extended supported rates", print_supprates, 0, 255, BIT(PRINT_SCAN), },
|
[50] = { "Extended supported rates", print_supprates, 0, 255, BIT(PRINT_SCAN), },
|
||||||
|
[70] = { "RM enabled capabilities", print_rm_enabled_capabilities, 5, 5, BIT(PRINT_SCAN), },
|
||||||
[113] = { "MESH Configuration", print_mesh_conf, 7, 7, BIT(PRINT_SCAN), },
|
[113] = { "MESH Configuration", print_mesh_conf, 7, 7, BIT(PRINT_SCAN), },
|
||||||
- [114] = { "MESH ID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), },
|
- [114] = { "MESH ID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), },
|
||||||
[127] = { "Extended capabilities", print_capabilities, 0, 255, BIT(PRINT_SCAN), },
|
[127] = { "Extended capabilities", print_capabilities, 0, 255, BIT(PRINT_SCAN), },
|
||||||
[107] = { "802.11u Interworking", print_interworking, 0, 255, BIT(PRINT_SCAN), },
|
[107] = { "802.11u Interworking", print_interworking, 0, 255, BIT(PRINT_SCAN), },
|
||||||
[108] = { "802.11u Advertisement", print_11u_advert, 0, 255, BIT(PRINT_SCAN), },
|
[108] = { "802.11u Advertisement", print_11u_advert, 0, 255, BIT(PRINT_SCAN), },
|
||||||
[111] = { "802.11u Roaming Consortium", print_11u_rcon, 0, 255, BIT(PRINT_SCAN), },
|
[111] = { "802.11u Roaming Consortium", print_11u_rcon, 2, 255, BIT(PRINT_SCAN), },
|
||||||
|
[195] = { "Transmit Power Envelope", print_tx_power_envelope, 2, 5, BIT(PRINT_SCAN), },
|
||||||
+#endif
|
+#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
static void print_wifi_wpa(const uint8_t type, uint8_t len, const uint8_t *data,
|
static void print_wifi_wpa(const uint8_t type, uint8_t len, const uint8_t *data,
|
||||||
@@ -2024,6 +2029,7 @@ void print_ies(unsigned char *ie, int ie
|
@@ -2279,6 +2284,7 @@ void print_ies(unsigned char *ie, int ie
|
||||||
ieprinters[ie[0]].flags & BIT(ptype)) {
|
ieprinters[ie[0]].flags & BIT(ptype)) {
|
||||||
print_ie(&ieprinters[ie[0]],
|
print_ie(&ieprinters[ie[0]],
|
||||||
ie[0], ie[1], ie + 2, &ie_buffer);
|
ie[0], ie[1], ie + 2, &ie_buffer);
|
||||||
|
|
@ -206,7 +195,7 @@
|
||||||
} else if (ie[0] == 221 /* vendor */) {
|
} else if (ie[0] == 221 /* vendor */) {
|
||||||
print_vendor(ie[1], ie + 2, unknown, ptype);
|
print_vendor(ie[1], ie + 2, unknown, ptype);
|
||||||
} else if (unknown) {
|
} else if (unknown) {
|
||||||
@@ -2033,6 +2039,7 @@ void print_ies(unsigned char *ie, int ie
|
@@ -2288,6 +2294,7 @@ void print_ies(unsigned char *ie, int ie
|
||||||
for (i=0; i<ie[1]; i++)
|
for (i=0; i<ie[1]; i++)
|
||||||
printf(" %.2x", ie[2+i]);
|
printf(" %.2x", ie[2+i]);
|
||||||
printf("\n");
|
printf("\n");
|
||||||
|
|
@ -214,7 +203,7 @@
|
||||||
}
|
}
|
||||||
ielen -= ie[1] + 2;
|
ielen -= ie[1] + 2;
|
||||||
ie += ie[1] + 2;
|
ie += ie[1] + 2;
|
||||||
@@ -2073,6 +2080,7 @@ static void print_capa_non_dmg(__u16 cap
|
@@ -2328,6 +2335,7 @@ static void print_capa_non_dmg(__u16 cap
|
||||||
printf(" ESS");
|
printf(" ESS");
|
||||||
if (capa & WLAN_CAPABILITY_IBSS)
|
if (capa & WLAN_CAPABILITY_IBSS)
|
||||||
printf(" IBSS");
|
printf(" IBSS");
|
||||||
|
|
@ -222,7 +211,7 @@
|
||||||
if (capa & WLAN_CAPABILITY_CF_POLLABLE)
|
if (capa & WLAN_CAPABILITY_CF_POLLABLE)
|
||||||
printf(" CfPollable");
|
printf(" CfPollable");
|
||||||
if (capa & WLAN_CAPABILITY_CF_POLL_REQUEST)
|
if (capa & WLAN_CAPABILITY_CF_POLL_REQUEST)
|
||||||
@@ -2101,6 +2109,7 @@ static void print_capa_non_dmg(__u16 cap
|
@@ -2356,6 +2364,7 @@ static void print_capa_non_dmg(__u16 cap
|
||||||
printf(" DelayedBACK");
|
printf(" DelayedBACK");
|
||||||
if (capa & WLAN_CAPABILITY_IMM_BACK)
|
if (capa & WLAN_CAPABILITY_IMM_BACK)
|
||||||
printf(" ImmediateBACK");
|
printf(" ImmediateBACK");
|
||||||
|
|
@ -230,7 +219,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
static int print_bss_handler(struct nl_msg *msg, void *arg)
|
static int print_bss_handler(struct nl_msg *msg, void *arg)
|
||||||
@@ -2185,8 +2194,10 @@ static int print_bss_handler(struct nl_m
|
@@ -2440,8 +2449,10 @@ static int print_bss_handler(struct nl_m
|
||||||
if (bss[NL80211_BSS_FREQUENCY]) {
|
if (bss[NL80211_BSS_FREQUENCY]) {
|
||||||
int freq = nla_get_u32(bss[NL80211_BSS_FREQUENCY]);
|
int freq = nla_get_u32(bss[NL80211_BSS_FREQUENCY]);
|
||||||
printf("\tfreq: %d\n", freq);
|
printf("\tfreq: %d\n", freq);
|
||||||
|
|
@ -241,7 +230,7 @@
|
||||||
}
|
}
|
||||||
if (bss[NL80211_BSS_BEACON_INTERVAL])
|
if (bss[NL80211_BSS_BEACON_INTERVAL])
|
||||||
printf("\tbeacon interval: %d TUs\n",
|
printf("\tbeacon interval: %d TUs\n",
|
||||||
@@ -2380,6 +2391,7 @@ static int handle_stop_sched_scan(struct
|
@@ -2635,6 +2646,7 @@ static int handle_stop_sched_scan(struct
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -249,7 +238,7 @@
|
||||||
COMMAND(scan, sched_start,
|
COMMAND(scan, sched_start,
|
||||||
SCHED_SCAN_OPTIONS,
|
SCHED_SCAN_OPTIONS,
|
||||||
NL80211_CMD_START_SCHED_SCAN, 0, CIB_NETDEV, handle_start_sched_scan,
|
NL80211_CMD_START_SCHED_SCAN, 0, CIB_NETDEV, handle_start_sched_scan,
|
||||||
@@ -2390,3 +2402,4 @@ COMMAND(scan, sched_start,
|
@@ -2645,3 +2657,4 @@ COMMAND(scan, sched_start,
|
||||||
COMMAND(scan, sched_stop, "",
|
COMMAND(scan, sched_stop, "",
|
||||||
NL80211_CMD_STOP_SCHED_SCAN, 0, CIB_NETDEV, handle_stop_sched_scan,
|
NL80211_CMD_STOP_SCHED_SCAN, 0, CIB_NETDEV, handle_stop_sched_scan,
|
||||||
"Stop an ongoing scheduled scan.");
|
"Stop an ongoing scheduled scan.");
|
||||||
|
|
@ -272,7 +261,7 @@
|
||||||
|
|
||||||
int ieee80211_channel_to_frequency(int chan, enum nl80211_band band)
|
int ieee80211_channel_to_frequency(int chan, enum nl80211_band band)
|
||||||
{
|
{
|
||||||
@@ -298,6 +300,9 @@ int parse_keys(struct nl_msg *msg, char
|
@@ -311,6 +313,9 @@ int parse_keys(struct nl_msg *msg, char
|
||||||
char keybuf[13];
|
char keybuf[13];
|
||||||
int pos = 0;
|
int pos = 0;
|
||||||
|
|
||||||
|
|
@ -284,7 +273,7 @@
|
||||||
|
|
||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -22,6 +22,12 @@ _OBJS := $(sort $(patsubst %.c,%.o,$(wil
|
@@ -23,6 +23,12 @@ _OBJS := $(sort $(patsubst %.c,%.o,$(wil
|
||||||
VERSION_OBJS := $(filter-out version.o, $(_OBJS))
|
VERSION_OBJS := $(filter-out version.o, $(_OBJS))
|
||||||
OBJS := $(VERSION_OBJS) version.o
|
OBJS := $(VERSION_OBJS) version.o
|
||||||
|
|
||||||
|
|
@ -299,7 +288,7 @@
|
||||||
ifeq ($(NO_PKG_CONFIG),)
|
ifeq ($(NO_PKG_CONFIG),)
|
||||||
--- a/station.c
|
--- a/station.c
|
||||||
+++ b/station.c
|
+++ b/station.c
|
||||||
@@ -759,10 +759,12 @@ static int handle_station_set_plink(stru
|
@@ -777,10 +777,12 @@ static int handle_station_set_plink(stru
|
||||||
nla_put_failure:
|
nla_put_failure:
|
||||||
return -ENOBUFS;
|
return -ENOBUFS;
|
||||||
}
|
}
|
||||||
|
|
@ -312,7 +301,7 @@
|
||||||
|
|
||||||
static int handle_station_set_vlan(struct nl80211_state *state,
|
static int handle_station_set_vlan(struct nl80211_state *state,
|
||||||
struct nl_msg *msg,
|
struct nl_msg *msg,
|
||||||
@@ -857,11 +859,13 @@ static int handle_station_set_mesh_power
|
@@ -875,11 +877,13 @@ static int handle_station_set_mesh_power
|
||||||
nla_put_failure:
|
nla_put_failure:
|
||||||
return -ENOBUFS;
|
return -ENOBUFS;
|
||||||
}
|
}
|
||||||
|
|
@ -348,10 +337,10 @@
|
||||||
SECTION(switch);
|
SECTION(switch);
|
||||||
COMMAND(switch, freq,
|
COMMAND(switch, freq,
|
||||||
"<freq> [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz] [beacons <count>] [block-tx]\n"
|
"<freq> [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz] [beacons <count>] [block-tx]\n"
|
||||||
@@ -727,3 +730,4 @@ COMMAND(switch, freq,
|
@@ -990,3 +993,4 @@ COMMAND(set, tidconf, "[peer <MAC addres
|
||||||
"Switch the operating channel by sending a channel switch announcement (CSA).");
|
" $ iw dev wlan0 set tidconf peer xx:xx:xx:xx:xx:xx tids 0x2 bitrates auto\n"
|
||||||
COMMAND(switch, channel, "<channel> [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz] [beacons <count>] [block-tx]",
|
" $ iw dev wlan0 set tidconf peer xx:xx:xx:xx:xx:xx tids 0x2 bitrates limit vht-mcs-5 4:9\n"
|
||||||
NL80211_CMD_CHANNEL_SWITCH, 0, CIB_NETDEV, handle_chan, NULL);
|
);
|
||||||
+#endif
|
+#endif
|
||||||
--- a/phy.c
|
--- a/phy.c
|
||||||
+++ b/phy.c
|
+++ b/phy.c
|
||||||
|
|
|
||||||
|
|
@ -14,18 +14,18 @@
|
||||||
--- a/nl80211.h 2018-04-24 15:21:57.695128889 +0200
|
--- a/nl80211.h 2018-04-24 15:21:57.695128889 +0200
|
||||||
+++ b/nl80211.h 2018-04-24 15:18:56.415126745 +0200
|
+++ b/nl80211.h 2018-04-24 15:18:56.415126745 +0200
|
||||||
@@ -3369,6 +3369,8 @@ enum nl80211_wmm_rule {
|
@@ -3369,6 +3369,8 @@ enum nl80211_wmm_rule {
|
||||||
* @NL80211_FREQUENCY_ATTR_WMM: this channel has wmm limitations.
|
* on this channel in current regulatory domain.
|
||||||
* This is a nested attribute that contains the wmm limitation per AC.
|
* @NL80211_FREQUENCY_ATTR_16MHZ: 16 MHz operation is allowed
|
||||||
* (see &enum nl80211_wmm_rule)
|
* on this channel in current regulatory domain.
|
||||||
+* @NL80211_FREQUENCY_ATTR_SRD_CHANNEL: short range devices mode
|
+* @NL80211_FREQUENCY_ATTR_SRD_CHANNEL: short range devices mode
|
||||||
+* on this channel in current regulatory domain.
|
+* on this channel in current regulatory domain.
|
||||||
* @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
|
* @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
|
||||||
* currently defined
|
* currently defined
|
||||||
* @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
|
* @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
|
||||||
@@ -3398,6 +3400,7 @@ enum nl80211_frequency_attr {
|
@@ -3398,6 +3400,7 @@ enum nl80211_frequency_attr {
|
||||||
NL80211_FREQUENCY_ATTR_NO_20MHZ,
|
NL80211_FREQUENCY_ATTR_4MHZ,
|
||||||
NL80211_FREQUENCY_ATTR_NO_10MHZ,
|
NL80211_FREQUENCY_ATTR_8MHZ,
|
||||||
NL80211_FREQUENCY_ATTR_WMM,
|
NL80211_FREQUENCY_ATTR_16MHZ,
|
||||||
+ NL80211_FREQUENCY_ATTR_SRD_CHANNEL,
|
+ NL80211_FREQUENCY_ATTR_SRD_CHANNEL,
|
||||||
|
|
||||||
/* keep last */
|
/* keep last */
|
||||||
|
|
|
||||||
|
|
@ -19,10 +19,9 @@ SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.xz \
|
||||||
file://401-wlan-indoor-channel.patch \
|
file://401-wlan-indoor-channel.patch \
|
||||||
file://402-show-ant-gain.patch \
|
file://402-show-ant-gain.patch \
|
||||||
file://403-clockbootime.patch \
|
file://403-clockbootime.patch \
|
||||||
file://separate-objdir.patch \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "a2469f677088d7b1070a7fbb28f3c747041697e8f6ec70783339cb1bc27a395f"
|
SRC_URI[sha256sum] = "293a07109aeb7e36267cf59e3ce52857e9ffae3a6666eb8ac77894b1839fe1f2"
|
||||||
|
|
||||||
inherit pkgconfig
|
inherit pkgconfig
|
||||||
|
|
||||||
Loading…
Reference in New Issue