Commit:     132127e5057be70112bb974b8a3aaa0f7b14847f
Parent:     4fd6931ebe24640bec72b91ba612325843a5e3cc
Author:     Luis R. Rodriguez <[EMAIL PROTECTED]>
AuthorDate: Fri Jan 4 02:21:05 2008 -0500
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:09:40 2008 -0800

    ath5k: Fix frame duration oops
    This patch fixes an oops which was introduced as a regression by
    commit fd640775bd16e1df50c867cc547af0, on the patch titled,
    "mac80211: dont use interface indices in drivers".
    ieee80211_generic_frame_duration() now relies on sdata->flags which
    itself gets set upon bringing the interface up. We check for the
    virtual interface now before setting the rate duration registers.
    After the mode changes are introduced onto mac80211 we should revisit
    these changes.
    This patch was tested on the following cards:
    1) BG card:
    Atheros AR5213A chip found (MAC: 0x59, PHY: 0x43)
    RF2112A 2GHz radio found (0x46)
    2) ABG card:
    Atheros AR5213A chip found (MAC: 0x59,PHY: 0x43)
    RF5112A multiband radio found (0x36)
    Signed-off-by: Luis R. Rodriguez <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
 drivers/net/wireless/ath5k/hw.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath5k/hw.c b/drivers/net/wireless/ath5k/hw.c
index 3b93363..eb00818 100644
--- a/drivers/net/wireless/ath5k/hw.c
+++ b/drivers/net/wireless/ath5k/hw.c
@@ -734,8 +734,12 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum 
ieee80211_if_types op_mode,
                if (ret)
                        return ret;
-               /* Write rate duration table */
-               if (ah->ah_version == AR5K_AR5212)
+               /* Write rate duration table only on AR5212 and if
+                * virtual interface has already been brought up
+                * XXX: rethink this after new mode changes to
+                * mac80211 are integrated */
+               if (ah->ah_version == AR5K_AR5212 &&
+                       ah->ah_sc->vif != NULL)
                        ath5k_hw_write_rate_duration(ah, driver_mode);
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

Reply via email to