All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Arend van Spriel" <arend@broadcom.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: "Linux Wireless List" <linux-wireless@vger.kernel.org>,
	"Piotr Haber" <phaber@broadcom.com>,
	"Arend van Spriel" <arend@broadcom.com>
Subject: [PATCH 01/18] brcmsmac: increase timer reference count for new timers only
Date: Wed, 2 Jan 2013 15:22:34 +0100	[thread overview]
Message-ID: <1357136572-18273-2-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1357136572-18273-1-git-send-email-arend@broadcom.com>

From: Piotr Haber <phaber@broadcom.com>

On hardware reintialization reference count of
already existing timers would be increased again.
This leads to problems on module unloading.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Piotr Haber <phaber@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
 drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 1fbd8ec..0f71d1d 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -1407,9 +1407,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));
 }
-- 
1.7.10.4



  reply	other threads:[~2013-01-02 14:23 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-02 14:22 [PATCH 00/18] brcm80211: cleanup work Arend van Spriel
2013-01-02 14:22 ` Arend van Spriel [this message]
2013-01-02 14:22 ` [PATCH 02/18] brcmsmac: use perimeter lock in add_interface() callback Arend van Spriel
2013-01-02 14:22 ` [PATCH 03/18] brcmsmac: allow user-space setting of interface address Arend van Spriel
2013-01-02 14:22 ` [PATCH 04/18] brcmsmac: remove dead code Arend van Spriel
2013-01-02 14:22 ` [PATCH 05/18] brcmfmac: do not reconfigure refill rx on 0-length packet Arend van Spriel
2013-01-02 14:22 ` [PATCH 06/18] brcmfmac: removed deprecated set_bitrate_mask support Arend van Spriel
2013-01-02 14:22 ` [PATCH 07/18] brcmfmac: assure USB dongle firmware is reset upon module unload Arend van Spriel
2013-01-02 14:22 ` [PATCH 08/18] brcmfmac: define pr_fmt in one place Arend van Spriel
2013-01-02 17:52   ` Joe Perches
2013-01-02 20:07     ` Arend van Spriel
2013-01-02 20:20   ` [PATCH v2 " Arend van Spriel
2013-01-02 20:34     ` Joe Perches
2013-01-02 20:52       ` Arend van Spriel
2013-01-02 14:22 ` [PATCH 09/18] brcmfmac: remove rx helper function from bus interface Arend van Spriel
2013-01-02 14:22 ` [PATCH 10/18] brcmfmac: remove brcmf_proto_hdrpull() " Arend van Spriel
2013-01-02 14:22 ` [PATCH 11/18] brcmfmac: Use dedicated trace level for CDC Arend van Spriel
2013-01-02 14:22 ` [PATCH 12/18] brcmfmac: remove unused event related definitions Arend van Spriel
2013-01-02 14:22 ` [PATCH 13/18] brcmfmac: cleanup netdev transmit callback Arend van Spriel
2013-01-02 14:22 ` [PATCH 14/18] brcmfmac: remove unnecessary curly braces in dhd_attach() Arend van Spriel
2013-01-02 14:22 ` [PATCH 15/18] brcmfmac: Remove unused caching dongle error Arend van Spriel
2013-01-02 14:22 ` [PATCH 16/18] brcmfmac: Return correct error on netdev xmit Arend van Spriel
2013-01-02 14:22 ` [PATCH 17/18] brcmfmac: Removing obsolete variables and inline functions Arend van Spriel
2013-01-02 14:22 ` [PATCH 18/18] brcmfmac: Update init code routines from interface up Arend van Spriel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1357136572-18273-2-git-send-email-arend@broadcom.com \
    --to=arend@broadcom.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=phaber@broadcom.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.