On Sunday, June 09, 2013 10:01:32 AM Kirshenbaum Erez wrote:
> Proper flow for starting AP is by the wil_cfg80211_start_ap call (.start_ap)
> Hostapd flow for AP mode will call first to __wil_up (.ndo_open)
> and wil_cfg80211_start_ap.
> All required parameters for AP mode are carry in the info structure of
> .start_ap (SSID,Channel,BI,IEs, security ...) and missing in __wil_up.
I suppose this patch deserves more verbose comment. How about something
like this:
---cut---
When starting AP, call flow is the following
(it is a bit different for wpa_supplicant and hostapd):
- [hostapd] cfg80211_ops->change_virtual_intf(NL80211_IFTYPE_AP)
- net_device_ops->ndo_open() -> wil_up() -> __wil_up()
- [wpa_supplicant] cfg80211_ops->change_virtual_intf(NL80211_IFTYPE_AP)
- cfg80211_ops->start_ap()
Thus, prior to startin AP, __wil_up() may be called with iftype set to either
_AP or _STATION, and AP will be started later, with all required parameters
provided with start_ap() (SSID,Channel,BI,IEs, security ...).
Neither set any parameters for AP in the __wil_up(); nor attempt
to start AP here.
---cut---
>
> Signed-off-by: Kirshenbaum Erez <erezk@xxxxxxxxxxxx>
> ---
> 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);
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
