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/cmd.c

diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c
index d8596ae..2116a37 100644
--- a/drivers/net/wireless/wl12xx/cmd.c
+++ b/drivers/net/wireless/wl12xx/cmd.c
@@ -1080,7 +1080,7 @@
 
 	memcpy(cmd->bssid, bss_conf->bssid, ETH_ALEN);
 
-	cmd->aging_period = cpu_to_le16(wl->conf.tx.ap_aging_period);
+	cmd->aging_period = cpu_to_le16(WL1271_AP_DEF_INACTIV_SEC);
 	cmd->bss_index = WL1271_AP_BSS_INDEX;
 	cmd->global_hlid = WL1271_AP_GLOBAL_HLID;
 	cmd->broadcast_hlid = WL1271_AP_BROADCAST_HLID;