--- src/src/ap/sta_info.c	2010-09-07 21:13:39.000000000 +0530
+++ tmp/src/ap/sta_info.c	2011-09-07 17:42:44.000000000 +0530
@@ -268,6 +268,9 @@
 			next_time = hapd->conf->ap_max_inactivity -
 				inactive_sec;
 		}
+		else {
+			sta->timeout_next = STA_DEAUTH;
+		}
 	}
 
 	if ((sta->flags & WLAN_STA_ASSOC) &&