[rdk-b][all][wifi][Refactor iw patches to support wifi-hal]
[Description]
Refactor iw patches to support wifi-hal
[Release-log]
N/A
diff --git a/recipes-connectivity/iw/patches/200-reduce_size.patch b/recipes-connectivity/iw/patches/200-reduce_size.patch
deleted file mode 100644
index 88df56b..0000000
--- a/recipes-connectivity/iw/patches/200-reduce_size.patch
+++ /dev/null
@@ -1,366 +0,0 @@
---- a/event.c
-+++ b/event.c
-@@ -971,6 +971,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;
-@@ -1006,6 +1007,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:
- if (gnlh->cmd == NL80211_CMD_WIPHY_REG_CHANGE)
-@@ -1088,6 +1090,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);
-@@ -1292,9 +1295,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",
-- gnlh->cmd, command_name(gnlh->cmd));
-+ printf("unknown event %d\n", gnlh->cmd);
- break;
- }
-
---- a/info.c
-+++ b/info.c
-@@ -308,6 +308,7 @@ next:
- }
- }
-
-+#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) {
-@@ -324,6 +325,7 @@ next:
- printf("\n");
- }
- }
-+#endif
- }
- }
-
-@@ -389,6 +391,7 @@ next:
- printf("\tCoverage class: %d (up to %dm)\n", coverage, 450 * coverage);
- }
-
-+#ifdef IW_FULL
- if (tb_msg[NL80211_ATTR_CIPHER_SUITES]) {
- int num = nla_len(tb_msg[NL80211_ATTR_CIPHER_SUITES]) / sizeof(__u32);
- int i;
-@@ -400,6 +403,7 @@ next:
- cipher_name(ciphers[i]));
- }
- }
-+#endif
-
- if (tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX] &&
- tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX])
-@@ -417,9 +421,11 @@ next:
- print_iftype_list("\tSupported interface modes", "\t\t",
- tb_msg[NL80211_ATTR_SUPPORTED_IFTYPES]);
-
-+#ifdef IW_FULL
- if (tb_msg[NL80211_ATTR_SOFTWARE_IFTYPES])
- print_iftype_list("\tsoftware interface modes (can always be added)",
- "\t\t", tb_msg[NL80211_ATTR_SOFTWARE_IFTYPES]);
-+#endif
-
- if (tb_msg[NL80211_ATTR_INTERFACE_COMBINATIONS]) {
- struct nlattr *nl_combi;
-@@ -509,6 +515,7 @@ broken_combination:
- printf("\tinterface combinations are not supported\n");
- }
-
-+#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)
-@@ -606,6 +613,7 @@ broken_combination:
- printf("\t\t * wake up on TCP connection\n");
- }
- }
-+#endif
-
- if (tb_msg[NL80211_ATTR_ROAM_SUPPORT])
- printf("\tDevice supports roaming.\n");
-@@ -644,6 +652,7 @@ broken_combination:
- }
- }
-
-+#ifdef IW_FULL
- if (tb_msg[NL80211_ATTR_FEATURE_FLAGS]) {
- unsigned int features = nla_get_u32(tb_msg[NL80211_ATTR_FEATURE_FLAGS]);
-
-@@ -708,6 +717,7 @@ broken_combination:
- if (features & NL80211_FEATURE_ND_RANDOM_MAC_ADDR)
- printf("\tDevice supports randomizing MAC-addr in net-detect scans.\n");
- }
-+#endif
-
- if (tb_msg[NL80211_ATTR_TDLS_SUPPORT])
- printf("\tDevice supports T-DLS.\n");
-@@ -773,6 +783,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);
-
-+#ifdef IW_FULL
- static int handle_commands(struct nl80211_state *state, struct nl_msg *msg,
- int argc, char **argv, enum id_input id)
- {
-@@ -784,6 +795,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");
-+#endif
-
- static int print_feature_handler(struct nl_msg *msg, void *arg)
- {
---- a/scan.c
-+++ b/scan.c
-@@ -1306,6 +1306,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]);
-+#ifndef IW_FULL
-+ return;
-+#endif
- 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);
-@@ -1716,6 +1719,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), },
-@@ -1725,26 +1736,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), },
-- [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), },
- [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, 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,
-@@ -2080,8 +2085,10 @@ static void print_wifi_wps(const uint8_t
-
- static const struct ie_print wifiprinters[] = {
- [1] = { "WPA", print_wifi_wpa, 2, 255, BIT(PRINT_SCAN), },
-+#ifdef IW_FULL
- [2] = { "WMM", print_wifi_wmm, 1, 255, BIT(PRINT_SCAN), },
- [4] = { "WPS", print_wifi_wps, 0, 255, BIT(PRINT_SCAN), },
-+#endif
- };
-
- static inline void print_p2p(const uint8_t type, uint8_t len,
-@@ -2244,6 +2251,10 @@ static void print_vendor(unsigned char l
- return;
- }
-
-+#ifdef IW_FULL
-+ return;
-+#endif
-+
- if (len >= 4 && memcmp(data, wfa_oui, 3) == 0) {
- if (data[3] < ARRAY_SIZE(wfa_printers) &&
- wfa_printers[data[3]].name &&
-@@ -2377,6 +2388,7 @@ static void print_capa_non_dmg(__u16 cap
- printf(" ESS");
- if (capa & WLAN_CAPABILITY_IBSS)
- printf(" IBSS");
-+#ifdef IW_FULL
- if (capa & WLAN_CAPABILITY_CF_POLLABLE)
- printf(" CfPollable");
- if (capa & WLAN_CAPABILITY_CF_POLL_REQUEST)
-@@ -2405,6 +2417,7 @@ static void print_capa_non_dmg(__u16 cap
- printf(" DelayedBACK");
- if (capa & WLAN_CAPABILITY_IMM_BACK)
- printf(" ImmediateBACK");
-+#endif
- }
-
- static int print_bss_handler(struct nl_msg *msg, void *arg)
-@@ -2489,8 +2502,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);
-+#ifdef IW_FULL
- if (freq > 45000)
- is_dmg = true;
-+#endif
- }
- if (bss[NL80211_BSS_BEACON_INTERVAL])
- printf("\tbeacon interval: %d TUs\n",
-@@ -2684,6 +2699,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,
-@@ -2694,3 +2710,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
-@@ -153,6 +153,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])
-@@ -160,6 +161,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)
- {
-@@ -311,6 +313,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
-@@ -23,6 +23,12 @@ _OBJS := $(sort $(patsubst %.c,%.o,$(wil
- VERSION_OBJS := $(filter-out version.o, $(_OBJS))
- OBJS := $(VERSION_OBJS) version.o
-
-+OBJS_FULL = ocb offch cqm wowlan coalesce roc p2p vendor mgmt ap sha256 nan bloom measurements ftm
-+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
-@@ -777,10 +777,12 @@ static int handle_station_set_plink(stru
- nla_put_failure:
- return -ENOBUFS;
- }
-+#ifdef IW_FULL
- COMMAND_ALIAS(station, set, "<MAC address> plink_action <open|block>",
- 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,
-@@ -875,11 +877,13 @@ static int handle_station_set_mesh_power
- nla_put_failure:
- return -ENOBUFS;
- }
-+#ifdef IW_FULL
- COMMAND_ALIAS(station, set, "<MAC address> mesh_power_mode "
- "<active|light|deep>", 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_set_airtime_weight(struct nl80211_state *state,
- struct nl_msg *msg,
---- a/interface.c
-+++ b/interface.c
-@@ -627,9 +627,11 @@ static int handle_interface_wds_peer(str
- nla_put_failure:
- return -ENOBUFS;
- }
-+#ifdef IW_FULL
- COMMAND(set, peer, "<MAC address>",
- 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,
-@@ -719,6 +721,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,
- "<freq> [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz] [beacons <count>] [block-tx]\n"
-@@ -990,3 +993,4 @@ COMMAND(set, tidconf, "[peer <MAC addres
- " $ iw dev wlan0 set tidconf peer xx:xx:xx:xx:xx:xx tids 0x2 bitrates auto\n"
- " $ iw dev wlan0 set tidconf peer xx:xx:xx:xx:xx:xx tids 0x2 bitrates limit vht-mcs-5 4:9\n"
- );
-+#endif
---- a/phy.c
-+++ b/phy.c
-@@ -369,6 +369,7 @@ err_out:
- free(cac_trigger_argv);
- return err;
- }
-+#ifdef IW_FULL
- TOPLEVEL(cac, "channel <channel> [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz]\n"
- "freq <freq> [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz]\n"
- "freq <control freq> [5|10|20|40|80|80+80|160] [<center1_freq> [<center2_freq>]]",
-@@ -380,6 +381,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,
diff --git a/recipes-connectivity/iw/patches/patches.inc b/recipes-connectivity/iw/patches/patches.inc
index b7b32e4..e710396 100644
--- a/recipes-connectivity/iw/patches/patches.inc
+++ b/recipes-connectivity/iw/patches/patches.inc
@@ -4,5 +4,4 @@
file://010-Revert-iw-allow-specifying-CFLAGS-LIBS-externally.patch \
file://120-antenna_gain.patch \
file://130-survey-bss-rx-time.patch \
- file://200-reduce_size.patch \
"