mac80211.c (16b02d711f4059b8338ef967064195b47cae65ea) mac80211.c (03098268a30d75188f15dd8fda8f0c896d2846e5)
1/******************************************************************************
2 *
3 * This file is provided under a dual BSD/GPLv2 license. When using or
4 * redistributing this file, you may do so under either license.
5 *
6 * GPL LICENSE SUMMARY
7 *
8 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

--- 1807 unchanged lines hidden (view full) ---

1816 /*
1817 * Re-calculate the tsf id, as the master-slave relations depend on the
1818 * beacon interval, which was not known when the station interface was
1819 * added.
1820 */
1821 if (changes & BSS_CHANGED_ASSOC && bss_conf->assoc)
1822 iwl_mvm_mac_ctxt_recalc_tsf_id(mvm, vif);
1823
1/******************************************************************************
2 *
3 * This file is provided under a dual BSD/GPLv2 license. When using or
4 * redistributing this file, you may do so under either license.
5 *
6 * GPL LICENSE SUMMARY
7 *
8 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

--- 1807 unchanged lines hidden (view full) ---

1816 /*
1817 * Re-calculate the tsf id, as the master-slave relations depend on the
1818 * beacon interval, which was not known when the station interface was
1819 * added.
1820 */
1821 if (changes & BSS_CHANGED_ASSOC && bss_conf->assoc)
1822 iwl_mvm_mac_ctxt_recalc_tsf_id(mvm, vif);
1823
1824 if (changes & BSS_CHANGED_ASSOC && !bss_conf->assoc &&
1825 mvmvif->lqm_active)
1826 iwl_mvm_send_lqm_cmd(vif, LQM_CMD_OPERATION_STOP_MEASUREMENT,
1827 0, 0);
1828
1824 /*
1825 * If we're not associated yet, take the (new) BSSID before associating
1826 * so the firmware knows. If we're already associated, then use the old
1827 * BSSID here, and we'll send a cleared one later in the CHANGED_ASSOC
1828 * branch for disassociation below.
1829 */
1830 if (changes & BSS_CHANGED_BSSID && !mvmvif->associated)
1831 memcpy(mvmvif->bssid, bss_conf->bssid, ETH_ALEN);

--- 1791 unchanged lines hidden (view full) ---

3623 if (WARN_ONCE(mvmvif->csa_countdown,
3624 "Previous CSA countdown didn't complete")) {
3625 ret = -EBUSY;
3626 goto out_unlock;
3627 }
3628
3629 break;
3630 case NL80211_IFTYPE_STATION:
1829 /*
1830 * If we're not associated yet, take the (new) BSSID before associating
1831 * so the firmware knows. If we're already associated, then use the old
1832 * BSSID here, and we'll send a cleared one later in the CHANGED_ASSOC
1833 * branch for disassociation below.
1834 */
1835 if (changes & BSS_CHANGED_BSSID && !mvmvif->associated)
1836 memcpy(mvmvif->bssid, bss_conf->bssid, ETH_ALEN);

--- 1791 unchanged lines hidden (view full) ---

3628 if (WARN_ONCE(mvmvif->csa_countdown,
3629 "Previous CSA countdown didn't complete")) {
3630 ret = -EBUSY;
3631 goto out_unlock;
3632 }
3633
3634 break;
3635 case NL80211_IFTYPE_STATION:
3636 if (mvmvif->lqm_active)
3637 iwl_mvm_send_lqm_cmd(vif,
3638 LQM_CMD_OPERATION_STOP_MEASUREMENT,
3639 0, 0);
3640
3631 /* Schedule the time event to a bit before beacon 1,
3632 * to make sure we're in the new channel when the
3633 * GO/AP arrives.
3634 */
3635 apply_time = chsw->device_timestamp +
3636 ((vif->bss_conf.beacon_int * (chsw->count - 1) -
3637 IWL_MVM_CHANNEL_SWITCH_TIME_CLIENT) * 1024);
3638

--- 410 unchanged lines hidden --- 		3641 /* Schedule the time event to a bit before beacon 1,
3642 * to make sure we're in the new channel when the
3643 * GO/AP arrives.
3644 */
3645 apply_time = chsw->device_timestamp +
3646 ((vif->bss_conf.beacon_int * (chsw->count - 1) -
3647 IWL_MVM_CHANNEL_SWITCH_TIME_CLIENT) * 1024);
3648

--- 410 unchanged lines hidden ---