diff options
| author | merging other branches <null@invalid> | 2008-11-26 16:07:01 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-26 16:07:01 +0000 |
| commit | 6d2c293d6578048e7b71e0c44897144f15f350ae (patch) | |
| tree | cba36be2a06ee7bfa0aab1a3c7d36bd67ea37402 /drivers/ar6000 | |
| parent | 524f4a1dfe71a8b353a244140164e09828abb68c (diff) | |
MERGE-via-balaji-tracking-hist-MERGE-via-stable-tracking-hist-MERGE-via-mokopatches-tracking-via-master-s3c-hsmmc-clean
balaji-tracking-hist top was efb2d57c0e0ed62324d79d6c5793fe797c157266
Diffstat (limited to 'drivers/ar6000')
| -rw-r--r-- | drivers/ar6000/ar6000/wireless_ext.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/ar6000/ar6000/wireless_ext.c b/drivers/ar6000/ar6000/wireless_ext.c index ab4d21b1f8c..0aa4bdc1a5c 100644 --- a/drivers/ar6000/ar6000/wireless_ext.c +++ b/drivers/ar6000/ar6000/wireless_ext.c @@ -317,7 +317,19 @@ ar6000_ioctl_siwessid(struct net_device *dev, ar->arNetworkType = arNetworkType; } - if ((ar->arSsidLen) || (!data->flags)) + /* + * The original logic here prevented a disconnect if issuing an "essid off" + * if no ESSID was set, presumably to prevent sending multiple disconnects + * to the WMI. + * + * Unfortunately, this also meant that no disconnect was sent when we were + * already connected, but the profile has been changed since (which also + * clears the ESSID as a reminder that the WMI needs updating.) + * + * The "1 ||" makes sure we always disconnect or reconnect. The WMI doesn't + * seem to mind being sent multiple disconnects. + */ + if (1 || (ar->arSsidLen) || (!data->flags)) { if ((!data->flags) || (A_MEMCMP(ar->arSsid, ssid, ar->arSsidLen) != 0) || |