diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-01-28 16:23:14 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-01-28 16:23:14 -0500 |
| commit | 3e11210d46a4f252f41db6e442b46026aeddbb59 (patch) | |
| tree | b258375de649a5e04e8d567c850b47c41f8ceb11 /net/mac80211/tx.c | |
| parent | 3bf63e59e577cbecd41334c866f501c4cc5d54c5 (diff) | |
| parent | c7c1806098752c1f46943d8db2c69aff07f5d4bc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/init.c
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index e46c801320e1..ffc67491c38f 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
| @@ -2230,6 +2230,9 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw, | |||
| 2230 | 2230 | ||
| 2231 | sdata = vif_to_sdata(vif); | 2231 | sdata = vif_to_sdata(vif); |
| 2232 | 2232 | ||
| 2233 | if (!ieee80211_sdata_running(sdata)) | ||
| 2234 | goto out; | ||
| 2235 | |||
| 2233 | if (tim_offset) | 2236 | if (tim_offset) |
| 2234 | *tim_offset = 0; | 2237 | *tim_offset = 0; |
| 2235 | if (tim_length) | 2238 | if (tim_length) |