mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-16 21:56:16 +02:00
f730e825f0
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31515 3c298f89-4303-0410-b956-a3cf2f4a3e73
61 lines
1.9 KiB
Diff
61 lines
1.9 KiB
Diff
--- a/src/drivers/driver_nl80211.c
|
|
+++ b/src/drivers/driver_nl80211.c
|
|
@@ -2931,6 +2931,7 @@ static void * wpa_driver_nl80211_init(vo
|
|
drv->monitor_sock = -1;
|
|
drv->eapol_tx_sock = -1;
|
|
drv->ap_scan_as_station = NL80211_IFTYPE_UNSPECIFIED;
|
|
+ drv->nlmode = NL80211_IFTYPE_STATION;
|
|
|
|
if (wpa_driver_nl80211_init_nl(drv)) {
|
|
os_free(drv);
|
|
@@ -3245,17 +3246,12 @@ static void wpa_driver_nl80211_send_rfki
|
|
wpa_supplicant_event(timeout_ctx, EVENT_INTERFACE_DISABLED, NULL);
|
|
}
|
|
|
|
-
|
|
static int
|
|
-wpa_driver_nl80211_finish_drv_init(struct wpa_driver_nl80211_data *drv)
|
|
+wpa_driver_nl80211_finish_drv_init_sta(struct wpa_driver_nl80211_data *drv,
|
|
+ int *send_rfkill_event)
|
|
{
|
|
struct i802_bss *bss = &drv->first_bss;
|
|
- int send_rfkill_event = 0;
|
|
|
|
- drv->ifindex = if_nametoindex(bss->ifname);
|
|
- drv->first_bss.ifindex = drv->ifindex;
|
|
-
|
|
-#ifndef HOSTAPD
|
|
/*
|
|
* Make sure the interface starts up in station mode unless this is a
|
|
* dynamically added interface (e.g., P2P) that was already configured
|
|
@@ -3274,7 +3270,7 @@ wpa_driver_nl80211_finish_drv_init(struc
|
|
"interface '%s' due to rfkill",
|
|
bss->ifname);
|
|
drv->if_disabled = 1;
|
|
- send_rfkill_event = 1;
|
|
+ *send_rfkill_event = 1;
|
|
} else {
|
|
wpa_printf(MSG_ERROR, "nl80211: Could not set "
|
|
"interface '%s' UP", bss->ifname);
|
|
@@ -3284,7 +3280,19 @@ wpa_driver_nl80211_finish_drv_init(struc
|
|
|
|
netlink_send_oper_ifla(drv->global->netlink, drv->ifindex,
|
|
1, IF_OPER_DORMANT);
|
|
-#endif /* HOSTAPD */
|
|
+}
|
|
+
|
|
+static int
|
|
+wpa_driver_nl80211_finish_drv_init(struct wpa_driver_nl80211_data *drv)
|
|
+{
|
|
+ struct i802_bss *bss = &drv->first_bss;
|
|
+ int send_rfkill_event = 0;
|
|
+
|
|
+ drv->ifindex = if_nametoindex(bss->ifname);
|
|
+ drv->first_bss.ifindex = drv->ifindex;
|
|
+
|
|
+ if (drv->nlmode == NL80211_IFTYPE_STATION)
|
|
+ wpa_driver_nl80211_finish_drv_init_sta(drv, &send_rfkill_event);
|
|
|
|
if (wpa_driver_nl80211_capa(drv))
|
|
return -1;
|