projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
80d7e40
)
ath9k: Check for NULL sta in ath_tx_start
author
Ben Greear
<greearb@candelatech.com>
Tue, 7 Dec 2010 05:13:49 +0000
(21:13 -0800)
committer
John W. Linville
<linville@tuxdriver.com>
Wed, 8 Dec 2010 20:38:43 +0000
(15:38 -0500)
It can be NULL according to docs, and logging showed it
to be NULL in practice.
Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/xmit.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/ath/ath9k/xmit.c
b/drivers/net/wireless/ath/ath9k/xmit.c
index
16d83d0
..
bce313e
100644
(file)
--- a/
drivers/net/wireless/ath/ath9k/xmit.c
+++ b/
drivers/net/wireless/ath/ath9k/xmit.c
@@
-1740,7
+1740,10
@@
int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
int frmlen = skb->len + FCS_LEN;
int q;
- txctl->an = (struct ath_node *)sta->drv_priv;
+ /* NOTE: sta can be NULL according to net/mac80211.h */
+ if (sta)
+ txctl->an = (struct ath_node *)sta->drv_priv;
+
if (info->control.hw_key)
frmlen += info->control.hw_key->icv_len;