Inicio Explorar Axuda
Rexistro Iniciar sesión
FreifunkHochstift
/
ffho-site
3
0
Fork 1
Ficheiros Incidencias 0 Pull Requests 0
Árbore: d87078e861
Ramas Etiquetas
ffho-site
/
patches
/
0002-openwrt-remove-iw-patch.patch

0002-openwrt-remove-iw-patch.patch 10 KB
Histórico Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283 
  1. From: Karsten Böddeker <freifunk@kb-light.de>
    2. 

  2. Date: Sun, 17 Apr 2016 23:06:09 +0200
    3. 

  3. Subject: [PATCH] openwrt: remove iw patch
    4. 

  4. 

  5. ---
    6. 

  6.  .../openwrt/1001-iw-remove-200-reduce_size.patch   | 265 +++++++++++++++++++++
    7. 

  7.  1 file changed, 265 insertions(+)
    8. 

  8.  create mode 100644 patches/openwrt/1001-iw-remove-200-reduce_size.patch
    9. 

  9. 

  10. diff --git a/patches/openwrt/1001-iw-remove-200-reduce_size.patch b/patches/openwrt/1001-iw-remove-200-reduce_size.patch
    11. 

  11. new file mode 100644
    12. 

  12. index 0000000..6f59663
    13. 

  13. --- /dev/null
    14. 

  14. +++ b/patches/openwrt/1001-iw-remove-200-reduce_size.patch
    15. 

  15. @@ -0,0 +1,265 @@
    16. 

  16. +From: Karsten Böddeker <freifunk@kb-light.de>
    17. 

  17. +Date: Sun, 17 Apr 2016 22:45:50 +0200
    18. 

  18. +Subject: iw: remove 200-reduce_size.patch
    19. 

  19. +
    20. 

  20. +diff --git a/package/network/utils/iw/patches/200-reduce_size.patch b/package/network/utils/iw/patches/200-reduce_size.patch
    21. 

  21. +deleted file mode 100644
    22. 

  22. +index dea24fb..0000000
    23. 

  23. +--- a/package/network/utils/iw/patches/200-reduce_size.patch
    24. 

  24. ++++ /dev/null
    25. 

  25. +@@ -1,255 +0,0 @@
    26. 

  26. +---- a/Makefile
    27. 

  27. +-+++ b/Makefile
    28. 

  28. +-@@ -15,8 +15,8 @@ CFLAGS += -Wall -Wundef -Wstrict-prototy
    29. 

  29. +- OBJS = iw.o genl.o event.o info.o phy.o \
    30. 

  30. +- 	interface.o ibss.o station.o survey.o util.o ocb.o \
    31. 

  31. +- 	mesh.o mpath.o mpp.o scan.o reg.o version.o \
    32. 

  32. +--	reason.o status.o connect.o link.o offch.o ps.o cqm.o \
    33. 

  33. +--	bitrate.o wowlan.o coalesce.o roc.o p2p.o vendor.o
    34. 

  34. +-+	reason.o status.o link.o offch.o ps.o cqm.o \
    35. 

  35. +-+	bitrate.o vendor.o
    36. 

  36. +- OBJS += sections.o
    37. 

  37. +- 
    38. 

  38. +- OBJS-$(HWSIM) += hwsim.o
    39. 

  39. +---- a/event.c
    40. 

  40. +-+++ b/event.c
    41. 

  41. +-@@ -342,6 +342,7 @@ static int print_event(struct nl_msg *ms
    42. 

  42. +- 	}
    43. 

  43. +- 
    44. 

  44. +- 	switch (gnlh->cmd) {
    45. 

  45. +-+#if 0
    46. 

  46. +- 	case NL80211_CMD_NEW_WIPHY:
    47. 

  47. +- 		printf("renamed to %s\n", nla_get_string(tb[NL80211_ATTR_WIPHY_NAME]));
    48. 

  48. +- 		break;
    49. 

  49. +-@@ -376,6 +377,7 @@ static int print_event(struct nl_msg *ms
    50. 

  50. +- 	case NL80211_CMD_SCHED_SCAN_RESULTS:
    51. 

  51. +- 		printf("got scheduled scan results\n");
    52. 

  52. +- 		break;
    53. 

  53. +-+#endif
    54. 

  54. +- 	case NL80211_CMD_REG_CHANGE:
    55. 

  55. +- 		printf("regulatory domain change: ");
    56. 

  56. +- 
    57. 

  57. +-@@ -454,6 +456,7 @@ static int print_event(struct nl_msg *ms
    58. 

  58. +- 		mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC]));
    59. 

  59. +- 		printf("del station %s\n", macbuf);
    60. 

  60. +- 		break;
    61. 

  61. +-+#if 0
    62. 

  62. +- 	case NL80211_CMD_JOIN_IBSS:
    63. 

  63. +- 		mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC]));
    64. 

  64. +- 		printf("IBSS %s joined\n", macbuf);
    65. 

  65. +-@@ -610,9 +613,9 @@ static int print_event(struct nl_msg *ms
    66. 

  66. +- 	case NL80211_CMD_DEL_WIPHY:
    67. 

  67. +- 		printf("delete wiphy\n");
    68. 

  68. +- 		break;
    69. 

  69. +-+#endif
    70. 

  70. +- 	default:
    71. 

  71. +--		printf("unknown event %d (%s)\n",
    72. 

  72. +--		       gnlh->cmd, command_name(gnlh->cmd));
    73. 

  73. +-+		printf("unknown event %d\n", gnlh->cmd);
    74. 

  74. +- 		break;
    75. 

  75. +- 	}
    76. 

  76. +- 
    77. 

  77. +---- a/info.c
    78. 

  78. +-+++ b/info.c
    79. 

  79. +-@@ -219,6 +219,7 @@ next:
    80. 

  80. +- 				}
    81. 

  81. +- 			}
    82. 

  82. +- 
    83. 

  83. +-+#if 0
    84. 

  84. +- 			if (tb_band[NL80211_BAND_ATTR_RATES]) {
    85. 

  85. +- 			printf("\t\tBitrates (non-HT):\n");
    86. 

  86. +- 			nla_for_each_nested(nl_rate, tb_band[NL80211_BAND_ATTR_RATES], rem_rate) {
    87. 

  87. +-@@ -235,6 +236,7 @@ next:
    88. 

  88. +- 				printf("\n");
    89. 

  89. +- 			}
    90. 

  90. +- 			}
    91. 

  91. +-+#endif
    92. 

  92. +- 		}
    93. 

  93. +- 	}
    94. 

  94. +- 
    95. 

  95. +-@@ -291,6 +293,7 @@ next:
    96. 

  96. +- 		printf("\tCoverage class: %d (up to %dm)\n", coverage, 450 * coverage);
    97. 

  97. +- 	}
    98. 

  98. +- 
    99. 

  99. +-+#if 0
    100. 

  100. +- 	if (tb_msg[NL80211_ATTR_CIPHER_SUITES]) {
    101. 

  101. +- 		int num = nla_len(tb_msg[NL80211_ATTR_CIPHER_SUITES]) / sizeof(__u32);
    102. 

  102. +- 		int i;
    103. 

  103. +-@@ -302,6 +305,7 @@ next:
    104. 

  104. +- 					cipher_name(ciphers[i]));
    105. 

  105. +- 		}
    106. 

  106. +- 	}
    107. 

  107. +-+#endif
    108. 

  108. +- 
    109. 

  109. +- 	if (tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX] &&
    110. 

  110. +- 	    tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX])
    111. 

  111. +-@@ -321,11 +325,13 @@ next:
    112. 

  112. +- 			printf("\t\t * %s\n", iftype_name(nla_type(nl_mode)));
    113. 

  113. +- 	}
    114. 

  114. +- 
    115. 

  115. +-+#if 0
    116. 

  116. +- 	if (tb_msg[NL80211_ATTR_SOFTWARE_IFTYPES]) {
    117. 

  117. +- 		printf("\tsoftware interface modes (can always be added):\n");
    118. 

  118. +- 		nla_for_each_nested(nl_mode, tb_msg[NL80211_ATTR_SOFTWARE_IFTYPES], rem_mode)
    119. 

  119. +- 			printf("\t\t * %s\n", iftype_name(nla_type(nl_mode)));
    120. 

  120. +- 	}
    121. 

  121. +-+#endif
    122. 

  122. +- 
    123. 

  123. +- 	if (tb_msg[NL80211_ATTR_INTERFACE_COMBINATIONS]) {
    124. 

  124. +- 		struct nlattr *nl_combi;
    125. 

  125. +-@@ -422,6 +428,7 @@ broken_combination:
    126. 

  126. +- 			printf("\tinterface combinations are not supported\n");
    127. 

  127. +- 	}
    128. 

  128. +- 
    129. 

  129. +-+#if 0
    130. 

  130. +- 	if (tb_msg[NL80211_ATTR_SUPPORTED_COMMANDS]) {
    131. 

  131. +- 		printf("\tSupported commands:\n");
    132. 

  132. +- 		nla_for_each_nested(nl_cmd, tb_msg[NL80211_ATTR_SUPPORTED_COMMANDS], rem_cmd)
    133. 

  133. +-@@ -518,6 +525,7 @@ broken_combination:
    134. 

  134. +- 				printf("\t\t * wake up on TCP connection\n");
    135. 

  135. +- 		}
    136. 

  136. +- 	}
    137. 

  137. +-+#endif
    138. 

  138. +- 
    139. 

  139. +- 	if (tb_msg[NL80211_ATTR_ROAM_SUPPORT])
    140. 

  140. +- 		printf("\tDevice supports roaming.\n");
    141. 

  141. +-@@ -554,6 +562,7 @@ broken_combination:
    142. 

  142. +- 		}
    143. 

  143. +- 	}
    144. 

  144. +- 
    145. 

  145. +-+#if 0
    146. 

  146. +- 	if (tb_msg[NL80211_ATTR_FEATURE_FLAGS]) {
    147. 

  147. +- 		unsigned int features = nla_get_u32(tb_msg[NL80211_ATTR_FEATURE_FLAGS]);
    148. 

  148. +- 
    149. 

  149. +-@@ -612,6 +621,7 @@ broken_combination:
    150. 

  150. +- 		if (features & NL80211_FEATURE_TDLS_CHANNEL_SWITCH)
    151. 

  151. +- 			printf("\tDevice supports TDLS channel switching\n");
    152. 

  152. +- 	}
    153. 

  153. +-+#endif
    154. 

  154. +- 
    155. 

  155. +- 	if (tb_msg[NL80211_ATTR_EXT_FEATURES]) {
    156. 

  156. +- 		struct nlattr *tb = tb_msg[NL80211_ATTR_EXT_FEATURES];
    157. 

  157. +-@@ -668,6 +678,7 @@ TOPLEVEL(list, NULL, NL80211_CMD_GET_WIP
    158. 

  158. +- 	 "List all wireless devices and their capabilities.");
    159. 

  159. +- TOPLEVEL(phy, NULL, NL80211_CMD_GET_WIPHY, NLM_F_DUMP, CIB_NONE, handle_info, NULL);
    160. 

  160. +- 
    161. 

  161. +-+#if 0
    162. 

  162. +- static int handle_commands(struct nl80211_state *state, struct nl_msg *msg,
    163. 

  163. +- 			   int argc, char **argv, enum id_input id)
    164. 

  164. +- {
    165. 

  165. +-@@ -679,6 +690,7 @@ static int handle_commands(struct nl8021
    166. 

  166. +- }
    167. 

  167. +- TOPLEVEL(commands, NULL, NL80211_CMD_GET_WIPHY, 0, CIB_NONE, handle_commands,
    168. 

  168. +- 	 "list all known commands and their decimal & hex value");
    169. 

  169. +-+#endif
    170. 

  170. +- 
    171. 

  171. +- static int print_feature_handler(struct nl_msg *msg, void *arg)
    172. 

  172. +- {
    173. 

  173. +---- a/scan.c
    174. 

  174. +-+++ b/scan.c
    175. 

  175. +-@@ -1081,6 +1081,7 @@ static void print_ht_op(const uint8_t ty
    176. 

  176. +- 	printf("\t\t * secondary channel offset: %s\n",
    177. 

  177. +- 		ht_secondary_offset[data[1] & 0x3]);
    178. 

  178. +- 	printf("\t\t * STA channel width: %s\n", sta_chan_width[(data[1] & 0x4)>>2]);
    179. 

  179. +-+	return;
    180. 

  180. +- 	printf("\t\t * RIFS: %d\n", (data[1] & 0x8)>>3);
    181. 

  181. +- 	printf("\t\t * HT protection: %s\n", protection[data[2] & 0x3]);
    182. 

  182. +- 	printf("\t\t * non-GF present: %d\n", (data[2] & 0x4) >> 2);
    183. 

  183. +-@@ -1312,6 +1313,13 @@ static void print_ie(const struct ie_pri
    184. 

  184. +- 
    185. 

  185. +- static const struct ie_print ieprinters[] = {
    186. 

  186. +- 	[0] = { "SSID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), },
    187. 

  187. +-+	[45] = { "HT capabilities", print_ht_capa, 26, 26, BIT(PRINT_SCAN), },
    188. 

  188. +-+	[48] = { "RSN", print_rsn, 2, 255, BIT(PRINT_SCAN), },
    189. 

  189. +-+	[61] = { "HT operation", print_ht_op, 22, 22, BIT(PRINT_SCAN), },
    190. 

  190. +-+	[62] = { "Secondary Channel Offset", print_secchan_offs, 1, 1, BIT(PRINT_SCAN), },
    191. 

  191. +-+	[191] = { "VHT capabilities", print_vht_capa, 12, 255, BIT(PRINT_SCAN), },
    192. 

  192. +-+	[192] = { "VHT operation", print_vht_oper, 5, 255, BIT(PRINT_SCAN), },
    193. 

  193. +-+#if 0
    194. 

  194. +- 	[1] = { "Supported rates", print_supprates, 0, 255, BIT(PRINT_SCAN), },
    195. 

  195. +- 	[3] = { "DS Parameter set", print_ds, 1, 1, BIT(PRINT_SCAN), },
    196. 

  196. +- 	[5] = { "TIM", print_tim, 4, 255, BIT(PRINT_SCAN), },
    197. 

  197. +-@@ -1321,14 +1329,8 @@ static const struct ie_print ieprinters[
    198. 

  198. +- 	[32] = { "Power constraint", print_powerconstraint, 1, 1, BIT(PRINT_SCAN), },
    199. 

  199. +- 	[35] = { "TPC report", print_tpcreport, 2, 2, BIT(PRINT_SCAN), },
    200. 

  200. +- 	[42] = { "ERP", print_erp, 1, 255, BIT(PRINT_SCAN), },
    201. 

  201. +--	[45] = { "HT capabilities", print_ht_capa, 26, 26, BIT(PRINT_SCAN), },
    202. 

  202. +- 	[47] = { "ERP D4.0", print_erp, 1, 255, BIT(PRINT_SCAN), },
    203. 

  203. +- 	[74] = { "Overlapping BSS scan params", print_obss_scan_params, 14, 255, BIT(PRINT_SCAN), },
    204. 

  204. +--	[61] = { "HT operation", print_ht_op, 22, 22, BIT(PRINT_SCAN), },
    205. 

  205. +--	[62] = { "Secondary Channel Offset", print_secchan_offs, 1, 1, BIT(PRINT_SCAN), },
    206. 

  206. +--	[191] = { "VHT capabilities", print_vht_capa, 12, 255, BIT(PRINT_SCAN), },
    207. 

  207. +--	[192] = { "VHT operation", print_vht_oper, 5, 255, BIT(PRINT_SCAN), },
    208. 

  208. +--	[48] = { "RSN", print_rsn, 2, 255, BIT(PRINT_SCAN), },
    209. 

  209. +- 	[50] = { "Extended supported rates", print_supprates, 0, 255, BIT(PRINT_SCAN), },
    210. 

  210. +- 	[113] = { "MESH Configuration", print_mesh_conf, 7, 7, BIT(PRINT_SCAN), },
    211. 

  211. +- 	[114] = { "MESH ID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), },
    212. 

  212. +-@@ -1336,6 +1338,7 @@ static const struct ie_print ieprinters[
    213. 

  213. +- 	[107] = { "802.11u Interworking", print_interworking, 0, 255, BIT(PRINT_SCAN), },
    214. 

  214. +- 	[108] = { "802.11u Advertisement", print_11u_advert, 0, 255, BIT(PRINT_SCAN), },
    215. 

  215. +- 	[111] = { "802.11u Roaming Consortium", print_11u_rcon, 0, 255, BIT(PRINT_SCAN), },
    216. 

  216. +-+#endif
    217. 

  217. +- };
    218. 

  218. +- 
    219. 

  219. +- static void print_wifi_wpa(const uint8_t type, uint8_t len, const uint8_t *data)
    220. 

  220. +-@@ -1767,6 +1770,7 @@ void print_ies(unsigned char *ie, int ie
    221. 

  221. +- 		    ieprinters[ie[0]].name &&
    222. 

  222. +- 		    ieprinters[ie[0]].flags & BIT(ptype)) {
    223. 

  223. +- 			print_ie(&ieprinters[ie[0]], ie[0], ie[1], ie + 2);
    224. 

  224. +-+#if 0
    225. 

  225. +- 		} else if (ie[0] == 221 /* vendor */) {
    226. 

  226. +- 			print_vendor(ie[1], ie + 2, unknown, ptype);
    227. 

  227. +- 		} else if (unknown) {
    228. 

  228. +-@@ -1776,6 +1780,7 @@ void print_ies(unsigned char *ie, int ie
    229. 

  229. +- 			for (i=0; i<ie[1]; i++)
    230. 

  230. +- 				printf(" %.2x", ie[2+i]);
    231. 

  231. +- 			printf("\n");
    232. 

  232. +-+#endif
    233. 

  233. +- 		}
    234. 

  234. +- 		ielen -= ie[1] + 2;
    235. 

  235. +- 		ie += ie[1] + 2;
    236. 

  236. +-@@ -1816,6 +1821,7 @@ static void print_capa_non_dmg(__u16 cap
    237. 

  237. +- 		printf(" ESS");
    238. 

  238. +- 	if (capa & WLAN_CAPABILITY_IBSS)
    239. 

  239. +- 		printf(" IBSS");
    240. 

  240. +-+#if 0
    241. 

  241. +- 	if (capa & WLAN_CAPABILITY_CF_POLLABLE)
    242. 

  242. +- 		printf(" CfPollable");
    243. 

  243. +- 	if (capa & WLAN_CAPABILITY_CF_POLL_REQUEST)
    244. 

  244. +-@@ -1844,6 +1850,7 @@ static void print_capa_non_dmg(__u16 cap
    245. 

  245. +- 		printf(" DelayedBACK");
    246. 

  246. +- 	if (capa & WLAN_CAPABILITY_IMM_BACK)
    247. 

  247. +- 		printf(" ImmediateBACK");
    248. 

  248. +-+#endif
    249. 

  249. +- }
    250. 

  250. +- 
    251. 

  251. +- static int print_bss_handler(struct nl_msg *msg, void *arg)
    252. 

  252. +-@@ -1922,8 +1929,10 @@ static int print_bss_handler(struct nl_m
    253. 

  253. +- 	if (bss[NL80211_BSS_FREQUENCY]) {
    254. 

  254. +- 		int freq = nla_get_u32(bss[NL80211_BSS_FREQUENCY]);
    255. 

  255. +- 		printf("\tfreq: %d\n", freq);
    256. 

  256. +-+#if 0
    257. 

  257. +- 		if (freq > 45000)
    258. 

  258. +- 			is_dmg = true;
    259. 

  259. +-+#endif
    260. 

  260. +- 	}
    261. 

  261. +- 	if (bss[NL80211_BSS_BEACON_INTERVAL])
    262. 

  262. +- 		printf("\tbeacon interval: %d TUs\n",
    263. 

  263. +---- a/util.c
    264. 

  264. +-+++ b/util.c
    265. 

  265. +-@@ -267,6 +267,7 @@ static const char *commands[NL80211_CMD_
    266. 

  266. +- 
    267. 

  267. +- static char cmdbuf[100];
    268. 

  268. +- 
    269. 

  269. +-+#if 0
    270. 

  270. +- const char *command_name(enum nl80211_commands cmd)
    271. 

  271. +- {
    272. 

  272. +- 	if (cmd <= NL80211_CMD_MAX && commands[cmd])
    273. 

  273. +-@@ -274,6 +275,7 @@ const char *command_name(enum nl80211_co
    274. 

  274. +- 	sprintf(cmdbuf, "Unknown command (%d)", cmd);
    275. 

  275. +- 	return cmdbuf;
    276. 

  276. +- }
    277. 

  277. +-+#endif
    278. 

  278. +- 
    279. 

  279. +- int ieee80211_channel_to_frequency(int chan, enum nl80211_band band)
    280. 

  280. +- {
    281. 

  281. -- 
    282. 

  282. 2.1.4
    283. 

  283.