lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwl3945: add test for new association

Browse Source 
Add check for new association to ease reading.

Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Abhijeet Kolekar
2009-03-06 13:52:54 -08:00
committed by John W. Linville
parent 346de732cb
commit 8337031ef3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/iwlwifi/iwl3945-base.c
View File

@@ -328,6 +328,8 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv)
struct iwl3945_rxon_cmd *active_rxon = (void *)&priv->active_rxon; struct iwl3945_rxon_cmd *active_rxon = (void *)&priv->active_rxon;
struct iwl3945_rxon_cmd *staging_rxon = (void *)&priv->staging_rxon; struct iwl3945_rxon_cmd *staging_rxon = (void *)&priv->staging_rxon;
int rc = 0; int rc = 0;
bool new_assoc =
!!(priv->staging_rxon.filter_flags & RXON_FILTER_ASSOC_MSK);
if (!iwl_is_alive(priv)) if (!iwl_is_alive(priv))
return -1; return -1;
@@ -366,8 +368,7 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv)
* an RXON_ASSOC and the new config wants the associated mask enabled, * an RXON_ASSOC and the new config wants the associated mask enabled,
* we must clear the associated from the active configuration * we must clear the associated from the active configuration
* before we apply the new config */ * before we apply the new config */
if (iwl_is_associated(priv) && if (iwl_is_associated(priv) && new_assoc) {
(staging_rxon->filter_flags & RXON_FILTER_ASSOC_MSK)) {
IWL_DEBUG_INFO(priv, "Toggling associated bit on current RXON\n"); IWL_DEBUG_INFO(priv, "Toggling associated bit on current RXON\n");
active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK; active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
@@ -395,8 +396,7 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv)
"* with%s RXON_FILTER_ASSOC_MSK\n" "* with%s RXON_FILTER_ASSOC_MSK\n"
"* channel = %d\n" "* channel = %d\n"
"* bssid = %pM\n", "* bssid = %pM\n",
((priv->staging_rxon.filter_flags & (new_assoc ? "" : "out"),
RXON_FILTER_ASSOC_MSK) ? "" : "out"),
le16_to_cpu(staging_rxon->channel), le16_to_cpu(staging_rxon->channel),
staging_rxon->bssid_addr); staging_rxon->bssid_addr);