Changeset 33311


Ignore:
Timestamp:
2012-08-29T18:06:24+02:00 (5 years ago)
Author:
nbd
Message:

hostapd: fix ap+sta issues

Location:
trunk/package/hostapd/patches
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/hostapd/patches/450-reload_freq_change.patch

    r31515 r33311  
    11--- a/src/ap/hostapd.c 
    22+++ b/src/ap/hostapd.c 
    3 @@ -137,6 +137,10 @@ int hostapd_reload_config(struct hostapd 
     3@@ -137,6 +137,20 @@ int hostapd_reload_config(struct hostapd 
    44        oldconf = hapd->iconf; 
    55        iface->conf = newconf; 
    66  
    7 +       iface->freq = hostapd_hw_get_freq(hapd, hapd->iconf->channel); 
     7+       hostapd_select_hw_mode(iface); 
     8+       iface->freq = hostapd_hw_get_freq(hapd, newconf->channel); 
     9+ 
     10+       if (hostapd_set_freq(hapd, newconf->hw_mode, iface->freq, 
     11+                            newconf->channel, 
     12+                            newconf->ieee80211n, 
     13+                            newconf->secondary_channel)) { 
     14+               wpa_printf(MSG_ERROR, "Could not set channel for " 
     15+                          "kernel driver"); 
     16+       } 
     17+ 
    818+       if (iface->current_mode) 
    919+               hostapd_prepare_rates(iface, iface->current_mode); 
  • trunk/package/hostapd/patches/452-ctrl_iface_reload.patch

    r31080 r33311  
    5959+               else if ((val = get_option(opt, "sec_chan="))) 
    6060+                       conf->secondary_channel = atoi(val); 
    61 +               else if ((val = get_option(opt, "hwmode="))) 
     61+               else if ((val = get_option(opt, "hw_mode="))) 
    6262+                       conf->hw_mode = atoi(val); 
    6363+               else if ((val = get_option(opt, "ieee80211n="))) 
  • trunk/package/hostapd/patches/480-terminate_on_setup_failure.patch

    r31515 r33311  
    11--- a/src/ap/hostapd.c 
    22+++ b/src/ap/hostapd.c 
    3 @@ -768,11 +768,8 @@ int hostapd_setup_interface_complete(str 
     3@@ -778,11 +778,8 @@ int hostapd_setup_interface_complete(str 
    44        size_t j; 
    55        u8 *prev_addr; 
     
    1515        wpa_printf(MSG_DEBUG, "Completing interface initialization"); 
    1616        if (hapd->iconf->channel) { 
    17 @@ -788,7 +785,7 @@ int hostapd_setup_interface_complete(str 
     17@@ -798,7 +795,7 @@ int hostapd_setup_interface_complete(str 
    1818                                     hapd->iconf->secondary_channel)) { 
    1919                        wpa_printf(MSG_ERROR, "Could not set channel for " 
     
    2424        } 
    2525  
    26 @@ -799,7 +796,7 @@ int hostapd_setup_interface_complete(str 
     26@@ -809,7 +806,7 @@ int hostapd_setup_interface_complete(str 
    2727                        hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211, 
    2828                                       HOSTAPD_LEVEL_WARNING, 
     
    3333        } 
    3434  
    35 @@ -807,14 +804,14 @@ int hostapd_setup_interface_complete(str 
     35@@ -817,14 +814,14 @@ int hostapd_setup_interface_complete(str 
    3636            hostapd_set_rts(hapd, hapd->iconf->rts_threshold)) { 
    3737                wpa_printf(MSG_ERROR, "Could not set RTS threshold for " 
     
    5050  
    5151        prev_addr = hapd->own_addr; 
    52 @@ -824,7 +821,7 @@ int hostapd_setup_interface_complete(str 
     52@@ -834,7 +831,7 @@ int hostapd_setup_interface_complete(str 
    5353                if (j) 
    5454                        os_memcpy(hapd->own_addr, prev_addr, ETH_ALEN); 
     
    5959                        prev_addr = hapd->own_addr; 
    6060        } 
    61 @@ -836,7 +833,7 @@ int hostapd_setup_interface_complete(str 
     61@@ -846,7 +843,7 @@ int hostapd_setup_interface_complete(str 
    6262        if (hostapd_driver_commit(hapd) < 0) { 
    6363                wpa_printf(MSG_ERROR, "%s: Failed to commit driver " 
     
    6868  
    6969        /* 
    70 @@ -860,6 +857,11 @@ int hostapd_setup_interface_complete(str 
     70@@ -870,6 +867,11 @@ int hostapd_setup_interface_complete(str 
    7171                iface->init_complete(iface); 
    7272  
  • trunk/package/hostapd/patches/540-dynamic_20_40_mhz.patch

    r31515 r33311  
    3232 #include "vlan_init.h" 
    3333 #include "wpa_auth.h" 
    34 @@ -307,6 +308,7 @@ static void hostapd_cleanup_iface_pre(st 
     34@@ -317,6 +318,7 @@ static void hostapd_cleanup_iface_pre(st 
    3535  
    3636 static void hostapd_cleanup_iface_partial(struct hostapd_iface *iface) 
  • trunk/package/hostapd/patches/601-wpa_supplicant-add-new-config-params-to-be-used-with.patch

    r32828 r33311  
    1313 4 files changed, 124 insertions(+), 7 deletions(-) 
    1414 
    15 diff --git a/src/drivers/driver.h b/src/drivers/driver.h 
    16 index 5ee92f7..d204148 100644 
    1715--- a/src/drivers/driver.h 
    1816+++ b/src/drivers/driver.h 
     
    3735         * bg_scan_period - Background scan period in seconds, 0 to disable 
    3836         * background scan, or -1 to indicate no change to default driver 
    39 diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c 
    40 index c423bc3..be566ee 100644 
    4137--- a/wpa_supplicant/config.c 
    4238+++ b/wpa_supplicant/config.c 
     
    4945  
    5046  
    51 @@ -1431,6 +1432,97 @@ static char * wpa_config_write_p2p_client_list(const struct parse_data *data, 
     47@@ -1431,6 +1432,97 @@ static char * wpa_config_write_p2p_clien 
    5248  
    5349 #endif /* CONFIG_P2P */ 
     
    147143  
    148144 #ifdef OFFSET 
    149 @@ -1605,6 +1697,10 @@ static const struct parse_data ssid_fields[] = { 
     145@@ -1605,6 +1697,10 @@ static const struct parse_data ssid_fiel 
    150146        { STR(ht_mcs) }, 
    151147 #endif /* CONFIG_HT_OVERRIDES */ 
     
    158154  
    159155 #undef OFFSET 
    160 diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h 
    161 index 80d4382..8d152a4 100644 
    162156--- a/wpa_supplicant/config_ssid.h 
    163157+++ b/wpa_supplicant/config_ssid.h 
     
    182176  
    183177 #endif /* CONFIG_SSID_H */ 
    184 diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c 
    185 index cc85f1e..1473d91 100644 
    186178--- a/wpa_supplicant/wpa_supplicant.c 
    187179+++ b/wpa_supplicant/wpa_supplicant.c 
    188 @@ -1395,15 +1395,24 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s, 
     180@@ -1395,15 +1395,24 @@ void wpa_supplicant_associate(struct wpa 
    189181                params.ssid_len = ssid->ssid_len; 
    190182        } 
     
    218210        params.wpa_ie_len = wpa_ie_len; 
    219211        params.pairwise_suite = cipher_pairwise; 
    220 --  
    221 1.7.9.4 
    222  
  • trunk/package/hostapd/patches/602-driver_nl80211-use-new-parameters-during-ibss-join.patch

    r32828 r33311  
    99 1 file changed, 32 insertions(+), 1 deletion(-) 
    1010 
    11 diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c 
    12 index 22e7075..f510d18 100644 
    1311--- a/src/drivers/driver_nl80211.c 
    1412+++ b/src/drivers/driver_nl80211.c 
    15 @@ -6481,7 +6481,7 @@ static int wpa_driver_nl80211_ibss(struct wpa_driver_nl80211_data *drv, 
     13@@ -6481,7 +6481,7 @@ static int wpa_driver_nl80211_ibss(struc 
    1614                                   struct wpa_driver_associate_params *params) 
    1715 { 
     
    6058        if (ret) 
    6159                goto nla_put_failure; 
    62 --  
    63 1.7.9.4 
    64  
  • trunk/package/hostapd/patches/604-wpa_s-support-htmode-param.patch

    r32830 r33311  
    1515 5 files changed, 88 insertions(+) 
    1616 
    17 diff --git a/src/drivers/driver.h b/src/drivers/driver.h 
    18 index dda2fbc..28bd181 100644 
    1917--- a/src/drivers/driver.h 
    2018+++ b/src/drivers/driver.h 
     
    2826        /** 
    2927         * bg_scan_period - Background scan period in seconds, 0 to disable 
    30 diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c 
    31 index 9783c96..d1257a7 100644 
    3228--- a/src/drivers/driver_nl80211.c 
    3329+++ b/src/drivers/driver_nl80211.c 
    34 @@ -6493,6 +6493,22 @@ retry: 
     30@@ -6545,6 +6545,22 @@ retry: 
    3531                NLA_PUT_U32(msg, NL80211_ATTR_MCAST_RATE, params->mcast_rate); 
    3632        } 
     
    5551        if (ret) 
    5652                goto nla_put_failure; 
    57 diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c 
    58 index 3d6c0e6..d96b2ea 100644 
    5953--- a/wpa_supplicant/config.c 
    6054+++ b/wpa_supplicant/config.c 
    61 @@ -1468,6 +1468,71 @@ static char * wpa_config_write_mcast_rate(const struct parse_data *data, 
     55@@ -1463,6 +1463,71 @@ static char * wpa_config_write_mcast_rat 
    6256 } 
    6357 #endif /* NO_CONFIG_WRITE */ 
     
    131125                                  struct wpa_ssid *ssid, int line, 
    132126                                  const char *value) 
    133 @@ -1706,6 +1771,7 @@ static const struct parse_data ssid_fields[] = { 
     127@@ -1701,6 +1766,7 @@ static const struct parse_data ssid_fiel 
    134128        { INT_RANGE(beacon_interval, 0, 1000) }, 
    135129        { FUNC(rates) }, 
     
    139133  
    140134 #undef OFFSET 
    141 diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h 
    142 index 8d152a4..7143277 100644 
    143135--- a/wpa_supplicant/config_ssid.h 
    144136+++ b/wpa_supplicant/config_ssid.h 
     
    152144  
    153145 #endif /* CONFIG_SSID_H */ 
    154 diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c 
    155 index 59efa16..fc8762f 100644 
    156146--- a/wpa_supplicant/wpa_supplicant.c 
    157147+++ b/wpa_supplicant/wpa_supplicant.c 
    158 @@ -1379,6 +1379,8 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s, 
     148@@ -1411,6 +1411,8 @@ void wpa_supplicant_associate(struct wpa 
    159149                        i++; 
    160150                } 
     
    165155  
    166156        params.wpa_ie = wpa_ie; 
    167 --  
    168 1.7.9.4 
    169  
Note: See TracChangeset for help on using the changeset viewer.