diff --git a/[refs] b/[refs]
index 416810b840a5..e73a251b5f06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1498b3f1952ae539a7d5c356acf942d5f4c1aece
+refs/heads/master: 6b25d30bf112370a12d05c3c0fd43732985dab01
diff --git a/trunk/net/core/gen_estimator.c b/trunk/net/core/gen_estimator.c
index 17daf4c9f793..cc84d8d8a3c7 100644
--- a/trunk/net/core/gen_estimator.c
+++ b/trunk/net/core/gen_estimator.c
@@ -128,7 +128,8 @@ static void est_timer(unsigned long arg)
 		spin_unlock(e->stats_lock);
 	}
 
-	mod_timer(&elist[idx].timer, jiffies + ((HZ<<idx)/4));
+	if (elist[idx].list != NULL)
+		mod_timer(&elist[idx].timer, jiffies + ((HZ<<idx)/4));
 	read_unlock(&est_lock);
 }