OpenWrt – Diff between revs 2 and 3

Subversion Repositories:

?pathlinks?

Rev 2 – Details – Blame – Last modification – View Log

 --- a/event.c
 +++ b/event.c
-@@ -699,6 +699,7 @@ static int print_event(struct nl_msg *ms
+@@ -342,6 +342,7 @@ static int print_event(struct nl_msg *ms
+ 	}
  	switch (gnlh->cmd) {
-+#ifdef IW_FULL
++#if 0
  	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
+@@ -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: ");
-@@ -812,6 +814,7 @@ static int print_event(struct nl_msg *ms
+@@ -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
++#if 0
  	case NL80211_CMD_JOIN_IBSS:
  		mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC]));
+ 		printf("IBSS %s joined\n", macbuf);
- 		printf("IBSS %s joined\n", macbuf);
+@@ -618,9 +621,9 @@ static int print_event(struct nl_msg *ms
-@@ -989,9 +992,9 @@ static int print_event(struct nl_msg *ms
+ 	case NL80211_CMD_DEL_WIPHY:
- 		parse_nan_match(tb);
- 		break;
+ 		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
-@@ -205,6 +205,7 @@ next:
+@@ -197,6 +197,7 @@ next:
+ 				}
+ 			}
-+#ifdef IW_FULL
++#if 0
  			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) {
-@@ -221,6 +222,7 @@ next:
+@@ -213,6 +214,7 @@ next:
  				printf("\n");
+ 			}
  			}
 +#endif
+ 		}
  	}
-@@ -286,6 +288,7 @@ next:
+@@ -278,6 +280,7 @@ next:
  		printf("\tCoverage class: %d (up to %dm)\n", coverage, 450 * coverage);
  	}
-+#ifdef IW_FULL
++#if 0
  	if (tb_msg[NL80211_ATTR_CIPHER_SUITES]) {
  		int num = nla_len(tb_msg[NL80211_ATTR_CIPHER_SUITES]) / sizeof(__u32);
  		int i;
-@@ -297,6 +300,7 @@ next:
+@@ -289,6 +292,7 @@ next:
  					cipher_name(ciphers[i]));
+ 		}
+ 	}
 +#endif
  	if (tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX] &&
  	    tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX])
-@@ -316,11 +320,13 @@ next:
+@@ -308,11 +312,13 @@ next:
  			printf("\t\t * %s\n", iftype_name(nla_type(nl_mode)));
+ 	}
-+#ifdef IW_FULL
++#if 0
  	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)
  			printf("\t\t * %s\n", iftype_name(nla_type(nl_mode)));
+ 	}
 +#endif
  	if (tb_msg[NL80211_ATTR_INTERFACE_COMBINATIONS]) {
  		struct nlattr *nl_combi;
-@@ -417,6 +423,7 @@ broken_combination:
+@@ -409,6 +415,7 @@ broken_combination:
  			printf("\tinterface combinations are not supported\n");
+ 	}
-+#ifdef IW_FULL
++#if 0
  	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)
-@@ -514,6 +521,7 @@ broken_combination:
+@@ -506,6 +513,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");
-@@ -552,6 +560,7 @@ broken_combination:
+@@ -544,6 +552,7 @@ broken_combination:
  		}
  	}
-+#ifdef IW_FULL
++#if 0
  	if (tb_msg[NL80211_ATTR_FEATURE_FLAGS]) {
  		unsigned int features = nla_get_u32(tb_msg[NL80211_ATTR_FEATURE_FLAGS]);
-@@ -616,6 +625,7 @@ broken_combination:
+@@ -602,6 +611,7 @@ broken_combination:
- 		if (features & NL80211_FEATURE_ND_RANDOM_MAC_ADDR)
+ 		if (features & NL80211_FEATURE_TDLS_CHANNEL_SWITCH)
- 			printf("\tDevice supports randomizing MAC-addr in net-detect scans.\n");
+ 			printf("\tDevice supports TDLS channel switching\n");
+ 	}
 +#endif
