commit 25eaea30cd7b009ba2ca693708330d2f395cbc4d
author Luciano Coelho <coelho@ti.com> Mon May 02 12:37:33 2011 +0300
committer Luciano Coelho <coelho@ti.com> Mon May 02 12:46:40 2011 +0300
tree 1bdd81bf897ce181e644c380bfaed9a4e205849a
parent 2d66bee7fbd38d28e9ed12f45b8e9db8e6aa0c49

Revert "wl12xx: support FW TX inactivity triggers"

This reverts commit 47684808fd89d6809c0886e06f8ac324252499d8.

Conflicts:

	drivers/net/wireless/wl12xx/conf.h
	drivers/net/wireless/wl12xx/main.c

drivers/net/wireless/wl12xx/wl12xx.h

diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index f3de962..b760143 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -172,6 +172,7 @@
 #define WL1271_PS_STA_MAX_BLOCKS  (2 * 9)
 
 #define WL1271_AP_BSS_INDEX        0
+#define WL1271_AP_DEF_INACTIV_SEC  300
 #define WL1271_AP_DEF_BEACON_EXP   20
 
 #define ACX_TX_DESCRIPTORS         32