2013-06-09 13:53:19

by Kirshenbaum Erez

Subject: [PATCH v2] wil6210: Fix AP/PCP start flow

WMI PCP Start flow should not be hanled through:
net_device_ops->ndo_open()->wil_up()->__wil_up()
because it missing mandatory FW parameters (SSID,Channel,IEs, Security...).

Prior to AP starting __wil_up() may be called with iftype set
cfg80211_ops->change_virtual_intf(NL80211_IFTYPE_AP or STATION)
depend on the application hostapd/wpa_supplicant/iw.
there should not be an attempt to start an AP flow,
AP/PCP start flow will be started latter by cfg80211_ops->start_ap().


Signed-off-by: Kirshenbaum Erez <[email protected]>
---
drivers/net/wireless/ath/wil6210/main.c | 35 ---------------------------------
1 file changed, 35 deletions(-)

diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index c97b864..271ee22 100644
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -286,41 +286,31 @@ static int __wil_up(struct wil6210_priv *wil)
{
struct net_device *ndev = wil_to_ndev(wil);
struct wireless_dev *wdev = wil->wdev;
- struct ieee80211_channel *channel = wdev->preset_chandef.chan;
int rc;
- int bi;
- u16 wmi_nettype = wil_iftype_nl2wmi(wdev->iftype);

rc = wil_reset(wil);
if (rc)
return rc;

- /* FIXME Firmware works now in PBSS mode(ToDS=0, FromDS=0) */
- wmi_nettype = wil_iftype_nl2wmi(NL80211_IFTYPE_ADHOC);
switch (wdev->iftype) {
case NL80211_IFTYPE_STATION:
wil_dbg_misc(wil, "type: STATION\n");
- bi = 0;
ndev->type = ARPHRD_ETHER;
break;
case NL80211_IFTYPE_AP:
wil_dbg_misc(wil, "type: AP\n");
- bi = 100;
ndev->type = ARPHRD_ETHER;
break;
case NL80211_IFTYPE_P2P_CLIENT:
wil_dbg_misc(wil, "type: P2P_CLIENT\n");
- bi = 0;
ndev->type = ARPHRD_ETHER;
break;
case NL80211_IFTYPE_P2P_GO:
wil_dbg_misc(wil, "type: P2P_GO\n");
- bi = 100;
ndev->type = ARPHRD_ETHER;
break;
case NL80211_IFTYPE_MONITOR:
wil_dbg_misc(wil, "type: Monitor\n");
- bi = 0;
ndev->type = ARPHRD_IEEE80211_RADIOTAP;
/* ARPHRD_IEEE80211 or ARPHRD_IEEE80211_RADIOTAP ? */
break;
@@ -328,34 +318,9 @@ static int __wil_up(struct wil6210_priv *wil)
return -EOPNOTSUPP;
}

- /* Apply profile in the following order: */
- /* SSID and channel for the AP */
- switch (wdev->iftype) {
- case NL80211_IFTYPE_AP:
- case NL80211_IFTYPE_P2P_GO:
- if (wdev->ssid_len == 0) {
- wil_err(wil, "SSID not set\n");
- return -EINVAL;
- }
- rc = wmi_set_ssid(wil, wdev->ssid_len, wdev->ssid);
- if (rc)
- return rc;
- break;
- default:
- break;
- }
-
/* MAC address - pre-requisite for other commands */
wmi_set_mac_address(wil, ndev->dev_addr);

- /* Set up beaconing if required. */
- if (bi > 0) {
- rc = wmi_pcp_start(wil, bi, wmi_nettype,
- (channel ? channel->hw_value : 0));
- if (rc)
- return rc;
- }
-
/* Rx VRING. After MAC and beacon */
wil_rx_init(wil);

--
1.7.11.7

2013-06-09 14:35:13

by Vladimir Kondratiev

Subject: Re: [PATCH v2] wil6210: Fix AP/PCP start flow

On Sunday, June 09, 2013 03:52:51 PM Kirshenbaum Erez wrote:
> WMI PCP Start flow should not be hanled through:
> net_device_ops->ndo_open()->wil_up()->__wil_up()
> because it missing mandatory FW parameters (SSID,Channel,IEs, Security...).
>
> Prior to AP starting __wil_up() may be called with iftype set
> cfg80211_ops->change_virtual_intf(NL80211_IFTYPE_AP or STATION)
> depend on the application hostapd/wpa_supplicant/iw.
> there should not be an attempt to start an AP flow,
> AP/PCP start flow will be started latter by cfg80211_ops->start_ap().
>
>
> Signed-off-by: Kirshenbaum Erez <[email protected]>

Looks good. I fixed typo (s/hanled/handled/) and rebased; submitting as [PATCH v3]...

Thanks, Vladimir