X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fnetwork%2Futils%2Fiw%2Fpatches%2F200-reduce_size.patch;h=5f4bce6a8bc1c598da2d21986281f489a88f02a9;hp=2a282a85a6f93e890e993c27ea046b64969adf51;hb=518fb345e110f7028912211ebf75af92c7c10809;hpb=3f07af337c90327e1d473b7d09a1f7a294c336d4 diff --git a/package/network/utils/iw/patches/200-reduce_size.patch b/package/network/utils/iw/patches/200-reduce_size.patch index 2a282a85a6..5f4bce6a8b 100644 --- a/package/network/utils/iw/patches/200-reduce_size.patch +++ b/package/network/utils/iw/patches/200-reduce_size.patch @@ -1,27 +1,52 @@ ---- a/Makefile -+++ b/Makefile -@@ -15,8 +15,8 @@ CFLAGS += -Wall -Wundef -Wstrict-prototy - OBJS = iw.o genl.o event.o info.o phy.o \ - interface.o ibss.o station.o survey.o util.o \ - mesh.o mpath.o scan.o reg.o version.o \ -- reason.o status.o connect.o link.o offch.o ps.o cqm.o \ -- bitrate.o wowlan.o coalesce.o roc.o p2p.o -+ reason.o status.o connect.o link.o ps.o \ -+ bitrate.o - OBJS += sections.o - - OBJS-$(HWSIM) += hwsim.o +--- a/event.c ++++ b/event.c +@@ -342,6 +342,7 @@ static int print_event(struct nl_msg *ms + } + + switch (gnlh->cmd) { ++#ifdef IW_FULL + case NL80211_CMD_NEW_WIPHY: + printf("renamed to %s\n", nla_get_string(tb[NL80211_ATTR_WIPHY_NAME])); + break; +@@ -376,6 +377,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_REG_CHANGE: + printf("regulatory domain change: "); + +@@ -454,6 +456,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; ++#ifdef IW_FULL + case NL80211_CMD_JOIN_IBSS: + mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC])); + printf("IBSS %s joined\n", macbuf); +@@ -618,9 +621,9 @@ static int print_event(struct nl_msg *ms + case NL80211_CMD_DEL_WIPHY: + printf("delete wiphy\n"); + break; ++#endif + default: +- printf("unknown event %d (%s)\n", +- gnlh->cmd, command_name(gnlh->cmd)); ++ printf("unknown event %d\n", gnlh->cmd); + break; + } + --- a/info.c +++ b/info.c -@@ -204,6 +204,7 @@ next: +@@ -197,6 +197,7 @@ next: } } -+#if 0 ++#ifdef IW_FULL 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) { -@@ -220,6 +221,7 @@ next: +@@ -213,6 +214,7 @@ next: printf("\n"); } } @@ -29,15 +54,15 @@ } } -@@ -254,6 +256,7 @@ next: +@@ -278,6 +280,7 @@ next: printf("\tCoverage class: %d (up to %dm)\n", coverage, 450 * coverage); } -+#if 0 ++#ifdef IW_FULL if (tb_msg[NL80211_ATTR_CIPHER_SUITES]) { int num = nla_len(tb_msg[NL80211_ATTR_CIPHER_SUITES]) / sizeof(__u32); int i; -@@ -265,6 +268,7 @@ next: +@@ -289,6 +292,7 @@ next: cipher_name(ciphers[i])); } } @@ -45,11 +70,11 @@ if (tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX] && tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX]) -@@ -284,11 +288,13 @@ next: +@@ -308,11 +312,13 @@ next: printf("\t\t * %s\n", iftype_name(nla_type(nl_mode))); } -+#if 0 ++#ifdef IW_FULL if (tb_msg[NL80211_ATTR_SOFTWARE_IFTYPES]) { printf("\tsoftware interface modes (can always be added):\n"); nla_for_each_nested(nl_mode, tb_msg[NL80211_ATTR_SOFTWARE_IFTYPES], rem_mode) @@ -59,15 +84,15 @@ if (tb_msg[NL80211_ATTR_INTERFACE_COMBINATIONS]) { struct nlattr *nl_combi; -@@ -385,6 +391,7 @@ broken_combination: +@@ -409,6 +415,7 @@ broken_combination: printf("\tinterface combinations are not supported\n"); } -+#if 0 ++#ifdef IW_FULL 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) -@@ -477,6 +484,7 @@ broken_combination: +@@ -506,6 +513,7 @@ broken_combination: printf("\t\t * wake up on TCP connection\n"); } } @@ -75,31 +100,31 @@ if (tb_msg[NL80211_ATTR_ROAM_SUPPORT]) printf("\tDevice supports roaming.\n"); -@@ -513,6 +521,7 @@ broken_combination: +@@ -544,6 +552,7 @@ broken_combination: } } -+#if 0 ++#ifdef IW_FULL if (tb_msg[NL80211_ATTR_FEATURE_FLAGS]) { unsigned int features = nla_get_u32(tb_msg[NL80211_ATTR_FEATURE_FLAGS]); -@@ -533,6 +542,7 @@ broken_combination: - if (features & NL80211_FEATURE_AP_SCAN) - printf("\tDevice supports AP scan.\n"); +@@ -602,6 +611,7 @@ broken_combination: + if (features & NL80211_FEATURE_TDLS_CHANNEL_SWITCH) + printf("\tDevice supports TDLS channel switching\n"); } +#endif - if (tb_msg[NL80211_ATTR_TDLS_SUPPORT]) - printf("\tDevice supports T-DLS.\n"); -@@ -582,6 +592,7 @@ TOPLEVEL(list, NULL, NL80211_CMD_GET_WIP + if (tb_msg[NL80211_ATTR_EXT_FEATURES]) { + struct nlattr *tb = tb_msg[NL80211_ATTR_EXT_FEATURES]; +@@ -658,6 +668,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); -+#if 0 - static int handle_commands(struct nl80211_state *state, - struct nl_cb *cb, struct nl_msg *msg, ++#ifdef IW_FULL + static int handle_commands(struct nl80211_state *state, struct nl_msg *msg, int argc, char **argv, enum id_input id) -@@ -594,6 +605,7 @@ static int handle_commands(struct nl8021 + { +@@ -669,6 +680,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"); @@ -107,3 +132,224 @@ static int print_feature_handler(struct nl_msg *msg, void *arg) { +--- a/scan.c ++++ b/scan.c +@@ -1170,6 +1170,7 @@ 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]); ++ return; + 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); +@@ -1497,6 +1498,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), }, ++ [45] = { "HT capabilities", print_ht_capa, 26, 26, BIT(PRINT_SCAN), }, ++ [48] = { "RSN", print_rsn, 2, 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), }, ++ [114] = { "MESH ID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), }, ++ [191] = { "VHT capabilities", print_vht_capa, 12, 255, BIT(PRINT_SCAN), }, ++ [192] = { "VHT operation", print_vht_oper, 5, 255, BIT(PRINT_SCAN), }, ++#ifdef IW_FULL + [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), }, +@@ -1506,21 +1515,15 @@ 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), }, + [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), }, +- [191] = { "VHT capabilities", print_vht_capa, 12, 255, BIT(PRINT_SCAN), }, +- [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), }, + [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), }, ++#endif + }; + + static void print_wifi_wpa(const uint8_t type, uint8_t len, const uint8_t *data, +@@ -1968,6 +1971,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); ++#ifdef IW_FULL + } else if (ie[0] == 221 /* vendor */) { + print_vendor(ie[1], ie + 2, unknown, ptype); + } else if (unknown) { +@@ -1977,6 +1981,7 @@ void print_ies(unsigned char *ie, int ie + for (i=0; i 45000) + is_dmg = true; ++#endif + } + if (bss[NL80211_BSS_BEACON_INTERVAL]) + printf("\tbeacon interval: %d TUs\n", +@@ -2319,6 +2328,7 @@ static int handle_stop_sched_scan(struct + return 0; + } + ++#ifdef IW_FULL + COMMAND(scan, sched_start, + SCHED_SCAN_OPTIONS, + NL80211_CMD_START_SCHED_SCAN, 0, CIB_NETDEV, handle_start_sched_scan, +@@ -2329,3 +2339,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."); ++#endif +--- a/util.c ++++ b/util.c +@@ -281,6 +281,7 @@ static const char *commands[NL80211_CMD_ + + static char cmdbuf[100]; + ++#ifdef IW_FULL + const char *command_name(enum nl80211_commands cmd) + { + if (cmd <= NL80211_CMD_MAX && commands[cmd]) +@@ -288,6 +289,7 @@ const char *command_name(enum nl80211_co + sprintf(cmdbuf, "Unknown command (%d)", cmd); + return cmdbuf; + } ++#endif + + int ieee80211_channel_to_frequency(int chan, enum nl80211_band band) + { +@@ -426,6 +428,9 @@ int parse_keys(struct nl_msg *msg, char + char keybuf[13]; + int pos = 0; + ++#ifndef IW_FULL ++ return 1; ++#endif + if (!argc) + return 1; + +--- a/Makefile ++++ b/Makefile +@@ -25,6 +25,12 @@ OBJS-$(HWSIM) += hwsim.o + + OBJS += $(OBJS-y) $(OBJS-Y) + ++OBJS_FULL = ocb offch cqm wowlan coalesce roc p2p ap mgmt vendor ++ifdef IW_FULL ++ CFLAGS += -DIW_FULL ++else ++ OBJS:=$(filter-out $(patsubst %,%.o,$(OBJS_FULL)),$(OBJS)) ++endif + ALL = iw + + ifeq ($(NO_PKG_CONFIG),) +--- a/station.c ++++ b/station.c +@@ -629,10 +629,12 @@ static int handle_station_set_plink(stru + nla_put_failure: + return -ENOBUFS; + } ++#ifdef IW_FULL + COMMAND_ALIAS(station, set, " plink_action ", + NL80211_CMD_SET_STATION, 0, CIB_NETDEV, handle_station_set_plink, + "Set mesh peer link action for this station (peer).", + select_station_cmd, station_set_plink); ++#endif + + static int handle_station_set_vlan(struct nl80211_state *state, + struct nl_msg *msg, +@@ -727,11 +729,13 @@ static int handle_station_set_mesh_power + nla_put_failure: + return -ENOBUFS; + } ++#ifdef IW_FULL + COMMAND_ALIAS(station, set, " mesh_power_mode " + "", NL80211_CMD_SET_STATION, 0, CIB_NETDEV, + handle_station_set_mesh_power_mode, + "Set link-specific mesh power mode for this station", + select_station_cmd, station_set_mesh_power_mode); ++#endif + + static int handle_station_dump(struct nl80211_state *state, + struct nl_msg *msg, +--- a/interface.c ++++ b/interface.c +@@ -615,9 +615,11 @@ static int handle_interface_wds_peer(str + nla_put_failure: + return -ENOBUFS; + } ++#ifdef IW_FULL + COMMAND(set, peer, "", + NL80211_CMD_SET_WDS_PEER, 0, CIB_NETDEV, handle_interface_wds_peer, + "Set interface WDS peer."); ++#endif + + static int set_mcast_rate(struct nl80211_state *state, + struct nl_msg *msg, +@@ -707,6 +709,7 @@ static int handle_chan(struct nl80211_st + return handle_chanfreq(state, msg, true, argc, argv, id); + } + ++#ifdef IW_FULL + SECTION(switch); + COMMAND(switch, freq, + " [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz] [beacons ] [block-tx]\n" +@@ -715,3 +718,4 @@ COMMAND(switch, freq, + "Switch the operating channel by sending a channel switch announcement (CSA)."); + COMMAND(switch, channel, " [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz] [beacons ] [block-tx]", + NL80211_CMD_CHANNEL_SWITCH, 0, CIB_NETDEV, handle_chan, NULL); ++#endif +--- a/phy.c ++++ b/phy.c +@@ -359,6 +359,7 @@ static int handle_cac(struct nl80211_sta + + return 0; + } ++#ifdef IW_FULL + TOPLEVEL(cac, "channel [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz]\n" + "freq [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz]\n" + "freq [5|10|20|40|80|80+80|160] [ []]", +@@ -370,6 +371,7 @@ COMMAND(cac, trigger, + NL80211_CMD_RADAR_DETECT, 0, CIB_NETDEV, handle_cac_trigger, + "Start or trigger a channel availability check (CAC) looking to look for\n" + "radars on the given channel."); ++#endif + + static int handle_fragmentation(struct nl80211_state *state, + struct nl_msg *msg,