---

yaml --- r: 351803 b: refs/heads/master c: 01486c5 h: refs/heads/master i: 351801: 40de178 351799: b72ec0b v: v3
git-mirror · Jan 7, 2013 · 47d2ed0 · 47d2ed0
1 parent 820cb5c
commit 47d2ed0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a02308e931ad0bba19803779bec491c4b2d67b47
+refs/heads/master: 01486c5ad388c8a38f2e075666e8c2ee32bda4b6
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -1409,9 +1409,10 @@ void brcms_add_timer(struct brcms_timer *t, uint ms, int periodic)
 #endif
 	t->ms = ms;
 	t->periodic = (bool) periodic;
-	t->set = true;
-
-	atomic_inc(&t->wl->callbacks);
+	if (!t->set) {
+		t->set = true;
+		atomic_inc(&t->wl->callbacks);
+	}
 
 	ieee80211_queue_delayed_work(hw, &t->dly_wrk, msecs_to_jiffies(ms));
 }