evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "wil6210: store bss object and use cfg80211_connect_bss()"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-09 23:59:24 -07:00 • committed by Gerrit - the friendly Code Review server
commit 986a1ee715
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/wireless/ath/wil6210/cfg80211.c
View file

@ -766,6 +766,7 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,
if (rc == 0) { if (rc == 0) {
netif_carrier_on(ndev); netif_carrier_on(ndev);
wil6210_bus_request(wil, WIL_MAX_BUS_REQUEST_KBPS); wil6210_bus_request(wil, WIL_MAX_BUS_REQUEST_KBPS);
wil->bss = bss;
/* Connect can take lots of time */ /* Connect can take lots of time */
mod_timer(&wil->connect_timer, mod_timer(&wil->connect_timer,
jiffies + msecs_to_jiffies(2000)); jiffies + msecs_to_jiffies(2000));

1
drivers/net/wireless/ath/wil6210/main.c
View file

@ -281,6 +281,7 @@ static void _wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid,
cfg80211_connect_result(ndev, bssid, NULL, 0, NULL, 0, cfg80211_connect_result(ndev, bssid, NULL, 0, NULL, 0,
WLAN_STATUS_UNSPECIFIED_FAILURE, WLAN_STATUS_UNSPECIFIED_FAILURE,
GFP_KERNEL); GFP_KERNEL);
wil->bss = NULL;
} }
clear_bit(wil_status_fwconnecting, wil->status); clear_bit(wil_status_fwconnecting, wil->status);
break; break;

1
drivers/net/wireless/ath/wil6210/wil6210.h
View file

@ -621,6 +621,7 @@ struct wil6210_priv {
u16 channel; /* relevant in AP mode */ u16 channel; /* relevant in AP mode */
int sinfo_gen; int sinfo_gen;
u32 ap_isolate; /* no intra-BSS communication */ u32 ap_isolate; /* no intra-BSS communication */
struct cfg80211_bss *bss; /* connected bss, relevant in STA mode */
/* interrupt moderation */ /* interrupt moderation */
u32 tx_max_burst_duration; u32 tx_max_burst_duration;
u32 tx_interframe_timeout; u32 tx_interframe_timeout;

14
drivers/net/wireless/ath/wil6210/wmi.c
View file

@ -573,12 +573,16 @@ static void wmi_evt_connect(struct wil6210_priv *wil, int id, void *d, int len)
GFP_KERNEL); GFP_KERNEL);
goto out; goto out;
} else { } else {
cfg80211_connect_result(ndev, evt->bssid, struct wiphy *wiphy = wil_to_wiphy(wil);
assoc_req_ie, assoc_req_ielen,
assoc_resp_ie, assoc_resp_ielen, cfg80211_ref_bss(wiphy, wil->bss);
WLAN_STATUS_SUCCESS, cfg80211_connect_bss(ndev, evt->bssid, wil->bss,
GFP_KERNEL); assoc_req_ie, assoc_req_ielen,
assoc_resp_ie, assoc_resp_ielen,
WLAN_STATUS_SUCCESS, GFP_KERNEL,
NL80211_TIMEOUT_UNSPECIFIED);
} }
wil->bss = NULL;
} else if ((wdev->iftype == NL80211_IFTYPE_AP) || } else if ((wdev->iftype == NL80211_IFTYPE_AP) ||
(wdev->iftype == NL80211_IFTYPE_P2P_GO)) { (wdev->iftype == NL80211_IFTYPE_P2P_GO)) {
if (rc) { if (rc) {