Commit dae0412d authored by Ondrej Zary's avatar Ondrej Zary Committed by Kalle Valo

airo: fix scan after SIOCSIWAP (airo_set_wap)

SIOCSIWAP (airo_set_wap) affects scan: only the AP specified by
SIOCSIWAP is present in scan results.

This makes NetworkManager work for the first time but then unable to
find any other APs.

Clear APList before starting scan and set it back after scan completes
to work-around the problem.

To avoid losing packets during scan, modify disable_MAC() to omit
netif_carrier_off() call when lock == 2.
Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent f675f93a
...@@ -3037,6 +3037,11 @@ static void airo_process_scan_results (struct airo_info *ai) { ...@@ -3037,6 +3037,11 @@ static void airo_process_scan_results (struct airo_info *ai) {
} }
out: out:
/* write APList back (we cleared it in airo_set_scan) */
disable_MAC(ai, 2);
writeAPListRid(ai, &ai->APList, 0);
enable_MAC(ai, 0);
ai->scan_timeout = 0; ai->scan_timeout = 0;
clear_bit(JOB_SCAN_RESULTS, &ai->jobs); clear_bit(JOB_SCAN_RESULTS, &ai->jobs);
up(&ai->sem); up(&ai->sem);
...@@ -3608,17 +3613,18 @@ static void disable_MAC( struct airo_info *ai, int lock ) { ...@@ -3608,17 +3613,18 @@ static void disable_MAC( struct airo_info *ai, int lock ) {
Cmd cmd; Cmd cmd;
Resp rsp; Resp rsp;
if (lock && down_interruptible(&ai->sem)) if (lock == 1 && down_interruptible(&ai->sem))
return; return;
if (test_bit(FLAG_ENABLED, &ai->flags)) { if (test_bit(FLAG_ENABLED, &ai->flags)) {
if (lock != 2) /* lock == 2 means don't disable carrier */
netif_carrier_off(ai->dev); netif_carrier_off(ai->dev);
memset(&cmd, 0, sizeof(cmd)); memset(&cmd, 0, sizeof(cmd));
cmd.cmd = MAC_DISABLE; // disable in case already enabled cmd.cmd = MAC_DISABLE; // disable in case already enabled
issuecommand(ai, &cmd, &rsp); issuecommand(ai, &cmd, &rsp);
clear_bit(FLAG_ENABLED, &ai->flags); clear_bit(FLAG_ENABLED, &ai->flags);
} }
if (lock) if (lock == 1)
up(&ai->sem); up(&ai->sem);
} }
...@@ -7216,6 +7222,7 @@ static int airo_set_scan(struct net_device *dev, ...@@ -7216,6 +7222,7 @@ static int airo_set_scan(struct net_device *dev,
Cmd cmd; Cmd cmd;
Resp rsp; Resp rsp;
int wake = 0; int wake = 0;
APListRid APList_rid_empty;
/* Note : you may have realised that, as this is a SET operation, /* Note : you may have realised that, as this is a SET operation,
* this is privileged and therefore a normal user can't * this is privileged and therefore a normal user can't
...@@ -7233,6 +7240,13 @@ static int airo_set_scan(struct net_device *dev, ...@@ -7233,6 +7240,13 @@ static int airo_set_scan(struct net_device *dev,
if (ai->scan_timeout > 0) if (ai->scan_timeout > 0)
goto out; goto out;
/* Clear APList as it affects scan results */
memset(&APList_rid_empty, 0, sizeof(APList_rid_empty));
APList_rid_empty.len = cpu_to_le16(sizeof(APList_rid_empty));
disable_MAC(ai, 2);
writeAPListRid(ai, &APList_rid_empty, 0);
enable_MAC(ai, 0);
/* Initiate a scan command */ /* Initiate a scan command */
ai->scan_timeout = RUN_AT(3*HZ); ai->scan_timeout = RUN_AT(3*HZ);
memset(&cmd, 0, sizeof(cmd)); memset(&cmd, 0, sizeof(cmd));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment