diff --git a/[refs] b/[refs] index 19d9ea506981..8122dd04c72d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f99b751fca5b16bea53c0d6724935e1949350052 +refs/heads/master: c09c7237eadc65916305835ca1e3ee8a03f01159 diff --git a/trunk/net/mac80211/rc80211_pid_algo.c b/trunk/net/mac80211/rc80211_pid_algo.c index 962286d893d6..554c4baed6fb 100644 --- a/trunk/net/mac80211/rc80211_pid_algo.c +++ b/trunk/net/mac80211/rc80211_pid_algo.c @@ -496,6 +496,8 @@ static void *rate_control_pid_alloc_sta(void *priv, gfp_t gfp) if (spinfo == NULL) return NULL; + spinfo->last_sample = jiffies; + #ifdef CONFIG_MAC80211_DEBUGFS spin_lock_init(&spinfo->events.lock); init_waitqueue_head(&spinfo->events.waitqueue);