- 	if (tb_msg[NL80211_ATTR_TDLS_SUPPORT])
+ 	if (tb_msg[NL80211_ATTR_EXT_FEATURES]) {
- 		printf("\tDevice supports T-DLS.\n");
+ 		struct nlattr *tb = tb_msg[NL80211_ATTR_EXT_FEATURES];
-@@ -740,6 +750,7 @@ TOPLEVEL(list, NULL, NL80211_CMD_GET_WIP
+@@ -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);
-+#ifdef IW_FULL
++#if 0
  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)
-@@ -751,6 +762,7 @@ static int handle_commands(struct nl8021
+ {
- TOPLEVEL(commands, NULL, NL80211_CMD_GET_WIPHY, 0, CIB_NONE, handle_commands,
+@@ -669,6 +680,7 @@ static int handle_commands(struct nl8021
  	 "list all known commands and their decimal & hex value");
-+#endif
+ TOPLEVEL(commands, NULL, NL80211_CMD_GET_WIPHY, 0, CIB_NONE, handle_commands,
  	 "list all known commands and their decimal & hex value");
- static int print_feature_handler(struct nl_msg *msg, void *arg)
++#endif
---- a/scan.c
+ static int print_feature_handler(struct nl_msg *msg, void *arg)
 +++ b/scan.c
-@@ -1197,6 +1197,9 @@ static void print_ht_op(const uint8_t ty
+--- a/scan.c
- 	printf("\t\t * secondary channel offset: %s\n",
++++ b/scan.c
- 		ht_secondary_offset[data[1] & 0x3]);
+@@ -1170,6 +1170,7 @@ static void print_ht_op(const uint8_t ty
- 	printf("\t\t * STA channel width: %s\n", sta_chan_width[(data[1] & 0x4)>>2]);
+ 	printf("\t\t * secondary channel offset: %s\n",
-+#ifndef IW_FULL
+ 		ht_secondary_offset[data[1] & 0x3]);
-+	return;
+ 	printf("\t\t * STA channel width: %s\n", sta_chan_width[(data[1] & 0x4)>>2]);
-+#endif
++	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);
-@@ -1524,6 +1527,14 @@ static void print_ie(const struct ie_pri
+@@ -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), },
  	[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,
-@@ -2026,6 +2031,7 @@ void print_ies(unsigned char *ie, int ie
+@@ -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
++#if 0
  		} else if (ie[0] == 221 /* vendor */) {
  			print_vendor(ie[1], ie + 2, unknown, ptype);
  		} else if (unknown) {
-@@ -2035,6 +2041,7 @@ void print_ies(unsigned char *ie, int ie
+@@ -1977,6 +1981,7 @@ void print_ies(unsigned char *ie, int ie
  			for (i=0; i<ie[1]; i++)
  				printf(" %.2x", ie[2+i]);
  			printf("\n");
 +#endif
+ 		}
  		ielen -= ie[1] + 2;
  		ie += ie[1] + 2;
-@@ -2075,6 +2082,7 @@ static void print_capa_non_dmg(__u16 cap
+@@ -2017,6 +2022,7 @@ static void print_capa_non_dmg(__u16 cap
  		printf(" ESS");
  	if (capa & WLAN_CAPABILITY_IBSS)
  		printf(" IBSS");
-+#ifdef IW_FULL
++#if 0
  	if (capa & WLAN_CAPABILITY_CF_POLLABLE)
  		printf(" CfPollable");
  	if (capa & WLAN_CAPABILITY_CF_POLL_REQUEST)
-@@ -2103,6 +2111,7 @@ static void print_capa_non_dmg(__u16 cap
+@@ -2045,6 +2051,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)
-@@ -2187,8 +2196,10 @@ static int print_bss_handler(struct nl_m
+@@ -2129,8 +2136,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 0
  		if (freq > 45000)
  			is_dmg = true;
 +#endif
+ 	}
  	if (bss[NL80211_BSS_BEACON_INTERVAL])
  		printf("\tbeacon interval: %d TUs\n",
-@@ -2382,6 +2393,7 @@ static int handle_stop_sched_scan(struct
+@@ -2319,6 +2328,7 @@ static int handle_stop_sched_scan(struct
  	return 0;
+ }
-+#ifdef IW_FULL
++#if 0
  COMMAND(scan, sched_start,
  	SCHED_SCAN_OPTIONS,
  	NL80211_CMD_START_SCHED_SCAN, 0, CIB_NETDEV, handle_start_sched_scan,
-@@ -2392,3 +2404,4 @@ COMMAND(scan, sched_start,
+@@ -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
-@@ -289,6 +289,7 @@ static const char *commands[NL80211_CMD_
+@@ -281,6 +281,7 @@ static const char *commands[NL80211_CMD_
  static char cmdbuf[100];
-+#ifdef IW_FULL
++#if 0
  const char *command_name(enum nl80211_commands cmd)
+ {
  	if (cmd <= NL80211_CMD_MAX && commands[cmd])
-@@ -296,6 +297,7 @@ const char *command_name(enum nl80211_co
+@@ -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)
- {
-@@ -434,6 +436,9 @@ int parse_keys(struct nl_msg *msg, char
+ int ieee80211_channel_to_frequency(int chan, enum nl80211_band band)
  	char keybuf[13];
- 	int pos = 0;
+@@ -426,6 +428,7 @@ int parse_keys(struct nl_msg *msg, char
  	char keybuf[13];
-+#ifndef IW_FULL
+ 	int pos = 0;
 +	return 1;
-+#endif
++	return 1;
- 	if (!*argc)
- 		return 1;
---- a/Makefile
+ 	if (!argc)
-+++ b/Makefile
-@@ -31,6 +31,12 @@ OBJS-$(HWSIM) += hwsim.o
+ 		return 1;
- OBJS += $(OBJS-y) $(OBJS-Y)
+--- a/Makefile
 +++ b/Makefile
-+OBJS_FULL = ocb offch cqm wowlan coalesce roc p2p vendor mgmt ap sha256 nan bloom measurements ftm
+@@ -25,6 +25,8 @@ OBJS-$(HWSIM) += hwsim.o
 +ifdef IW_FULL
-+  CFLAGS += -DIW_FULL
+ OBJS += $(OBJS-y) $(OBJS-Y)
 +else
-+  OBJS:=$(filter-out $(patsubst %,%.o,$(OBJS_FULL)),$(OBJS))
++OBJS_DISABLED = ocb offch cqm wowlan coalesce roc p2p ap
-+endif
++OBJS:=$(filter-out $(patsubst %,%.o,$(OBJS_DISABLED)),$(OBJS))
  ALL = iw
  ifeq ($(NO_PKG_CONFIG),)
 --- a/station.c
 +++ b/station.c
-@@ -709,10 +709,12 @@ static int handle_station_set_plink(stru
+@@ -629,10 +629,12 @@ static int handle_station_set_plink(stru
   nla_put_failure:
  	return -ENOBUFS;
+ }
-+#ifdef IW_FULL
++#if 0
  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,
-@@ -807,11 +809,13 @@ static int handle_station_set_mesh_power
+@@ -727,11 +729,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_dump(struct nl80211_state *state,
- 			       struct nl_msg *msg,
---- a/interface.c
-+++ b/interface.c
-@@ -621,9 +621,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,
-@@ -713,6 +715,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"
-@@ -721,3 +724,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);
-+#endif
---- a/phy.c
-+++ b/phy.c
-@@ -359,6 +359,7 @@ static int handle_cac(struct nl80211_sta
- 	return 0;