| OLD | NEW |
| 1 /****************************************************************************** | 1 /****************************************************************************** |
| 2 * | 2 * |
| 3 * GPL LICENSE SUMMARY | 3 * GPL LICENSE SUMMARY |
| 4 * | 4 * |
| 5 * Copyright(c) 2008 - 2010 Intel Corporation. All rights reserved. | 5 * Copyright(c) 2008 - 2010 Intel Corporation. All rights reserved. |
| 6 * | 6 * |
| 7 * This program is free software; you can redistribute it and/or modify | 7 * This program is free software; you can redistribute it and/or modify |
| 8 * it under the terms of version 2 of the GNU General Public License as | 8 * it under the terms of version 2 of the GNU General Public License as |
| 9 * published by the Free Software Foundation. | 9 * published by the Free Software Foundation. |
| 10 * | 10 * |
| (...skipping 1393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1404 | 1404 |
| 1405 done: | 1405 done: |
| 1406 /* Cannot perform scan. Make sure we clear scanning | 1406 /* Cannot perform scan. Make sure we clear scanning |
| 1407 * bits from status so next scan request can be performed. | 1407 * bits from status so next scan request can be performed. |
| 1408 * If we don't clear scanning status bit here all next scan | 1408 * If we don't clear scanning status bit here all next scan |
| 1409 * will fail | 1409 * will fail |
| 1410 */ | 1410 */ |
| 1411 clear_bit(STATUS_SCAN_HW, &priv->status); | 1411 clear_bit(STATUS_SCAN_HW, &priv->status); |
| 1412 clear_bit(STATUS_SCANNING, &priv->status); | 1412 clear_bit(STATUS_SCANNING, &priv->status); |
| 1413 /* inform mac80211 scan aborted */ | 1413 /* inform mac80211 scan aborted */ |
| 1414 » queue_work(priv->workqueue, &priv->scan_completed); | 1414 » queue_work(priv->workqueue, &priv->abort_scan); |
| 1415 } | 1415 } |
| 1416 | 1416 |
| 1417 int iwlagn_manage_ibss_station(struct iwl_priv *priv, | 1417 int iwlagn_manage_ibss_station(struct iwl_priv *priv, |
| 1418 struct ieee80211_vif *vif, bool add) | 1418 struct ieee80211_vif *vif, bool add) |
| 1419 { | 1419 { |
| 1420 struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv; | 1420 struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv; |
| 1421 | 1421 |
| 1422 if (add) | 1422 if (add) |
| 1423 return iwl_add_bssid_station(priv, vif->bss_conf.bssid, true, | 1423 return iwl_add_bssid_station(priv, vif->bss_conf.bssid, true, |
| 1424 &vif_priv->ibss_bssid_sta_id); | 1424 &vif_priv->ibss_bssid_sta_id); |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1511 if (priv->cfg->ops->lib->txfifo_flush(priv, IWL_DROP_ALL)) { | 1511 if (priv->cfg->ops->lib->txfifo_flush(priv, IWL_DROP_ALL)) { |
| 1512 IWL_ERR(priv, "flush request fail\n"); | 1512 IWL_ERR(priv, "flush request fail\n"); |
| 1513 goto done; | 1513 goto done; |
| 1514 } | 1514 } |
| 1515 IWL_DEBUG_INFO(priv, "wait transmit/flush all frames\n"); | 1515 IWL_DEBUG_INFO(priv, "wait transmit/flush all frames\n"); |
| 1516 iwlagn_wait_tx_queue_empty(priv); | 1516 iwlagn_wait_tx_queue_empty(priv); |
| 1517 done: | 1517 done: |
| 1518 ieee80211_wake_queues(priv->hw); | 1518 ieee80211_wake_queues(priv->hw); |
| 1519 mutex_unlock(&priv->mutex); | 1519 mutex_unlock(&priv->mutex); |
| 1520 } | 1520 } |
| OLD | NEW |