X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/13f9f9e676c641ea6aa02bf7dc5bdbdd33c61acd..e973943aa376bda8430c3a17f0c8e0f8a8999bd2:/package/wireless-tools/patches/003-we_essential_def.patch?ds=sidebyside diff --git a/package/wireless-tools/patches/003-we_essential_def.patch b/package/wireless-tools/patches/003-we_essential_def.patch index 6b28099aa..f87b15a4b 100644 --- a/package/wireless-tools/patches/003-we_essential_def.patch +++ b/package/wireless-tools/patches/003-we_essential_def.patch @@ -1,6 +1,47 @@ --- a/iwlist.c +++ b/iwlist.c -@@ -1302,7 +1302,6 @@ print_pm_info(int skfd, +@@ -58,7 +58,6 @@ typedef struct iw_auth_descr + * Maybe this should go in iwlib.c ? + */ + +-#ifndef WE_ESSENTIAL + #define IW_ARRAY_LEN(x) (sizeof(x)/sizeof((x)[0])) + + //static const struct iwmask_name iw_enc_mode_name[] = { +@@ -161,11 +160,8 @@ static const char * iw_ie_key_mgmt_name[ + }; + #define IW_IE_KEY_MGMT_NUM IW_ARRAY_LEN(iw_ie_key_mgmt_name) + +-#endif /* WE_ESSENTIAL */ +- + /************************* WPA SUBROUTINES *************************/ + +-#ifndef WE_ESSENTIAL + /*------------------------------------------------------------------*/ + /* + * Print all names corresponding to a mask. +@@ -431,7 +427,6 @@ iw_print_gen_ie(unsigned char * buffer, + offset += buffer[offset+1] + 2; + } + } +-#endif /* WE_ESSENTIAL */ + + /***************************** SCANNING *****************************/ + /* +@@ -585,12 +580,10 @@ print_scanning_token(struct stream_descr + &event->u.qual, iw_range, has_range); + printf(" %s\n", buffer); + break; +-#ifndef WE_ESSENTIAL + case IWEVGENIE: + /* Informations Elements are complex, let's do only some of them */ + iw_print_gen_ie(event->u.data.pointer, event->u.data.length); + break; +-#endif /* WE_ESSENTIAL */ + case IWEVCUSTOM: + { + char custom[IW_CUSTOM_MAX+1]; +@@ -1302,7 +1295,6 @@ print_pm_info(int skfd, return(0); } @@ -8,7 +49,7 @@ /************************** TRANSMIT POWER **************************/ /*------------------------------------------------------------------*/ -@@ -1405,6 +1404,7 @@ print_txpower_info(int skfd, +@@ -1405,6 +1397,7 @@ print_txpower_info(int skfd, return(0); } @@ -16,7 +57,7 @@ /*********************** RETRY LIMIT/LIFETIME ***********************/ /*------------------------------------------------------------------*/ -@@ -2060,8 +2060,8 @@ static const struct iwlist_entry iwlist_ +@@ -2060,8 +2053,8 @@ static const struct iwlist_entry iwlist_ { "encryption", print_keys_info, 0, NULL }, { "keys", print_keys_info, 0, NULL }, { "power", print_pm_info, 0, NULL }, @@ -103,22 +144,6 @@ /* Display encryption information */ /* Note : we display only the "current" key, use iwlist to list all keys */ -@@ -995,6 +995,7 @@ set_enc_info(int skfd, - return(i); - } - -+#ifndef WE_ESSENTIAL - /*------------------------------------------------------------------*/ - /* - * Set Power Management -@@ -1111,7 +1112,6 @@ set_power_info(int skfd, - return(i); - } - --#ifndef WE_ESSENTIAL - /*------------------------------------------------------------------*/ - /* - * Set Nickname @@ -1196,6 +1196,7 @@ set_nwid_info(int skfd, /* 1 arg */ return(1); @@ -151,15 +176,7 @@ /*------------------------------------------------------------------*/ /* * Set Modulation -@@ -1712,28 +1716,28 @@ static const struct iwconfig_entry iwcon - "Set Encode", "{NNNN-NNNN|off}" }, - { "key", set_enc_info, 1, SIOCSIWENCODE, - "Set Encode", "{NNNN-NNNN|off}" }, -+#ifndef WE_ESSENTIAL - { "power", set_power_info, 1, SIOCSIWPOWER, - "Set Power Management", "{period N|timeout N|saving N|off}" }, --#ifndef WE_ESSENTIAL - { "nickname", set_nick_info, 1, SIOCSIWNICKN, +@@ -1719,21 +1723,21 @@ static const struct iwconfig_entry iwcon "Set Nickname", "NNN" }, { "nwid", set_nwid_info, 1, SIOCSIWNWID, "Set NWID", "{NN|on|off}" },