diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-05-28 16:27:12 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-05-28 16:27:12 +0000 |
commit | 1b2b3be64d236d2991836dc21066acc102c63f6b (patch) | |
tree | db3498e6271b15c9ded044b5357a0886a56c43d0 /package/hostapd/patches/540-optional_rfkill.patch | |
parent | 016e8dee34bf3f9e735f7ac9afd712e7472bfe7a (diff) | |
download | master-31e0f0ae-1b2b3be64d236d2991836dc21066acc102c63f6b.tar.gz master-31e0f0ae-1b2b3be64d236d2991836dc21066acc102c63f6b.tar.bz2 master-31e0f0ae-1b2b3be64d236d2991836dc21066acc102c63f6b.zip |
hostapd: update to 20110527, includes a client mode wpa auth fix
SVN-Revision: 27021
Diffstat (limited to 'package/hostapd/patches/540-optional_rfkill.patch')
-rw-r--r-- | package/hostapd/patches/540-optional_rfkill.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/package/hostapd/patches/540-optional_rfkill.patch b/package/hostapd/patches/540-optional_rfkill.patch index ba5d806441..1c15f6448d 100644 --- a/package/hostapd/patches/540-optional_rfkill.patch +++ b/package/hostapd/patches/540-optional_rfkill.patch @@ -10,7 +10,7 @@ struct wpa_driver_capa capa; int has_capability; -@@ -1776,7 +1778,7 @@ err1: +@@ -1819,7 +1821,7 @@ err1: return -1; } @@ -19,7 +19,7 @@ static void wpa_driver_nl80211_rfkill_blocked(void *ctx) { wpa_printf(MSG_DEBUG, "nl80211: RFKILL blocked"); -@@ -1798,6 +1800,7 @@ static void wpa_driver_nl80211_rfkill_un +@@ -1841,6 +1843,7 @@ static void wpa_driver_nl80211_rfkill_un } /* rtnetlink ifup handler will report interface as enabled */ } @@ -27,7 +27,7 @@ static void nl80211_get_phy_name(struct wpa_driver_nl80211_data *drv) -@@ -1846,7 +1849,9 @@ static void * wpa_driver_nl80211_init(vo +@@ -1889,7 +1892,9 @@ static void * wpa_driver_nl80211_init(vo { struct wpa_driver_nl80211_data *drv; struct netlink_config *cfg; @@ -37,7 +37,7 @@ struct i802_bss *bss; drv = os_zalloc(sizeof(*drv)); -@@ -1887,6 +1892,7 @@ static void * wpa_driver_nl80211_init(vo +@@ -1930,6 +1935,7 @@ static void * wpa_driver_nl80211_init(vo goto failed; } @@ -45,7 +45,7 @@ rcfg = os_zalloc(sizeof(*rcfg)); if (rcfg == NULL) goto failed; -@@ -1899,6 +1905,7 @@ static void * wpa_driver_nl80211_init(vo +@@ -1942,6 +1948,7 @@ static void * wpa_driver_nl80211_init(vo wpa_printf(MSG_DEBUG, "nl80211: RFKILL status not available"); os_free(rcfg); } @@ -53,7 +53,7 @@ if (wpa_driver_nl80211_finish_drv_init(drv)) goto failed; -@@ -1909,7 +1916,9 @@ static void * wpa_driver_nl80211_init(vo +@@ -1952,7 +1959,9 @@ static void * wpa_driver_nl80211_init(vo return bss; failed: @@ -63,7 +63,7 @@ netlink_deinit(drv->netlink); if (drv->ioctl_sock >= 0) close(drv->ioctl_sock); -@@ -2012,10 +2021,12 @@ static int nl80211_register_action_frame +@@ -2055,10 +2064,12 @@ static int nl80211_register_action_frame } @@ -76,7 +76,7 @@ static int -@@ -2034,13 +2045,16 @@ wpa_driver_nl80211_finish_drv_init(struc +@@ -2077,13 +2088,16 @@ wpa_driver_nl80211_finish_drv_init(struc } if (linux_set_iface_flags(drv->ioctl_sock, bss->ifname, 1)) { @@ -94,7 +94,7 @@ wpa_printf(MSG_ERROR, "nl80211: Could not set " "interface '%s' UP", bss->ifname); return -1; -@@ -2068,8 +2082,10 @@ wpa_driver_nl80211_finish_drv_init(struc +@@ -2111,8 +2125,10 @@ wpa_driver_nl80211_finish_drv_init(struc } if (send_rfkill_event) { @@ -105,7 +105,7 @@ } return 0; -@@ -2150,7 +2166,9 @@ static void wpa_driver_nl80211_deinit(vo +@@ -2193,7 +2209,9 @@ static void wpa_driver_nl80211_deinit(vo netlink_send_oper_ifla(drv->netlink, drv->ifindex, 0, IF_OPER_UP); netlink_deinit(drv->netlink); @@ -115,7 +115,7 @@ eloop_cancel_timeout(wpa_driver_nl80211_scan_timeout, drv, drv->ctx); -@@ -5708,7 +5726,9 @@ static void *i802_init(struct hostapd_da +@@ -5785,7 +5803,9 @@ static void *i802_init(struct hostapd_da failed: nl80211_remove_monitor_interface(drv); |