Changeset 26749


Ignore:
Timestamp:
2011-04-23T23:34:35+02:00 (7 years ago)
Author:
nbd
Message:

hostapd: update to 2011-04-21

Location:
trunk/package/hostapd
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/hostapd/Makefile

    r26644 r26749  
    99 
    1010PKG_NAME:=hostapd 
    11 PKG_VERSION:=20110402 
     11PKG_VERSION:=20110421 
    1212PKG_RELEASE:=1 
    13 PKG_REV:=4378fc14ebfb355705e7674bf347ea659bcd77bc 
     13PKG_REV:=0725cc7b7efc434910e89865c42eda7ce61bbf08 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    1818PKG_SOURCE_VERSION:=$(PKG_REV) 
    1919PKG_SOURCE_PROTO:=git 
    20 PKG_MIRROR_MD5SUM:=fd5e29bbfcb89a4e60fef633bd4efa94 
     20PKG_MIRROR_MD5SUM:=fa3f3182dc82f40c88398822ebfe693e 
    2121 
    2222PKG_BUILD_DEPENDS:= \ 
  • trunk/package/hostapd/patches/330-multicall_bridge_fix.patch

    r26414 r26749  
    3535 } 
    3636  
    37 @@ -5623,8 +5636,6 @@ static void *i802_init(struct hostapd_da 
     37@@ -5638,8 +5651,6 @@ static void *i802_init(struct hostapd_da 
    3838                br_ifindex = 0; 
    3939        } 
  • trunk/package/hostapd/patches/510-multicall.patch

    r26414 r26749  
    133133--- a/src/drivers/driver.h 
    134134+++ b/src/drivers/driver.h 
    135 @@ -3186,8 +3186,8 @@ union wpa_event_data { 
     135@@ -3187,8 +3187,8 @@ union wpa_event_data { 
    136136  * Driver wrapper code should call this function whenever an event is received 
    137137  * from the driver. 
     
    146146--- a/src/ap/drv_callbacks.c 
    147147+++ b/src/ap/drv_callbacks.c 
    148 @@ -443,8 +443,8 @@ static void hostapd_event_eapol_rx(struc 
     148@@ -448,8 +448,8 @@ static void hostapd_event_eapol_rx(struc 
    149149 } 
    150150  
     
    180180--- a/wpa_supplicant/events.c 
    181181+++ b/wpa_supplicant/events.c 
    182 @@ -1734,8 +1734,8 @@ static void wpa_supplicant_event_unprot_ 
     182@@ -1741,8 +1741,8 @@ static void wpa_supplicant_event_unprot_ 
    183183 } 
    184184  
     
    193193--- a/wpa_supplicant/wpa_supplicant.c 
    194194+++ b/wpa_supplicant/wpa_supplicant.c 
    195 @@ -2311,6 +2311,9 @@ static void wpa_supplicant_deinit_iface( 
     195@@ -2314,6 +2314,9 @@ static void wpa_supplicant_deinit_iface( 
    196196                wpa_drv_deinit(wpa_s); 
    197197 } 
     
    203203 /** 
    204204  * wpa_supplicant_add_iface - Add a new network interface 
    205 @@ -2494,6 +2497,7 @@ struct wpa_global * wpa_supplicant_init( 
     205@@ -2497,6 +2500,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/hostapd/patches/530-rescan_immediately.patch

    r26414 r26749  
    1 --- a/wpa_supplicant/events.c 
    2 +++ b/wpa_supplicant/events.c 
    3 @@ -958,7 +958,7 @@ static int _wpa_supplicant_event_scan_re 
    4                         wpa_dbg(wpa_s, MSG_DEBUG, "Setup a new network"); 
    5                         wpa_supplicant_associate(wpa_s, NULL, ssid); 
    6                 } else { 
    7 -                       int timeout_sec = 5; 
    8 +                       int timeout_sec = 0; 
    9                         int timeout_usec = 0; 
    10  #ifdef CONFIG_P2P 
    11                         if (wpa_s->p2p_in_provisioning) { 
     1--- a/wpa_supplicant/wpa_supplicant.c 
     2+++ b/wpa_supplicant/wpa_supplicant.c 
     3@@ -2070,7 +2070,7 @@ static struct wpa_supplicant * wpa_suppl 
     4        if (wpa_s == NULL) 
     5                return NULL; 
     6        wpa_s->scan_req = 1; 
     7-       wpa_s->scan_interval = 5; 
     8+       wpa_s->scan_interval = 0; 
     9        wpa_s->new_connection = 1; 
     10        wpa_s->parent = wpa_s; 
     11  
  • trunk/package/hostapd/patches/540-optional_rfkill.patch

    r26414 r26749  
    116116        eloop_cancel_timeout(wpa_driver_nl80211_scan_timeout, drv, drv->ctx); 
    117117  
    118 @@ -5693,7 +5711,9 @@ static void *i802_init(struct hostapd_da 
     118@@ -5708,7 +5726,9 @@ static void *i802_init(struct hostapd_da 
    119119  
    120120 failed: 
  • trunk/package/hostapd/patches/551-nl80211_del_beacon_bss.patch

    r26414 r26749  
    4545 /** 
    4646  * wpa_driver_nl80211_deinit - Deinitialize nl80211 driver interface 
    47 @@ -6566,4 +6584,5 @@ const struct wpa_driver_ops wpa_driver_n 
     47@@ -6581,4 +6599,5 @@ const struct wpa_driver_ops wpa_driver_n 
    4848        .set_intra_bss = nl80211_set_intra_bss, 
    4949        .set_param = nl80211_set_param, 
     
    5353--- a/src/drivers/driver.h 
    5454+++ b/src/drivers/driver.h 
    55 @@ -2240,6 +2240,8 @@ struct wpa_driver_ops { 
     55@@ -2241,6 +2241,8 @@ struct wpa_driver_ops { 
    5656         * @signal_info: Connection info structure 
    5757          */ 
  • trunk/package/hostapd/patches/553-ap_sta_support.patch

    r26414 r26749  
    108108                wpa_drv_set_operstate(wpa_s, 0); 
    109109 #ifndef IEEE8021X_EAPOL 
    110 @@ -2154,6 +2211,21 @@ static int wpa_supplicant_init_iface(str 
     110@@ -2157,6 +2214,21 @@ static int wpa_supplicant_init_iface(str 
    111111                os_strlcpy(wpa_s->bridge_ifname, iface->bridge_ifname, 
    112112                           sizeof(wpa_s->bridge_ifname)); 
  • trunk/package/hostapd/patches/560-disable_ctrl_iface_mib.patch

    r26414 r26749  
    5656--- a/wpa_supplicant/ctrl_iface.c 
    5757+++ b/wpa_supplicant/ctrl_iface.c 
    58 @@ -2896,6 +2896,7 @@ char * wpa_supplicant_ctrl_iface_process 
     58@@ -2927,6 +2927,7 @@ char * wpa_supplicant_ctrl_iface_process 
    5959                        reply_len = -1; 
    6060        } else if (os_strncmp(buf, "NOTE ", 5) == 0) { 
     
    6464                reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size); 
    6565                if (reply_len >= 0) { 
    66 @@ -2907,6 +2908,7 @@ char * wpa_supplicant_ctrl_iface_process 
     66@@ -2938,6 +2939,7 @@ char * wpa_supplicant_ctrl_iface_process 
    6767                        else 
    6868                                reply_len += res; 
     
    7272                reply_len = wpa_supplicant_ctrl_iface_status( 
    7373                        wpa_s, buf + 6, reply, reply_size); 
    74 @@ -3200,6 +3202,7 @@ char * wpa_supplicant_ctrl_iface_process 
     74@@ -3243,6 +3245,7 @@ char * wpa_supplicant_ctrl_iface_process 
    7575                reply_len = wpa_supplicant_ctrl_iface_bss( 
    7676                        wpa_s, buf + 4, reply, reply_size); 
     
    8080                reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size); 
    8181        } else if (os_strncmp(buf, "STA ", 4) == 0) { 
    82 @@ -3208,6 +3211,7 @@ char * wpa_supplicant_ctrl_iface_process 
     82@@ -3251,6 +3254,7 @@ char * wpa_supplicant_ctrl_iface_process 
    8383        } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) { 
    8484                reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply, 
     
    106106--- a/src/ap/ieee802_1x.c 
    107107+++ b/src/ap/ieee802_1x.c 
    108 @@ -1876,6 +1876,7 @@ static const char * bool_txt(Boolean boo 
     108@@ -1895,6 +1895,7 @@ static const char * bool_txt(Boolean boo 
    109109        return bool ? "TRUE" : "FALSE"; 
    110110 } 
     
    114114 int ieee802_1x_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen) 
    115115 { 
    116 @@ -2027,6 +2028,7 @@ int ieee802_1x_get_mib_sta(struct hostap 
     116@@ -2046,6 +2047,7 @@ int ieee802_1x_get_mib_sta(struct hostap 
    117117        return len; 
    118118 } 
  • trunk/package/hostapd/patches/710-bring_down_interface.patch

    r26414 r26749  
    11--- a/src/drivers/driver_nl80211.c 
    22+++ b/src/drivers/driver_nl80211.c 
    3 @@ -4904,9 +4904,6 @@ static int wpa_driver_nl80211_set_mode(v 
     3@@ -4919,9 +4919,6 @@ static int wpa_driver_nl80211_set_mode(v 
    44                        /* Try to set the mode again while the interface is 
    55                         * down */ 
     
    1111                                break; 
    1212                } else 
    13 @@ -4919,6 +4916,8 @@ static int wpa_driver_nl80211_set_mode(v 
     13@@ -4934,6 +4931,8 @@ static int wpa_driver_nl80211_set_mode(v 
    1414                wpa_printf(MSG_DEBUG, "nl80211: Mode change succeeded while " 
    1515                           "interface is down"); 
  • trunk/package/hostapd/patches/730-fix_wds_bridge_handling.patch

    r26724 r26749  
    11--- a/src/drivers/driver_nl80211.c 
    22+++ b/src/drivers/driver_nl80211.c 
    3 @@ -5487,6 +5487,9 @@ static int i802_set_wds_sta(void *priv,  
     3@@ -5502,6 +5502,9 @@ static int i802_set_wds_sta(void *priv,  
    44                linux_set_iface_flags(drv->ioctl_sock, name, 1); 
    55                return i802_set_sta_vlan(priv, addr, name, 0); 
     
    1111                return wpa_driver_nl80211_if_remove(priv, WPA_IF_AP_VLAN, 
    1212                                                    name); 
    13 @@ -5927,14 +5930,14 @@ static int wpa_driver_nl80211_if_remove( 
     13@@ -5942,14 +5945,14 @@ static int wpa_driver_nl80211_if_remove( 
    1414                return -1; 
    1515  
Note: See TracChangeset for help on using the changeset viewer.