diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-26 22:49:30 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-26 22:49:30 +0100 |
| commit | b4e69ac670d71b5748dc81e536b2cb103489badd (patch) | |
| tree | 26a04ba5d950657132fd6acb4e0ef17d0bcabe93 /net/mac80211/tx.c | |
| parent | net_sched: sch_mqprio: dont leak kernel memory (diff) | |
| parent | xfrm6: Don't forget to propagate peer into ipsec route. (diff) | |
| download | linux-b4e69ac670d71b5748dc81e536b2cb103489badd.tar.xz linux-b4e69ac670d71b5748dc81e536b2cb103489badd.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 5950e3abead9..b64b42bc774b 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, sdata = vif_to_sdata(vif); + if (!ieee80211_sdata_running(sdata)) + goto out; + if (tim_offset) *tim_offset = 0; if (tim_length) |