diff --git a/[refs] b/[refs]
index f9705c7ac854..ae14604e9667 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fd6931ebe24640bec72b91ba612325843a5e3cc
+refs/heads/master: 132127e5057be70112bb974b8a3aaa0f7b14847f
diff --git a/trunk/drivers/net/wireless/ath5k/hw.c b/trunk/drivers/net/wireless/ath5k/hw.c
index 3b9336387df0..eb00818e8ce6 100644
--- a/trunk/drivers/net/wireless/ath5k/hw.c
+++ b/trunk/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);
 
 		/*