diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-08 09:36:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-08 09:36:30 -0700 |
| commit | a05e42c27f80d341a5ec2053b041e24231a002e2 (patch) | |
| tree | 371ae025e2a8c8b2828648d64a12774fbb6789f4 /net/mac80211/mlme.c | |
| parent | 0a0e2344a62ce9e7fac6129d6292e59aecfceced (diff) | |
| parent | 204d1641d200709c759d8c269458cbc7de378c40 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index b87420088c33..182cda66ebef 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -749,7 +749,7 @@ void ieee80211_dynamic_ps_enable_work(struct work_struct *work) container_of(work, struct ieee80211_local, dynamic_ps_enable_work); struct ieee80211_sub_if_data *sdata = local->ps_sdata; - struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; + struct ieee80211_if_managed *ifmgd; unsigned long flags; int q; @@ -757,6 +757,8 @@ void ieee80211_dynamic_ps_enable_work(struct work_struct *work) if (!sdata) return; + ifmgd = &sdata->u.mgd; + if (local->hw.conf.flags & IEEE80211_CONF_PS) return; |