diff options
Diffstat (limited to 'package/network/utils/iw/patches/200-reduce_size.patch')
-rw-r--r-- | package/network/utils/iw/patches/200-reduce_size.patch | 85 |
1 files changed, 45 insertions, 40 deletions
diff --git a/package/network/utils/iw/patches/200-reduce_size.patch b/package/network/utils/iw/patches/200-reduce_size.patch index 58613d59a0..24eb96537b 100644 --- a/package/network/utils/iw/patches/200-reduce_size.patch +++ b/package/network/utils/iw/patches/200-reduce_size.patch @@ -1,6 +1,6 @@ --- a/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) { @@ -8,15 +8,15 @@ case NL80211_CMD_NEW_WIPHY: printf("renamed to %s\n", nla_get_string(tb[NL80211_ATTR_WIPHY_NAME])); 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: printf("got scheduled scan results\n"); break; +#endif + case NL80211_CMD_WIPHY_REG_CHANGE: case NL80211_CMD_REG_CHANGE: - printf("regulatory domain change: "); - -@@ -812,6 +814,7 @@ static int print_event(struct nl_msg *ms + if (gnlh->cmd == NL80211_CMD_WIPHY_REG_CHANGE) +@@ -1061,6 +1063,7 @@ static int print_event(struct nl_msg *ms mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC])); printf("del station %s\n", macbuf); break; @@ -24,10 +24,10 @@ case NL80211_CMD_JOIN_IBSS: mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC])); printf("IBSS %s joined\n", macbuf); -@@ -989,9 +992,9 @@ static int print_event(struct nl_msg *ms - parse_nan_match(tb); +@@ -1254,9 +1257,9 @@ static int print_event(struct nl_msg *ms + case NL80211_CMD_CH_SWITCH_NOTIFY: + parse_ch_switch_notify(tb, gnlh->cmd); break; - } +#endif default: - printf("unknown event %d (%s)\n", @@ -38,7 +38,7 @@ --- a/info.c +++ b/info.c -@@ -164,6 +164,7 @@ static int print_phy_handler(struct nl_m +@@ -167,6 +167,7 @@ static int print_phy_handler(struct nl_m 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])); @@ -46,7 +46,7 @@ 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 +@@ -174,6 +175,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); } @@ -54,7 +54,7 @@ if (tb_band[NL80211_BAND_ATTR_FREQS]) { if (!band_had_freq) { printf("\t\tFrequencies:\n"); -@@ -213,6 +215,7 @@ next: +@@ -216,6 +218,7 @@ next: } } @@ -62,7 +62,7 @@ if (tb_band[NL80211_BAND_ATTR_RATES]) { printf("\t\tBitrates (non-HT):\n"); nla_for_each_nested(nl_rate, tb_band[NL80211_BAND_ATTR_RATES], rem_rate) { -@@ -229,6 +232,7 @@ next: +@@ -232,6 +235,7 @@ next: printf("\n"); } } @@ -70,7 +70,7 @@ } } -@@ -294,6 +298,7 @@ next: +@@ -297,6 +301,7 @@ next: printf("\tCoverage class: %d (up to %dm)\n", coverage, 450 * coverage); } @@ -78,7 +78,7 @@ if (tb_msg[NL80211_ATTR_CIPHER_SUITES]) { int num = nla_len(tb_msg[NL80211_ATTR_CIPHER_SUITES]) / sizeof(__u32); int i; -@@ -305,6 +310,7 @@ next: +@@ -308,6 +313,7 @@ next: cipher_name(ciphers[i])); } } @@ -86,7 +86,7 @@ if (tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX] && tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX]) -@@ -324,11 +330,13 @@ next: +@@ -327,11 +333,13 @@ next: printf("\t\t * %s\n", iftype_name(nla_type(nl_mode))); } @@ -100,7 +100,7 @@ if (tb_msg[NL80211_ATTR_INTERFACE_COMBINATIONS]) { struct nlattr *nl_combi; -@@ -425,6 +433,7 @@ broken_combination: +@@ -428,6 +436,7 @@ broken_combination: printf("\tinterface combinations are not supported\n"); } @@ -108,7 +108,7 @@ if (tb_msg[NL80211_ATTR_SUPPORTED_COMMANDS]) { printf("\tSupported commands:\n"); nla_for_each_nested(nl_cmd, tb_msg[NL80211_ATTR_SUPPORTED_COMMANDS], rem_cmd) -@@ -522,6 +531,7 @@ broken_combination: +@@ -525,6 +534,7 @@ broken_combination: printf("\t\t * wake up on TCP connection\n"); } } @@ -116,7 +116,7 @@ if (tb_msg[NL80211_ATTR_ROAM_SUPPORT]) printf("\tDevice supports roaming.\n"); -@@ -560,6 +570,7 @@ broken_combination: +@@ -563,6 +573,7 @@ broken_combination: } } @@ -124,7 +124,7 @@ if (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 +638,7 @@ broken_combination: if (features & NL80211_FEATURE_ND_RANDOM_MAC_ADDR) printf("\tDevice supports randomizing MAC-addr in net-detect scans.\n"); } @@ -132,7 +132,7 @@ if (tb_msg[NL80211_ATTR_TDLS_SUPPORT]) printf("\tDevice supports T-DLS.\n"); -@@ -732,6 +744,7 @@ TOPLEVEL(list, NULL, NL80211_CMD_GET_WIP +@@ -762,6 +774,7 @@ TOPLEVEL(list, NULL, NL80211_CMD_GET_WIP "List all wireless devices and their capabilities."); TOPLEVEL(phy, NULL, NL80211_CMD_GET_WIPHY, NLM_F_DUMP, CIB_NONE, handle_info, NULL); @@ -140,7 +140,7 @@ static int handle_commands(struct nl80211_state *state, struct nl_msg *msg, int argc, char **argv, enum id_input id) { -@@ -743,6 +756,7 @@ static int handle_commands(struct nl8021 +@@ -773,6 +786,7 @@ static int handle_commands(struct nl8021 } TOPLEVEL(commands, NULL, NL80211_CMD_GET_WIPHY, 0, CIB_NONE, handle_commands, "list all known commands and their decimal & hex value"); @@ -150,7 +150,7 @@ { --- a/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", ht_secondary_offset[data[1] & 0x3]); printf("\t\t * STA channel width: %s\n", sta_chan_width[(data[1] & 0x4)>>2]); @@ -160,7 +160,7 @@ printf("\t\t * RIFS: %d\n", (data[1] & 0x8)>>3); printf("\t\t * HT protection: %s\n", protection[data[2] & 0x3]); 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[] = { [0] = { "SSID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), }, @@ -175,12 +175,15 @@ [1] = { "Supported rates", print_supprates, 0, 255, BIT(PRINT_SCAN), }, [3] = { "DS Parameter set", print_ds, 1, 1, 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), }, [35] = { "TPC report", print_tpcreport, 2, 2, BIT(PRINT_SCAN), }, [42] = { "ERP", print_erp, 1, 255, 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), }, + [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), }, - [61] = { "HT operation", print_ht_op, 22, 22, BIT(PRINT_SCAN), }, - [62] = { "Secondary Channel Offset", print_secchan_offs, 1, 1, BIT(PRINT_SCAN), }, @@ -188,17 +191,19 @@ - [192] = { "VHT operation", print_vht_oper, 5, 255, BIT(PRINT_SCAN), }, - [48] = { "RSN", print_rsn, 2, 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), }, - [114] = { "MESH ID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), }, [127] = { "Extended capabilities", print_capabilities, 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), }, - [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 }; 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)) { print_ie(&ieprinters[ie[0]], ie[0], ie[1], ie + 2, &ie_buffer); @@ -206,7 +211,7 @@ } else if (ie[0] == 221 /* vendor */) { print_vendor(ie[1], ie + 2, unknown, ptype); } 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++) printf(" %.2x", ie[2+i]); printf("\n"); @@ -214,7 +219,7 @@ } ielen -= 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"); if (capa & WLAN_CAPABILITY_IBSS) printf(" IBSS"); @@ -222,7 +227,7 @@ if (capa & WLAN_CAPABILITY_CF_POLLABLE) printf(" CfPollable"); 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"); if (capa & WLAN_CAPABILITY_IMM_BACK) printf(" ImmediateBACK"); @@ -230,7 +235,7 @@ } 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]) { int freq = nla_get_u32(bss[NL80211_BSS_FREQUENCY]); printf("\tfreq: %d\n", freq); @@ -241,7 +246,7 @@ } if (bss[NL80211_BSS_BEACON_INTERVAL]) 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; } @@ -249,7 +254,7 @@ COMMAND(scan, sched_start, SCHED_SCAN_OPTIONS, 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, "", NL80211_CMD_STOP_SCHED_SCAN, 0, CIB_NETDEV, handle_stop_sched_scan, "Stop an ongoing scheduled scan."); @@ -272,7 +277,7 @@ 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]; int pos = 0; @@ -284,7 +289,7 @@ --- a/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)) OBJS := $(VERSION_OBJS) version.o @@ -299,7 +304,7 @@ ifeq ($(NO_PKG_CONFIG),) --- a/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: return -ENOBUFS; } @@ -312,7 +317,7 @@ static int handle_station_set_vlan(struct nl80211_state *state, 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: return -ENOBUFS; } @@ -348,10 +353,10 @@ SECTION(switch); COMMAND(switch, freq, "<freq> [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz] [beacons <count>] [block-tx]\n" -@@ -727,3 +730,4 @@ COMMAND(switch, freq, - "Switch the operating channel by sending a channel switch announcement (CSA)."); - COMMAND(switch, channel, "<channel> [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz] [beacons <count>] [block-tx]", - NL80211_CMD_CHANNEL_SWITCH, 0, CIB_NETDEV, handle_chan, NULL); +@@ -956,3 +959,4 @@ COMMAND(set, tidconf, "[peer <MAC addres + " $ iw dev wlan0 tids 0x3 override ampdu on noack on rtscts on\n" + " $ iw dev wlan0 peer xx:xx:xx:xx:xx:xx tids 0x1 ampdu off tids 0x3 amsdu off rtscts on\n" + ); +#endif --- a/phy.c +++ b/phy.c |