There was an issue with internal scan during association wherein
we would complete internal scan on first scan command response.
This would cause association failure if AP is not found in first scan
response e.g. APs from A band.
This patch fixes this issue by completing internal scan only when all
scan commands from scan pending queue and command pending queue are
sent to FW and response to last scan command is received.
Signed-off-by: Avinash Patil <[email protected]>
Signed-off-by: Amitkumar Karwar <[email protected]>
Signed-off-by: Cathy Luo <[email protected]>
Tested-by: Xinmin Hu <[email protected]>
---
drivers/net/wireless/mwifiex/scan.c | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index dee717a..bec48cc 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1970,9 +1970,34 @@ int mwifiex_cmd_802_11_scan_ext(struct mwifiex_private *priv,
/* This function handles the command response of extended scan */
int mwifiex_ret_802_11_scan_ext(struct mwifiex_private *priv)
{
+ struct mwifiex_adapter *adapter = priv->adapter;
+ struct host_cmd_ds_command *cmd_ptr;
+ struct cmd_ctrl_node *cmd_node;
+ unsigned long cmd_flags, scan_flags;
+ bool complete_scan = false;
+
dev_dbg(priv->adapter->dev, "info: EXT scan returns successfully\n");
- mwifiex_complete_scan(priv);
+ spin_lock_irqsave(&adapter->cmd_pending_q_lock, cmd_flags);
+ spin_lock_irqsave(&adapter->scan_pending_q_lock, scan_flags);
+ if (list_empty(&adapter->scan_pending_q)) {
+ complete_scan = true;
+ list_for_each_entry(cmd_node, &adapter->cmd_pending_q, list) {
+ cmd_ptr = (void *)cmd_node->cmd_skb->data;
+ if (le16_to_cpu(cmd_ptr->command) ==
+ HostCmd_CMD_802_11_SCAN_EXT) {
+ dev_dbg(priv->adapter->dev,
+ "Scan pending in command pending list");
+ complete_scan = false;
+ break;
+ }
+ }
+ }
+ spin_unlock_irqrestore(&adapter->scan_pending_q_lock, scan_flags);
+ spin_unlock_irqrestore(&adapter->cmd_pending_q_lock, cmd_flags);
+
+ if (complete_scan)
+ mwifiex_complete_scan(priv);
return 0;
}
--
1.8.1.4
This one either, nor the rest in the series.
Please rebase as necessary and repost the series. I'm dropping
these patches.
John
On Mon, Aug 18, 2014 at 02:12:50AM -0700, Avinash Patil wrote:
> There was an issue with internal scan during association wherein
> we would complete internal scan on first scan command response.
> This would cause association failure if AP is not found in first scan
> response e.g. APs from A band.
> This patch fixes this issue by completing internal scan only when all
> scan commands from scan pending queue and command pending queue are
> sent to FW and response to last scan command is received.
>
> Signed-off-by: Avinash Patil <[email protected]>
> Signed-off-by: Amitkumar Karwar <[email protected]>
> Signed-off-by: Cathy Luo <[email protected]>
> Tested-by: Xinmin Hu <[email protected]>
> ---
> drivers/net/wireless/mwifiex/scan.c | 27 ++++++++++++++++++++++++++-
> 1 file changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
> index dee717a..bec48cc 100644
> --- a/drivers/net/wireless/mwifiex/scan.c
> +++ b/drivers/net/wireless/mwifiex/scan.c
> @@ -1970,9 +1970,34 @@ int mwifiex_cmd_802_11_scan_ext(struct mwifiex_private *priv,
> /* This function handles the command response of extended scan */
> int mwifiex_ret_802_11_scan_ext(struct mwifiex_private *priv)
> {
> + struct mwifiex_adapter *adapter = priv->adapter;
> + struct host_cmd_ds_command *cmd_ptr;
> + struct cmd_ctrl_node *cmd_node;
> + unsigned long cmd_flags, scan_flags;
> + bool complete_scan = false;
> +
> dev_dbg(priv->adapter->dev, "info: EXT scan returns successfully\n");
>
> - mwifiex_complete_scan(priv);
> + spin_lock_irqsave(&adapter->cmd_pending_q_lock, cmd_flags);
> + spin_lock_irqsave(&adapter->scan_pending_q_lock, scan_flags);
> + if (list_empty(&adapter->scan_pending_q)) {
> + complete_scan = true;
> + list_for_each_entry(cmd_node, &adapter->cmd_pending_q, list) {
> + cmd_ptr = (void *)cmd_node->cmd_skb->data;
> + if (le16_to_cpu(cmd_ptr->command) ==
> + HostCmd_CMD_802_11_SCAN_EXT) {
> + dev_dbg(priv->adapter->dev,
> + "Scan pending in command pending list");
> + complete_scan = false;
> + break;
> + }
> + }
> + }
> + spin_unlock_irqrestore(&adapter->scan_pending_q_lock, scan_flags);
> + spin_unlock_irqrestore(&adapter->cmd_pending_q_lock, cmd_flags);
> +
> + if (complete_scan)
> + mwifiex_complete_scan(priv);
>
> return 0;
> }
> --
> 1.8.1.4
>
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.
Hi John,
Thanks for the information.
I will rebase these patches on top of 3.17rc2 and resend them.
Thanks,
Avinash
-----Original Message-----
From: John W. Linville [mailto:[email protected]]
Sent: Friday, August 29, 2014 12:12 AM
To: Avinash Patil
Cc: [email protected]; Amitkumar Karwar; Cathy Luo; Marc Yang; Xinming Hu
Subject: Re: [PATCH 2/4] mwifiex: rework internal scan for association
This one either, nor the rest in the series.
Please rebase as necessary and repost the series. I'm dropping these patches.
John
On Mon, Aug 18, 2014 at 02:12:50AM -0700, Avinash Patil wrote:
> There was an issue with internal scan during association wherein we
> would complete internal scan on first scan command response.
> This would cause association failure if AP is not found in first scan
> response e.g. APs from A band.
> This patch fixes this issue by completing internal scan only when all
> scan commands from scan pending queue and command pending queue are
> sent to FW and response to last scan command is received.
>
> Signed-off-by: Avinash Patil <[email protected]>
> Signed-off-by: Amitkumar Karwar <[email protected]>
> Signed-off-by: Cathy Luo <[email protected]>
> Tested-by: Xinmin Hu <[email protected]>
> ---
> drivers/net/wireless/mwifiex/scan.c | 27 ++++++++++++++++++++++++++-
> 1 file changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/mwifiex/scan.c
> b/drivers/net/wireless/mwifiex/scan.c
> index dee717a..bec48cc 100644
> --- a/drivers/net/wireless/mwifiex/scan.c
> +++ b/drivers/net/wireless/mwifiex/scan.c
> @@ -1970,9 +1970,34 @@ int mwifiex_cmd_802_11_scan_ext(struct
> mwifiex_private *priv,
> /* This function handles the command response of extended scan */
> int mwifiex_ret_802_11_scan_ext(struct mwifiex_private *priv) {
> + struct mwifiex_adapter *adapter = priv->adapter;
> + struct host_cmd_ds_command *cmd_ptr;
> + struct cmd_ctrl_node *cmd_node;
> + unsigned long cmd_flags, scan_flags;
> + bool complete_scan = false;
> +
> dev_dbg(priv->adapter->dev, "info: EXT scan returns
> successfully\n");
>
> - mwifiex_complete_scan(priv);
> + spin_lock_irqsave(&adapter->cmd_pending_q_lock, cmd_flags);
> + spin_lock_irqsave(&adapter->scan_pending_q_lock, scan_flags);
> + if (list_empty(&adapter->scan_pending_q)) {
> + complete_scan = true;
> + list_for_each_entry(cmd_node, &adapter->cmd_pending_q, list) {
> + cmd_ptr = (void *)cmd_node->cmd_skb->data;
> + if (le16_to_cpu(cmd_ptr->command) ==
> + HostCmd_CMD_802_11_SCAN_EXT) {
> + dev_dbg(priv->adapter->dev,
> + "Scan pending in command pending list");
> + complete_scan = false;
> + break;
> + }
> + }
> + }
> + spin_unlock_irqrestore(&adapter->scan_pending_q_lock, scan_flags);
> + spin_unlock_irqrestore(&adapter->cmd_pending_q_lock,
> + cmd_flags);
> +
> + if (complete_scan)
> + mwifiex_complete_scan(priv);
>
> return 0;
> }
> --
> 1.8.1.4
>
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.