diff options
author | Fabrice Bellet <fabrice@bellet.info> | 2008-10-24 02:48:57 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:02:28 -0400 |
commit | 9fe1c5052019da3d2770abd7b727cbc1083f7937 (patch) | |
tree | e43cb36f814fd7a614fb93e287c4bd274a3b08a1 /drivers/net | |
parent | a96a27f97f2bbfc1fca54bc3c0b0d41484152740 (diff) |
iwl3945: iwl3945_mac_get_tsf() should not return zero
The problem fixed here is that iwl3945_mac_get_tsf() returns 0, as the
function is not implemented, and this is considered as a valid value by
the mac layer in mlme.c:1605. The consequence is that the STA in ad-hoc
mode is inserted/removed quite frequently due to IBSS merging.
This patch fixes :
http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=1781
and https://bugzilla.redhat.com/show_bug.cgi?id=459401
Signed-off-by: Fabrice Bellet <fabrice@bellet.info>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index a4d92471363e..5436cb43bca7 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -7155,14 +7155,6 @@ static int iwl3945_mac_get_stats(struct ieee80211_hw *hw, | |||
7155 | return 0; | 7155 | return 0; |
7156 | } | 7156 | } |
7157 | 7157 | ||
7158 | static u64 iwl3945_mac_get_tsf(struct ieee80211_hw *hw) | ||
7159 | { | ||
7160 | IWL_DEBUG_MAC80211("enter\n"); | ||
7161 | IWL_DEBUG_MAC80211("leave\n"); | ||
7162 | |||
7163 | return 0; | ||
7164 | } | ||
7165 | |||
7166 | static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw) | 7158 | static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw) |
7167 | { | 7159 | { |
7168 | struct iwl3945_priv *priv = hw->priv; | 7160 | struct iwl3945_priv *priv = hw->priv; |
@@ -7805,7 +7797,6 @@ static struct ieee80211_ops iwl3945_hw_ops = { | |||
7805 | .get_stats = iwl3945_mac_get_stats, | 7797 | .get_stats = iwl3945_mac_get_stats, |
7806 | .get_tx_stats = iwl3945_mac_get_tx_stats, | 7798 | .get_tx_stats = iwl3945_mac_get_tx_stats, |
7807 | .conf_tx = iwl3945_mac_conf_tx, | 7799 | .conf_tx = iwl3945_mac_conf_tx, |
7808 | .get_tsf = iwl3945_mac_get_tsf, | ||
7809 | .reset_tsf = iwl3945_mac_reset_tsf, | 7800 | .reset_tsf = iwl3945_mac_reset_tsf, |
7810 | .bss_info_changed = iwl3945_bss_info_changed, | 7801 | .bss_info_changed = iwl3945_bss_info_changed, |
7811 | .hw_scan = iwl3945_mac_hw_scan | 7802 | .hw_scan = iwl3945_mac_hw_scan |