From 47d2ed0e56a154246150cd6872b3ae5a369b1041 Mon Sep 17 00:00:00 2001 From: Piotr Haber Date: Wed, 2 Jan 2013 15:22:34 +0100 Subject: [PATCH] --- yaml --- r: 351803 b: refs/heads/master c: 01486c5ad388c8a38f2e075666e8c2ee32bda4b6 h: refs/heads/master i: 351801: 40de17844b679a348c1f47acee98f41905c61596 351799: b72ec0b1dfb3f634f223e84a4d4beb8cb96cf719 v: v3 --- [refs] | 2 +- .../drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7fc40655b992..0f568b7af7f1 100644 --- 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 index f0fc8cd4d5df..f8e2591961ab 100644 --- 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)); }