diff --git a/[refs] b/[refs]
index 9ee36efbc6be..663f93690896 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cf22b897c63df65e7360a1897e5312c58617fbd
+refs/heads/master: 8fd369eeaa81d05969787c9ddf9cf3f1a8c4e084
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index ffc67491c38f..8fbbc7a816d6 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -1394,7 +1394,8 @@ static int invoke_tx_handlers(struct ieee80211_tx_data *tx)
 	/* handlers after fragment must be aware of tx info fragmentation! */
 	CALL_TXH(ieee80211_tx_h_stats);
 	CALL_TXH(ieee80211_tx_h_encrypt);
-	CALL_TXH(ieee80211_tx_h_calculate_duration);
+	if (!(tx->local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL))
+		CALL_TXH(ieee80211_tx_h_calculate_duration);
 #undef CALL_TXH
 
  txh_done: