Changeset 47777


Ignore:
Timestamp:
2015-12-05T10:51:39+01:00 (2 years ago)
Author:
nbd
Message:

iw: update to version 4.3

Signed-off-by: Sven Eckelmann <sven@…>

Location:
trunk/package/network/utils/iw
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/network/utils/iw/Makefile

    r46534 r47777  
    99 
    1010PKG_NAME:=iw 
    11 PKG_VERSION:=4.1 
     11PKG_VERSION:=4.3 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz 
    1515PKG_SOURCE_URL:=https://www.kernel.org/pub/software/network/iw 
    16 PKG_MD5SUM:=3a292dd342bb88e30e74015ae6fe1e54 
     16PKG_MD5SUM:=7adec72e91ebdd9c55429fa34a23a6f5 
    1717 
    1818PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org> 
  • trunk/package/network/utils/iw/patches/001-nl80211_h_sync.patch

    r46534 r47777  
    2020  
    2121        __NL80211_ATTR_AFTER_LAST, 
    22 @@ -2620,16 +2625,17 @@ enum nl80211_band_attr { 
    23   *     an indoor surroundings, i.e., it is connected to AC power (and not 
    24   *     through portable DC inverters) or is under the control of a master 
    25   *     that is acting as an AP and is connected to AC power. 
    26 - * @NL80211_FREQUENCY_ATTR_GO_CONCURRENT: GO operation is allowed on this 
    27 + * @NL80211_FREQUENCY_ATTR_IR_CONCURRENT: IR operation is allowed on this 
    28   *     channel if it's connected concurrently to a BSS on the same channel on 
    29   *     the 2 GHz band or to a channel in the same UNII band (on the 5 GHz 
    30 - *     band), and IEEE80211_CHAN_RADAR is not set. Instantiating a GO on a 
    31 - *     channel that has the GO_CONCURRENT attribute set can be done when there 
    32 - *     is a clear assessment that the device is operating under the guidance of 
    33 - *     an authorized master, i.e., setting up a GO while the device is also 
    34 - *     connected to an AP with DFS and radar detection on the UNII band (it is 
    35 - *     up to user-space, i.e., wpa_supplicant to perform the required 
    36 - *     verifications) 
    37 + *     band), and IEEE80211_CHAN_RADAR is not set. Instantiating a GO or TDLS 
    38 + *     off-channel on a channel that has the IR_CONCURRENT attribute set can be 
    39 + *     done when there is a clear assessment that the device is operating under 
    40 + *     the guidance of an authorized master, i.e., setting up a GO or TDLS 
    41 + *     off-channel while the device is also connected to an AP with DFS and 
    42 + *     radar detection on the UNII band (it is up to user-space, i.e., 
    43 + *     wpa_supplicant to perform the required verifications). Using this 
    44 + *     attribute for IR is disallowed for master interfaces (IBSS, AP). 
    45   * @NL80211_FREQUENCY_ATTR_NO_20MHZ: 20 MHz operation is not allowed 
    46   *     on this channel in current regulatory domain. 
    47   * @NL80211_FREQUENCY_ATTR_NO_10MHZ: 10 MHz operation is not allowed 
    48 @@ -2641,7 +2647,7 @@ enum nl80211_band_attr { 
    49   * See https://apps.fcc.gov/eas/comments/GetPublishedDocument.html?id=327&tn=528122 
    50   * for more information on the FCC description of the relaxations allowed 
    51   * by NL80211_FREQUENCY_ATTR_INDOOR_ONLY and 
    52 - * NL80211_FREQUENCY_ATTR_GO_CONCURRENT. 
    53 + * NL80211_FREQUENCY_ATTR_IR_CONCURRENT. 
    54   */ 
    55  enum nl80211_frequency_attr { 
    56         __NL80211_FREQUENCY_ATTR_INVALID, 
    57 @@ -2659,7 +2665,7 @@ enum nl80211_frequency_attr { 
    58         NL80211_FREQUENCY_ATTR_NO_160MHZ, 
    59         NL80211_FREQUENCY_ATTR_DFS_CAC_TIME, 
    60         NL80211_FREQUENCY_ATTR_INDOOR_ONLY, 
    61 -       NL80211_FREQUENCY_ATTR_GO_CONCURRENT, 
    62 +       NL80211_FREQUENCY_ATTR_IR_CONCURRENT, 
    63         NL80211_FREQUENCY_ATTR_NO_20MHZ, 
    64         NL80211_FREQUENCY_ATTR_NO_10MHZ, 
    65   
    66 @@ -2672,6 +2678,8 @@ enum nl80211_frequency_attr { 
    67  #define NL80211_FREQUENCY_ATTR_PASSIVE_SCAN    NL80211_FREQUENCY_ATTR_NO_IR 
    68  #define NL80211_FREQUENCY_ATTR_NO_IBSS         NL80211_FREQUENCY_ATTR_NO_IR 
    69  #define NL80211_FREQUENCY_ATTR_NO_IR           NL80211_FREQUENCY_ATTR_NO_IR 
    70 +#define NL80211_FREQUENCY_ATTR_GO_CONCURRENT \ 
    71 +                                       NL80211_FREQUENCY_ATTR_IR_CONCURRENT 
    72   
    73  /** 
    74   * enum nl80211_bitrate_attr - bitrate attributes 
    75 @@ -2830,7 +2838,7 @@ enum nl80211_sched_scan_match_attr { 
    76   * @NL80211_RRF_AUTO_BW: maximum available bandwidth should be calculated 
    77   *     base on contiguous rules and wider channels will be allowed to cross 
    78   *     multiple contiguous/overlapping frequency ranges. 
    79 - * @NL80211_RRF_GO_CONCURRENT: See &NL80211_FREQUENCY_ATTR_GO_CONCURRENT 
    80 + * @NL80211_RRF_IR_CONCURRENT: See &NL80211_FREQUENCY_ATTR_IR_CONCURRENT 
    81   * @NL80211_RRF_NO_HT40MINUS: channels can't be used in HT40- operation 
    82   * @NL80211_RRF_NO_HT40PLUS: channels can't be used in HT40+ operation 
    83   * @NL80211_RRF_NO_80MHZ: 80MHz operation not allowed 
    84 @@ -2847,7 +2855,7 @@ enum nl80211_reg_rule_flags { 
    85         NL80211_RRF_NO_IR               = 1<<7, 
    86         __NL80211_RRF_NO_IBSS           = 1<<8, 
    87         NL80211_RRF_AUTO_BW             = 1<<11, 
    88 -       NL80211_RRF_GO_CONCURRENT       = 1<<12, 
    89 +       NL80211_RRF_IR_CONCURRENT       = 1<<12, 
    90         NL80211_RRF_NO_HT40MINUS        = 1<<13, 
    91         NL80211_RRF_NO_HT40PLUS         = 1<<14, 
    92         NL80211_RRF_NO_80MHZ            = 1<<15, 
    93 @@ -2859,6 +2867,7 @@ enum nl80211_reg_rule_flags { 
    94  #define NL80211_RRF_NO_IR              NL80211_RRF_NO_IR 
    95  #define NL80211_RRF_NO_HT40            (NL80211_RRF_NO_HT40MINUS |\ 
    96                                          NL80211_RRF_NO_HT40PLUS) 
    97 +#define NL80211_RRF_GO_CONCURRENT      NL80211_RRF_IR_CONCURRENT 
    98   
    99  /* For backport compatibility with older userspace */ 
    100  #define NL80211_RRF_NO_IR_ALL          (NL80211_RRF_NO_IR | __NL80211_RRF_NO_IBSS) 
  • trunk/package/network/utils/iw/patches/120-antenna_gain.patch

    r46534 r47777  
    11--- a/phy.c 
    22+++ b/phy.c 
    3 @@ -532,3 +532,31 @@ COMMAND(set, antenna, "<bitmap> | all | 
     3@@ -524,3 +524,30 @@ COMMAND(set, antenna, "<bitmap> | all | 
    44        NL80211_CMD_SET_WIPHY, 0, CIB_PHY, handle_antenna, 
    55        "Set a bitmap of allowed antennas to use for TX and RX.\n" 
     
    77+ 
    88+static int handle_antenna_gain(struct nl80211_state *state, 
    9 +                              struct nl_cb *cb, 
    109+                              struct nl_msg *msg, 
    1110+                              int argc, char **argv, 
  • trunk/package/network/utils/iw/patches/200-reduce_size.patch

    r47006 r47777  
    1212  
    1313 OBJS-$(HWSIM) += hwsim.o 
     14--- a/event.c 
     15+++ b/event.c 
     16@@ -342,6 +342,7 @@ static int print_event(struct nl_msg *ms 
     17        } 
     18  
     19        switch (gnlh->cmd) { 
     20+#if 0 
     21        case NL80211_CMD_NEW_WIPHY: 
     22                printf("renamed to %s\n", nla_get_string(tb[NL80211_ATTR_WIPHY_NAME])); 
     23                break; 
     24@@ -376,6 +377,7 @@ static int print_event(struct nl_msg *ms 
     25        case NL80211_CMD_SCHED_SCAN_RESULTS: 
     26                printf("got scheduled scan results\n"); 
     27                break; 
     28+#endif 
     29        case NL80211_CMD_REG_CHANGE: 
     30                printf("regulatory domain change: "); 
     31  
     32@@ -454,6 +456,7 @@ static int print_event(struct nl_msg *ms 
     33                mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC])); 
     34                printf("del station %s\n", macbuf); 
     35                break; 
     36+#if 0 
     37        case NL80211_CMD_JOIN_IBSS: 
     38                mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC])); 
     39                printf("IBSS %s joined\n", macbuf); 
     40@@ -610,9 +613,9 @@ static int print_event(struct nl_msg *ms 
     41        case NL80211_CMD_DEL_WIPHY: 
     42                printf("delete wiphy\n"); 
     43                break; 
     44+#endif 
     45        default: 
     46-               printf("unknown event %d (%s)\n", 
     47-                      gnlh->cmd, command_name(gnlh->cmd)); 
     48+               printf("unknown event %d\n", gnlh->cmd); 
     49                break; 
     50        } 
     51  
    1452--- a/info.c 
    1553+++ b/info.c 
     
    92130        if (tb_msg[NL80211_ATTR_EXT_FEATURES]) { 
    93131                struct nlattr *tb = tb_msg[NL80211_ATTR_EXT_FEATURES]; 
    94 @@ -669,6 +679,7 @@ TOPLEVEL(list, NULL, NL80211_CMD_GET_WIP 
     132@@ -668,6 +678,7 @@ TOPLEVEL(list, NULL, NL80211_CMD_GET_WIP 
    95133         "List all wireless devices and their capabilities."); 
    96134 TOPLEVEL(phy, NULL, NL80211_CMD_GET_WIPHY, NLM_F_DUMP, CIB_NONE, handle_info, NULL); 
    97135  
    98136+#if 0 
    99  static int handle_commands(struct nl80211_state *state, 
    100                            struct nl_cb *cb, struct nl_msg *msg, 
     137 static int handle_commands(struct nl80211_state *state, struct nl_msg *msg, 
    101138                           int argc, char **argv, enum id_input id) 
    102 @@ -681,6 +692,7 @@ static int handle_commands(struct nl8021 
     139 { 
     140@@ -679,6 +690,7 @@ static int handle_commands(struct nl8021 
    103141 } 
    104142 TOPLEVEL(commands, NULL, NL80211_CMD_GET_WIPHY, 0, CIB_NONE, handle_commands, 
     
    110148--- a/scan.c 
    111149+++ b/scan.c 
    112 @@ -1080,6 +1080,7 @@ static void print_ht_op(const uint8_t ty 
     150@@ -1081,6 +1081,7 @@ static void print_ht_op(const uint8_t ty 
    113151        printf("\t\t * secondary channel offset: %s\n", 
    114152                ht_secondary_offset[data[1] & 0x3]); 
     
    118156        printf("\t\t * HT protection: %s\n", protection[data[2] & 0x3]); 
    119157        printf("\t\t * non-GF present: %d\n", (data[2] & 0x4) >> 2); 
    120 @@ -1311,6 +1312,13 @@ static void print_ie(const struct ie_pri 
     158@@ -1312,6 +1313,13 @@ static void print_ie(const struct ie_pri 
    121159  
    122160 static const struct ie_print ieprinters[] = { 
     
    132170        [3] = { "DS Parameter set", print_ds, 1, 1, BIT(PRINT_SCAN), }, 
    133171        [5] = { "TIM", print_tim, 4, 255, BIT(PRINT_SCAN), }, 
    134 @@ -1320,14 +1328,8 @@ static const struct ie_print ieprinters[ 
     172@@ -1321,14 +1329,8 @@ static const struct ie_print ieprinters[ 
    135173        [32] = { "Power constraint", print_powerconstraint, 1, 1, BIT(PRINT_SCAN), }, 
    136174        [35] = { "TPC report", print_tpcreport, 2, 2, BIT(PRINT_SCAN), }, 
     
    147185        [113] = { "MESH Configuration", print_mesh_conf, 7, 7, BIT(PRINT_SCAN), }, 
    148186        [114] = { "MESH ID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), }, 
    149 @@ -1335,6 +1337,7 @@ static const struct ie_print ieprinters[ 
     187@@ -1336,6 +1338,7 @@ static const struct ie_print ieprinters[ 
    150188        [107] = { "802.11u Interworking", print_interworking, 0, 255, BIT(PRINT_SCAN), }, 
    151189        [108] = { "802.11u Advertisement", print_11u_advert, 0, 255, BIT(PRINT_SCAN), }, 
     
    155193  
    156194 static void print_wifi_wpa(const uint8_t type, uint8_t len, const uint8_t *data) 
    157 @@ -1766,6 +1769,7 @@ void print_ies(unsigned char *ie, int ie 
     195@@ -1767,6 +1770,7 @@ void print_ies(unsigned char *ie, int ie 
    158196                    ieprinters[ie[0]].name && 
    159197                    ieprinters[ie[0]].flags & BIT(ptype)) { 
     
    163201                        print_vendor(ie[1], ie + 2, unknown, ptype); 
    164202                } else if (unknown) { 
    165 @@ -1775,6 +1779,7 @@ void print_ies(unsigned char *ie, int ie 
     203@@ -1776,6 +1780,7 @@ void print_ies(unsigned char *ie, int ie 
    166204                        for (i=0; i<ie[1]; i++) 
    167205                                printf(" %.2x", ie[2+i]); 
     
    171209                ielen -= ie[1] + 2; 
    172210                ie += ie[1] + 2; 
    173 @@ -1815,6 +1820,7 @@ static void print_capa_non_dmg(__u16 cap 
     211@@ -1816,6 +1821,7 @@ static void print_capa_non_dmg(__u16 cap 
    174212                printf(" ESS"); 
    175213        if (capa & WLAN_CAPABILITY_IBSS) 
     
    179217                printf(" CfPollable"); 
    180218        if (capa & WLAN_CAPABILITY_CF_POLL_REQUEST) 
    181 @@ -1843,6 +1849,7 @@ static void print_capa_non_dmg(__u16 cap 
     219@@ -1844,6 +1850,7 @@ static void print_capa_non_dmg(__u16 cap 
    182220                printf(" DelayedBACK"); 
    183221        if (capa & WLAN_CAPABILITY_IMM_BACK) 
     
    187225  
    188226 static int print_bss_handler(struct nl_msg *msg, void *arg) 
    189 @@ -1921,8 +1928,10 @@ static int print_bss_handler(struct nl_m 
     227@@ -1922,8 +1929,10 @@ static int print_bss_handler(struct nl_m 
    190228        if (bss[NL80211_BSS_FREQUENCY]) { 
    191229                int freq = nla_get_u32(bss[NL80211_BSS_FREQUENCY]); 
     
    200238--- a/util.c 
    201239+++ b/util.c 
    202 @@ -264,6 +264,7 @@ static const char *commands[NL80211_CMD_ 
     240@@ -267,6 +267,7 @@ static const char *commands[NL80211_CMD_ 
    203241  
    204242 static char cmdbuf[100]; 
     
    208246 { 
    209247        if (cmd <= NL80211_CMD_MAX && commands[cmd]) 
    210 @@ -271,6 +272,7 @@ const char *command_name(enum nl80211_co 
     248@@ -274,6 +275,7 @@ const char *command_name(enum nl80211_co 
    211249        sprintf(cmdbuf, "Unknown command (%d)", cmd); 
    212250        return cmdbuf; 
     
    216254 int ieee80211_channel_to_frequency(int chan, enum nl80211_band band) 
    217255 { 
    218 --- a/event.c 
    219 +++ b/event.c 
    220 @@ -334,6 +334,7 @@ static int print_event(struct nl_msg *ms 
    221         } 
    222   
    223         switch (gnlh->cmd) { 
    224 +#if 0 
    225         case NL80211_CMD_NEW_WIPHY: 
    226                 printf("renamed to %s\n", nla_get_string(tb[NL80211_ATTR_WIPHY_NAME])); 
    227                 break; 
    228 @@ -368,6 +369,7 @@ static int print_event(struct nl_msg *ms 
    229         case NL80211_CMD_SCHED_SCAN_RESULTS: 
    230                 printf("got scheduled scan results\n"); 
    231                 break; 
    232 +#endif 
    233         case NL80211_CMD_REG_CHANGE: 
    234                 printf("regulatory domain change: "); 
    235   
    236 @@ -446,6 +448,7 @@ static int print_event(struct nl_msg *ms 
    237                 mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC])); 
    238                 printf("del station %s\n", macbuf); 
    239                 break; 
    240 +#if 0 
    241         case NL80211_CMD_JOIN_IBSS: 
    242                 mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC])); 
    243                 printf("IBSS %s joined\n", macbuf); 
    244 @@ -599,9 +602,9 @@ static int print_event(struct nl_msg *ms 
    245                 } 
    246                 printf("\n"); 
    247                 break; 
    248 +#endif 
    249         default: 
    250 -               printf("unknown event %d (%s)\n", 
    251 -                      gnlh->cmd, command_name(gnlh->cmd)); 
    252 +               printf("unknown event %d\n", gnlh->cmd); 
    253                 break; 
    254         } 
    255   
Note: See TracChangeset for help on using the changeset viewer.