Changeset 40571


Ignore:
Timestamp:
2014-04-26T21:48:06+02:00 (4 years ago)
Author:
nbd
Message:

hostapd: update to version 2014-04-24, fixes some dfs related issues

Signed-off-by: Felix Fietkau <nbd@…>

Location:
trunk/package/network/services/hostapd
Files:
1 deleted
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/network/services/hostapd/Makefile

    r40394 r40571  
    99 
    1010PKG_NAME:=hostapd 
    11 PKG_VERSION:=2014-04-04 
     11PKG_VERSION:=2014-04-24 
    1212PKG_RELEASE:=1 
    13 PKG_REV:=ca4fd18290cc0966cba6d71a079d8c9177e53d1d 
     13PKG_REV:=3cf48c4f2e2d558130253457fea02ef4047cf8e1 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
  • trunk/package/network/services/hostapd/patches/200-multicall.patch

    r40394 r40571  
    133133--- a/src/drivers/driver.h 
    134134+++ b/src/drivers/driver.h 
    135 @@ -3874,8 +3874,8 @@ union wpa_event_data { 
     135@@ -3886,8 +3886,8 @@ union wpa_event_data { 
    136136  * Driver wrapper code should call this function whenever an event is received 
    137137  * from the driver. 
     
    180180--- a/wpa_supplicant/events.c 
    181181+++ b/wpa_supplicant/events.c 
    182 @@ -2887,8 +2887,8 @@ static void wpa_supplicant_notify_avoid_ 
     182@@ -2929,8 +2929,8 @@ static void wpa_supplicant_notify_avoid_ 
    183183 } 
    184184  
     
    193193--- a/wpa_supplicant/wpa_supplicant.c 
    194194+++ b/wpa_supplicant/wpa_supplicant.c 
    195 @@ -3711,6 +3711,9 @@ static void wpa_supplicant_deinit_iface( 
     195@@ -3724,6 +3724,9 @@ static void wpa_supplicant_deinit_iface( 
    196196        os_free(wpa_s); 
    197197 } 
     
    203203 /** 
    204204  * wpa_supplicant_add_iface - Add a new network interface 
    205 @@ -3902,6 +3905,7 @@ struct wpa_global * wpa_supplicant_init( 
     205@@ -3915,6 +3918,7 @@ struct wpa_global * wpa_supplicant_init( 
    206206        wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb); 
    207207 #endif /* CONFIG_NO_WPA_MSG */ 
  • trunk/package/network/services/hostapd/patches/300-noscan.patch

    r40394 r40571  
    11--- a/hostapd/config_file.c 
    22+++ b/hostapd/config_file.c 
    3 @@ -2634,6 +2634,8 @@ static int hostapd_config_fill(struct ho 
     3@@ -2638,6 +2638,8 @@ static int hostapd_config_fill(struct ho 
    44                } 
    55 #endif /* CONFIG_IEEE80211W */ 
  • trunk/package/network/services/hostapd/patches/310-rescan_immediately.patch

    r40394 r40571  
    11--- a/wpa_supplicant/wpa_supplicant.c 
    22+++ b/wpa_supplicant/wpa_supplicant.c 
    3 @@ -2741,7 +2741,7 @@ static struct wpa_supplicant * wpa_suppl 
     3@@ -2746,7 +2746,7 @@ static struct wpa_supplicant * wpa_suppl 
    44        if (wpa_s == NULL) 
    55                return NULL; 
  • trunk/package/network/services/hostapd/patches/330-nl80211_fix_set_freq.patch

    r40394 r40571  
    11--- a/src/drivers/driver_nl80211.c 
    22+++ b/src/drivers/driver_nl80211.c 
    3 @@ -7323,7 +7323,7 @@ static int wpa_driver_nl80211_set_freq(s 
     3@@ -7380,7 +7380,7 @@ static int wpa_driver_nl80211_set_freq(s 
    44  
    55        nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_WIPHY); 
     
    1010                goto nla_put_failure; 
    1111  
    12 @@ -11840,7 +11840,7 @@ static int nl80211_switch_channel(void * 
     12@@ -11905,7 +11905,7 @@ static int nl80211_switch_channel(void * 
    1313                return -ENOMEM; 
    1414  
  • trunk/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch

    r40394 r40571  
    11--- a/src/drivers/driver_nl80211.c 
    22+++ b/src/drivers/driver_nl80211.c 
    3 @@ -4701,18 +4701,20 @@ wpa_driver_nl80211_finish_drv_init(struc 
     3@@ -4748,18 +4748,20 @@ wpa_driver_nl80211_finish_drv_init(struc 
    44 } 
    55  
     
    2525        return send_and_recv_msgs(drv, msg, NULL, NULL); 
    2626  nla_put_failure: 
    27 @@ -4720,6 +4722,15 @@ static int wpa_driver_nl80211_del_beacon 
     27@@ -4767,6 +4769,15 @@ static int wpa_driver_nl80211_del_beacon 
    2828        return -ENOBUFS; 
    2929 } 
     
    4141 /** 
    4242  * wpa_driver_nl80211_deinit - Deinitialize nl80211 driver interface 
    43 @@ -10412,7 +10423,6 @@ static int wpa_driver_nl80211_stop_ap(vo 
     43@@ -10475,7 +10486,6 @@ static int wpa_driver_nl80211_stop_ap(vo 
    4444        if (!is_ap_interface(drv->nlmode)) 
    4545                return -1; 
  • trunk/package/network/services/hostapd/patches/370-ap_sta_support.patch

    r40394 r40571  
    9393 int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) 
    9494 { 
    95 @@ -702,8 +742,12 @@ void wpa_supplicant_set_state(struct wpa 
     95@@ -705,8 +745,12 @@ void wpa_supplicant_set_state(struct wpa 
    9696 #endif /* CONFIG_P2P */ 
    9797  
     
    106106                wpa_drv_set_operstate(wpa_s, 0); 
    107107 #ifndef IEEE8021X_EAPOL 
    108 @@ -3505,6 +3549,20 @@ static int wpa_supplicant_init_iface(str 
     108@@ -3516,6 +3560,20 @@ static int wpa_supplicant_init_iface(str 
    109109                           sizeof(wpa_s->bridge_ifname)); 
    110110        } 
     
    127127        eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE); 
    128128        eapol_sm_notify_portValid(wpa_s->eapol, FALSE); 
    129 @@ -3698,6 +3756,11 @@ static void wpa_supplicant_deinit_iface( 
     129@@ -3711,6 +3769,11 @@ static void wpa_supplicant_deinit_iface( 
    130130        if (terminate) 
    131131                wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TERMINATING); 
  • trunk/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch

    r40394 r40571  
    4343--- a/wpa_supplicant/ctrl_iface.c 
    4444+++ b/wpa_supplicant/ctrl_iface.c 
    45 @@ -6100,6 +6100,7 @@ char * wpa_supplicant_ctrl_iface_process 
     45@@ -6075,6 +6075,7 @@ char * wpa_supplicant_ctrl_iface_process 
    4646                        reply_len = -1; 
    4747        } else if (os_strncmp(buf, "NOTE ", 5) == 0) { 
     
    5151                reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size); 
    5252                if (reply_len >= 0) { 
    53 @@ -6111,6 +6112,7 @@ char * wpa_supplicant_ctrl_iface_process 
     53@@ -6086,6 +6087,7 @@ char * wpa_supplicant_ctrl_iface_process 
    5454                        else 
    5555                                reply_len += res; 
     
    5959                reply_len = wpa_supplicant_ctrl_iface_status( 
    6060                        wpa_s, buf + 6, reply, reply_size); 
    61 @@ -6518,6 +6520,7 @@ char * wpa_supplicant_ctrl_iface_process 
     61@@ -6490,6 +6492,7 @@ char * wpa_supplicant_ctrl_iface_process 
    6262                reply_len = wpa_supplicant_ctrl_iface_bss( 
    6363                        wpa_s, buf + 4, reply, reply_size); 
     
    6767                reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size); 
    6868        } else if (os_strncmp(buf, "STA ", 4) == 0) { 
    69 @@ -6526,6 +6529,7 @@ char * wpa_supplicant_ctrl_iface_process 
     69@@ -6498,6 +6501,7 @@ char * wpa_supplicant_ctrl_iface_process 
    7070        } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) { 
    7171                reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply, 
     
    137137--- a/src/rsn_supp/wpa.c 
    138138+++ b/src/rsn_supp/wpa.c 
    139 @@ -1910,6 +1910,8 @@ static u32 wpa_key_mgmt_suite(struct wpa 
     139@@ -1912,6 +1912,8 @@ static u32 wpa_key_mgmt_suite(struct wpa 
    140140 } 
    141141  
     
    146146 #define RSN_SUITE_ARG(s) \ 
    147147 ((s) >> 24) & 0xff, ((s) >> 16) & 0xff, ((s) >> 8) & 0xff, (s) & 0xff 
    148 @@ -1993,6 +1995,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch 
     148@@ -1995,6 +1997,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch 
    149149  
    150150        return (int) len; 
  • trunk/package/network/services/hostapd/patches/410-bring_down_interface.patch

    r40394 r40571  
    11--- a/src/drivers/driver_nl80211.c 
    22+++ b/src/drivers/driver_nl80211.c 
    3 @@ -8873,12 +8873,7 @@ static int wpa_driver_nl80211_set_mode(s 
     3@@ -8936,12 +8936,7 @@ static int wpa_driver_nl80211_set_mode(s 
    44                        /* Try to set the mode again while the interface is 
    55                         * down */ 
     
    1515                } else 
    1616                        wpa_printf(MSG_DEBUG, "nl80211: Failed to set " 
    17 @@ -8891,6 +8886,8 @@ static int wpa_driver_nl80211_set_mode(s 
     17@@ -8954,6 +8949,8 @@ static int wpa_driver_nl80211_set_mode(s 
    1818                           "interface is down"); 
    1919                drv->nlmode = nlmode; 
  • trunk/package/network/services/hostapd/patches/440-dynamic_20_40_mhz.patch

    r40394 r40571  
    11--- a/hostapd/config_file.c 
    22+++ b/hostapd/config_file.c 
    3 @@ -2644,6 +2644,10 @@ static int hostapd_config_fill(struct ho 
     3@@ -2648,6 +2648,10 @@ static int hostapd_config_fill(struct ho 
    44                                   line); 
    55                        return 1; 
     
    9898  
    9999 u8 * hostapd_eid_ht_capabilities(struct hostapd_data *hapd, u8 *eid) 
    100 @@ -92,12 +94,15 @@ u8 * hostapd_eid_ht_operation(struct hos 
    101   
    102         oper->control_chan = hapd->iconf->channel; 
     100@@ -92,6 +94,9 @@ u8 * hostapd_eid_ht_operation(struct hos 
     101  
     102        oper->primary_chan = hapd->iconf->channel; 
    103103        oper->operation_mode = host_to_le16(hapd->iface->ht_op_mode); 
    104 -       if (hapd->iconf->secondary_channel == 1) 
    105 -               oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE | 
    106 -                       HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH; 
    107 -       if (hapd->iconf->secondary_channel == -1) 
    108 -               oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW | 
    109 -                       HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH; 
    110 + 
    111 +       if (!hapd->iface->force_20mhz) { 
    112 +               if (hapd->iconf->secondary_channel == 1) 
    113 +                       oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE | 
    114 +                               HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH; 
    115 +               if (hapd->iconf->secondary_channel == -1) 
    116 +                       oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW | 
    117 +                               HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH; 
    118 +       } 
    119   
     104+       if (hapd->iface->force_20mhz) 
     105+               goto skip; 
     106+ 
     107        if (hapd->iconf->secondary_channel == 1) 
     108                oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE | 
     109                        HT_INFO_HT_PARAM_STA_CHNL_WIDTH; 
     110@@ -99,6 +104,7 @@ u8 * hostapd_eid_ht_operation(struct hos 
     111                oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW | 
     112                        HT_INFO_HT_PARAM_STA_CHNL_WIDTH; 
     113  
     114+skip: 
    120115        pos += sizeof(*oper); 
    121116  
    122 @@ -291,3 +296,84 @@ void hostapd_get_ht_capab(struct hostapd 
     117        return pos; 
     118@@ -288,3 +294,84 @@ void hostapd_get_ht_capab(struct hostapd 
    123119  
    124120        neg_ht_cap->ht_capabilities_info = host_to_le16(cap); 
  • trunk/package/network/services/hostapd/patches/480-max_num_sta_probe.patch

    r40394 r40571  
    1010+ 
    1111 #ifdef CONFIG_INTERWORKING 
    12         if (elems.interworking && elems.interworking_len >= 1) { 
    13                 u8 ant = elems.interworking[0] & 0x0f; 
     12        if (hapd->conf->interworking && 
     13            elems.interworking && elems.interworking_len >= 1) { 
  • trunk/package/network/services/hostapd/patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch

    r40394 r40571  
    2323 #include "utils/list.h" 
    2424  
    25 @@ -406,6 +407,11 @@ struct wpa_driver_associate_params { 
     25@@ -414,6 +415,11 @@ struct wpa_driver_associate_params { 
    2626         * responsible for selecting with which BSS to associate. */ 
    2727        const u8 *bssid; 
     
    143143  
    144144 #ifdef OFFSET 
    145 @@ -1731,6 +1823,9 @@ static const struct parse_data ssid_fiel 
     145@@ -1733,6 +1825,9 @@ static const struct parse_data ssid_fiel 
    146146        { INT(ap_max_inactivity) }, 
    147147        { INT(dtim_period) }, 
     
    163163 #define MAX_SSID_LEN 32 
    164164  
    165 @@ -630,6 +631,10 @@ struct wpa_ssid { 
     165@@ -636,6 +637,10 @@ struct wpa_ssid { 
    166166         * dereferences since it may not be updated in all cases. 
    167167         */ 
     
    176176--- a/wpa_supplicant/wpa_supplicant.c 
    177177+++ b/wpa_supplicant/wpa_supplicant.c 
    178 @@ -1788,6 +1788,13 @@ static void wpas_start_assoc_cb(struct w 
     178@@ -1791,6 +1791,13 @@ static void wpas_start_assoc_cb(struct w 
    179179                        params.beacon_int = ssid->beacon_int; 
    180180                else 
  • trunk/package/network/services/hostapd/patches/501-driver_nl80211-use-new-parameters-during-ibss-join.patch

    r40394 r40571  
    1111--- a/src/drivers/driver_nl80211.c 
    1212+++ b/src/drivers/driver_nl80211.c 
    13 @@ -8398,7 +8398,7 @@ static int wpa_driver_nl80211_ibss(struc 
     13@@ -8455,7 +8455,7 @@ static int wpa_driver_nl80211_ibss(struc 
    1414                                   struct wpa_driver_associate_params *params) 
    1515 { 
     
    2020  
    2121        wpa_printf(MSG_DEBUG, "nl80211: Join IBSS (ifindex=%d)", drv->ifindex); 
    22 @@ -8437,6 +8437,37 @@ retry: 
     22@@ -8494,6 +8494,37 @@ retry: 
    2323                            params->beacon_int); 
    2424        } 
  • trunk/package/network/services/hostapd/patches/502-wpa_s-support-htmode-param.patch

    r40394 r40571  
    1717--- a/src/drivers/driver.h 
    1818+++ b/src/drivers/driver.h 
    19 @@ -411,6 +411,8 @@ struct wpa_driver_associate_params { 
     19@@ -419,6 +419,8 @@ struct wpa_driver_associate_params { 
    2020        int fixed_freq; 
    2121        unsigned char rates[NL80211_MAX_SUPP_RATES]; 
     
    2828--- a/src/drivers/driver_nl80211.c 
    2929+++ b/src/drivers/driver_nl80211.c 
    30 @@ -8468,6 +8468,22 @@ retry: 
     30@@ -8525,6 +8525,22 @@ retry: 
    3131                NLA_PUT_U32(msg, NL80211_ATTR_MCAST_RATE, params->mcast_rate); 
    3232        } 
     
    125125                                  struct wpa_ssid *ssid, int line, 
    126126                                  const char *value) 
    127 @@ -1826,6 +1891,7 @@ static const struct parse_data ssid_fiel 
     127@@ -1828,6 +1893,7 @@ static const struct parse_data ssid_fiel 
    128128        { INT_RANGE(fixed_freq, 0, 1) }, 
    129129        { FUNC(rates) }, 
     
    135135--- a/wpa_supplicant/config_ssid.h 
    136136+++ b/wpa_supplicant/config_ssid.h 
    137 @@ -635,6 +635,8 @@ struct wpa_ssid { 
     137@@ -641,6 +641,8 @@ struct wpa_ssid { 
    138138        int fixed_freq; 
    139139        unsigned char rates[NL80211_MAX_SUPP_RATES]; 
     
    146146--- a/wpa_supplicant/wpa_supplicant.c 
    147147+++ b/wpa_supplicant/wpa_supplicant.c 
    148 @@ -1795,6 +1795,8 @@ static void wpas_start_assoc_cb(struct w 
     148@@ -1798,6 +1798,8 @@ static void wpas_start_assoc_cb(struct w 
    149149                        i++; 
    150150                } 
  • trunk/package/network/services/hostapd/patches/600-ubus_support.patch

    r40394 r40571  
    669669        ie = mgmt->u.probe_req.variable; 
    670670        if (len < IEEE80211_HDRLEN + sizeof(mgmt->u.probe_req)) 
    671 @@ -644,6 +650,12 @@ void handle_probe_req(struct hostapd_dat 
     671@@ -645,6 +651,12 @@ void handle_probe_req(struct hostapd_dat 
    672672        } 
    673673 #endif /* CONFIG_P2P */ 
Note: See TracChangeset for help on using the changeset viewer.