28c28
< __FBSDID("$FreeBSD: head/sys/net80211/ieee80211_sta.c 260444 2014-01-08 08:06:56Z kevlo $");
---
> __FBSDID("$FreeBSD: head/sys/net80211/ieee80211_sta.c 264855 2014-04-24 01:39:53Z adrian $");
236a237
> /* XXX driver hook to wakeup the hardware? */
405a407
> /* Wake up from sleep */
432a435,436
> *
> * Don't do this if we're doing SLEEP->RUN.
434,435c438,439
< if (ic->ic_newassoc != NULL)
< ic->ic_newassoc(vap->iv_bss, ostate != IEEE80211_S_RUN);
---
> if (ic->ic_newassoc != NULL && ostate != IEEE80211_S_SLEEP)
> ic->ic_newassoc(vap->iv_bss, (ostate != IEEE80211_S_RUN));
1314a1319
>
1383a1389
>
1387c1393,1397
< #if 0
---
> /*
> * XXX Check/debug this code; see if it's about
> * the right time to force the VAP awake if we
> * receive a frame destined for us?
> */
1392c1402,1420
< if ((tim->tim_bitctl&1) ||
---
>
> /*
> * Only do this for unicast traffic in the TIM
> * The multicast traffic notification for
> * the scan notification stuff should occur
> * differently.
> */
> if (min <= ix && ix <= max &&
> isset(tim->tim_bitmap - min, aid)) {
> ieee80211_sta_tim_notify(vap, 1);
> ic->ic_lastdata = ticks;
> }
>
> /*
> * XXX TODO: do a separate notification
> * for the multicast bit being set.
> */
> #if 0
> if ((tim->tim_bitctl & 1) ||
1398a1427
> ieee80211_sta_tim_notify(vap, 1);
1400c1429,1430
< vap->iv_sta_ps(vap, 0);
---
> // XXX not yet?
> // vap->iv_sta_ps(vap, 0);
1448a1479,1486
> * Put the station to sleep if we haven't seen
> * traffic in a while.
> */
> IEEE80211_LOCK(ic);
> ieee80211_sta_ps_timer_check(vap);
> IEEE80211_UNLOCK(ic);
>
> /*