diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-06-30 21:01:13 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-06-30 21:01:13 +0000 |
| commit | 378caa3427e4bc0a2a3f942ec27d1097e1b96826 (patch) | |
| tree | f996e1697082511c4936034e294c7242f949337c /package/network/services/hostapd/patches/453-ap_sta_support.patch | |
| parent | 5cdd493473fc1782720eaeee1148168d04f51c38 (diff) | |
| download | upstream-378caa3427e4bc0a2a3f942ec27d1097e1b96826.tar.gz upstream-378caa3427e4bc0a2a3f942ec27d1097e1b96826.tar.bz2 upstream-378caa3427e4bc0a2a3f942ec27d1097e1b96826.zip | |
hostapd: fix multi-ssid and AP+STA, clean up code
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37111 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/hostapd/patches/453-ap_sta_support.patch')
| -rw-r--r-- | package/network/services/hostapd/patches/453-ap_sta_support.patch | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/package/network/services/hostapd/patches/453-ap_sta_support.patch b/package/network/services/hostapd/patches/453-ap_sta_support.patch index 5481529014..9ccc3dd0cf 100644 --- a/package/network/services/hostapd/patches/453-ap_sta_support.patch +++ b/package/network/services/hostapd/patches/453-ap_sta_support.patch @@ -47,7 +47,7 @@ CONFIG_OS=win32 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c -@@ -109,6 +109,55 @@ extern int wpa_debug_show_keys; +@@ -109,6 +109,48 @@ extern int wpa_debug_show_keys; extern int wpa_debug_timestamp; extern struct wpa_driver_ops *wpa_drivers[]; @@ -70,24 +70,17 @@ + char *cmd = NULL; + char buf[256]; + int len = sizeof(buf); -+ int channel, hw_mode; ++ enum hostapd_hw_mode hw_mode; ++ u8 channel; + int ret; + + if (!bss) + return; + -+ if (bss->freq < 4000) { -+ hw_mode = HOSTAPD_MODE_IEEE80211G; -+ channel = (bss->freq - 2407) / 5; -+ } else { -+ hw_mode = HOSTAPD_MODE_IEEE80211A; -+ channel = (bss->freq - 5000) / 5; -+ } -+ ++ hw_mode = ieee80211_freq_to_chan(bss->freq, &channel); + if (asprintf(&cmd, "UPDATE channel=%d sec_chan=0 hw_mode=%d ieee80211n=%d", -+ channel, hw_mode, !!bss->ht_capab) < 0) { ++ channel, hw_mode, !!bss->ht_capab) < 0) + return -1; -+ } + + ret = wpa_ctrl_request(wpa_s->hostapd, cmd, os_strlen(cmd), buf, &len, NULL); + free(cmd); @@ -103,7 +96,7 @@ /* Configure default/group WEP keys for static WEP */ int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) { -@@ -675,8 +724,16 @@ void wpa_supplicant_set_state(struct wpa +@@ -675,8 +717,16 @@ void wpa_supplicant_set_state(struct wpa #endif /* CONFIG_P2P */ sme_sched_obss_scan(wpa_s, 1); @@ -120,7 +113,7 @@ wpa_s->new_connection = 1; wpa_drv_set_operstate(wpa_s, 0); #ifndef IEEE8021X_EAPOL -@@ -2866,6 +2923,21 @@ static int wpa_supplicant_init_iface(str +@@ -2866,6 +2916,21 @@ static int wpa_supplicant_init_iface(str os_strlcpy(wpa_s->bridge_ifname, iface->bridge_ifname, sizeof(wpa_s->bridge_ifname)); } |