summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/rtlwifi/base.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-04-25 10:59:16 +0400
committerIngo Molnar <mingo@kernel.org>2012-04-25 10:59:16 +0400
commit3dbe927b1eddcbd66da1653168e33122aca84f4e (patch)
tree2357f4c55156597b1d07b9ea360b07086cd011e4 /drivers/net/wireless/rtlwifi/base.c
parenta385ec4f11bdcf81af094c03e2444ee9b7fad2e5 (diff)
parent66f75a5d028beaf67c931435fdc3e7823125730c (diff)
downloadlinux-3dbe927b1eddcbd66da1653168e33122aca84f4e.tar.xz
Merge tag 'v3.4-rc4' into perf/core
Merge v3.4-rc4 - we were on -rc2 before. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/base.c')
-rw-r--r--drivers/net/wireless/rtlwifi/base.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index 510023554e5f..e54488db0e10 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -838,7 +838,10 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw,
__le16 fc = hdr->frame_control;
txrate = ieee80211_get_tx_rate(hw, info);
- tcb_desc->hw_rate = txrate->hw_value;
+ if (txrate)
+ tcb_desc->hw_rate = txrate->hw_value;
+ else
+ tcb_desc->hw_rate = 0;
if (ieee80211_is_data(fc)) {
/*