Changeset 19028

Timestamp:

04/14/12 01:51:41 (14 months ago)

Author:

BrainSlayer

Message:

3.3.2

Location:

src/linux/universal/linux-3.3

Files:

• Makefile (modified) (1 diff)
• drivers/net/wireless/ath/ath9k/main.c (modified) (1 diff)

src/linux/universal/linux-3.3/Makefile

@@ -2 +2 @@
 PATCHLEVEL = 3
 SUBLEVEL = 2
-EXTRAVERSION = -rc1
+EXTRAVERSION =
 NAME = Saber-toothed Squirrel
 

src/linux/universal/linux-3.3/drivers/net/wireless/ath/ath9k/main.c

@@ -119 +119 @@
                 goto unlock;
 
-        if (sc->ps_flags & PS_WAIT_FOR_TX_ACK)
-                goto unlock;
-
-        if (sc->ps_idle)
+        if (sc->ps_idle && (sc->ps_flags & PS_WAIT_FOR_TX_ACK))
                 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_PSPOLL_DATA |
+                              PS_WAIT_FOR_TX_ACK)))
                 mode = ATH9K_PM_NETWORK_SLEEP;
         else