diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 3dec2d25fa3..cd8a5ed97c4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -1313,7 +1313,6 @@ int iwl_setup_mac(struct iwl_priv *priv) | |||
1313 | /* Default value; 4 EDCA QOS priorities */ | 1313 | /* Default value; 4 EDCA QOS priorities */ |
1314 | hw->queues = 4; | 1314 | hw->queues = 4; |
1315 | 1315 | ||
1316 | hw->conf.beacon_int = 100; | ||
1317 | hw->max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL; | 1316 | hw->max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL; |
1318 | 1317 | ||
1319 | if (priv->bands[IEEE80211_BAND_2GHZ].n_channels) | 1318 | if (priv->bands[IEEE80211_BAND_2GHZ].n_channels) |
@@ -2751,7 +2750,7 @@ void iwl_mac_reset_tsf(struct ieee80211_hw *hw) | |||
2751 | 2750 | ||
2752 | priv->ibss_beacon = NULL; | 2751 | priv->ibss_beacon = NULL; |
2753 | 2752 | ||
2754 | priv->beacon_int = priv->hw->conf.beacon_int; | 2753 | priv->beacon_int = priv->vif->bss_conf.beacon_int; |
2755 | priv->timestamp = 0; | 2754 | priv->timestamp = 0; |
2756 | if ((priv->iw_mode == NL80211_IFTYPE_STATION)) | 2755 | if ((priv->iw_mode == NL80211_IFTYPE_STATION)) |
2757 | priv->beacon_int = 0; | 2756 | priv->beacon_int = 0; |