Attachment #308361 for bug #411415

View | Details | Raw Unified | Return to bug 411415
Collapse All | Expand All




	if (--sc->ps_usecount != 0)
		goto unlock;

	if (sc->ps_flags & PS_WAIT_FOR_TX_ACK)
		goto unlock;

	if (sc->ps_idle)
		mode = ATH9K_PM_FULL_SLEEP;
	else if (sc->ps_enabled &&
		 !(sc->ps_flags & (PS_WAIT_FOR_BEACON |
			      PS_WAIT_FOR_CAB |
			      PS_WAIT_FOR_PSPOLL_DATA)))
			      PS_WAIT_FOR_TX_ACK)))
		mode = ATH9K_PM_NETWORK_SLEEP;
	else
		goto unlock;
- 

Return to bug 411415

Lines 118-130 void ath9k_ps_restore(struct ath_softc *sc) Link Here

(-)a/drivers/net/wireless/ath/ath9k/main.c (-4 / +5 lines)
118	if (--sc->ps_usecount != 0)	118	if (--sc->ps_usecount != 0)
119	goto unlock;	119	goto unlock;
120		120
121	if (sc->ps_idle && (sc->ps_flags & PS_WAIT_FOR_TX_ACK))	121	if (sc->ps_flags & PS_WAIT_FOR_TX_ACK)
		122	goto unlock;
		123
		124	if (sc->ps_idle)
122	mode = ATH9K_PM_FULL_SLEEP;	125	mode = ATH9K_PM_FULL_SLEEP;
123	else if (sc->ps_enabled &&	126	else if (sc->ps_enabled &&
124	!(sc->ps_flags & (PS_WAIT_FOR_BEACON \|	127	!(sc->ps_flags & (PS_WAIT_FOR_BEACON \|
125	PS_WAIT_FOR_CAB \|	128	PS_WAIT_FOR_CAB \|
126	PS_WAIT_FOR_PSPOLL_DATA \|	129	PS_WAIT_FOR_PSPOLL_DATA)))
127	PS_WAIT_FOR_TX_ACK)))
128	mode = ATH9K_PM_NETWORK_SLEEP;	130	mode = ATH9K_PM_NETWORK_SLEEP;
129	else	131	else
130	goto unlock;	132	goto unlock;
131	-