diff --git a/[refs] b/[refs]
index 64e0bf46350f..cf916fd2d6b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37465c8a3ec7279e3314623d1e2d2a50c10cf79f
+refs/heads/master: a61dae1f784f0c4ced0d47721c0efc7033231522
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index e1d11c9b6729..1e97fb9fb34b 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2103,6 +2103,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
 			rcu_read_unlock();
 			return;
 		}
+		/* update new sta with its last rx activity */
+		sta->last_rx = jiffies;
 	}
 
 	/*