Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=76f3915b4cbadf5f7dc80d3df6d3a7492914675a
Commit:     76f3915b4cbadf5f7dc80d3df6d3a7492914675a
Parent:     25c03d8e8c13c5468155c58013b03841161b4559
Author:     Gregory Greenman <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 23 10:15:21 2008 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Thu Jan 31 19:26:44 2008 -0800

    iwlwifi: Fix uCode error on association
    
    The problem is that priv->assoc_id is set when assoc. resp frame is
    received. But, when it is set, LQ cmd is still not sent to the uCode, it is
    done from bg_post_assoc, which is called through a workqueue.
    
    On the other hand, when a tx arrives at the moment when this flag is set,
    but LQ is still not sent, the if condition in tx_skb will not hold and
    the frame will not be dropped.  Thus, it will be sent through
    which is still not in the sta table in the uCoded.
    
    Signed-off-by: Gregory Greenman <[EMAIL PROTECTED]>
    Signed-off-by: Tomas Winkler <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 drivers/net/wireless/iwlwifi/iwl-3945.h     |    1 -
 drivers/net/wireless/iwlwifi/iwl3945-base.c |    2 +-
 drivers/net/wireless/iwlwifi/iwl4965-base.c |    6 ++++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h 
b/drivers/net/wireless/iwlwifi/iwl-3945.h
index 4b07db9..1da14f9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.h
@@ -790,7 +790,6 @@ struct iwl3945_priv {
        u16 active_rate_basic;
 
        u8 call_post_assoc_from_beacon;
-       u8 assoc_station_added;
        /* Rate scaling data */
        s8 data_retry_limit;
        u8 retry_rate;
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c 
b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index f644c6b..5d8965e 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2806,7 +2806,7 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv,
 #endif
 
        /* drop all data frame if we are not associated */
-       if (!iwl3945_is_associated(priv) && !priv->assoc_id &&
+       if ((!iwl3945_is_associated(priv) || !priv->assoc_id) &&
            ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)) {
                IWL_DEBUG_DROP("Dropping - !iwl3945_is_associated\n");
                goto drop_unlock;
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c 
b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 131cf5a..abdce17 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -2933,8 +2933,10 @@ static int iwl4965_tx_skb(struct iwl4965_priv *priv,
 #endif
 
        /* drop all data frame if we are not associated */
-       if (!iwl4965_is_associated(priv) && !priv->assoc_id &&
-           ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)) {
+       if (((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) &&
+          (!iwl4965_is_associated(priv) ||
+           !priv->assoc_id ||
+           !priv->assoc_station_added)) {
                IWL_DEBUG_DROP("Dropping - !iwl4965_is_associated\n");
                goto drop_unlock;
        }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to