37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
|
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
|
||
|
|
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
|
||
|
|
@@ -4233,9 +4233,8 @@ static void brcms_c_radio_timer(void *ar
|
||
|
|
}
|
||
|
|
|
||
|
|
/* common low-level watchdog code */
|
||
|
|
-static void brcms_b_watchdog(void *arg)
|
||
|
|
+static void brcms_b_watchdog(struct brcms_c_info *wlc)
|
||
|
|
{
|
||
|
|
- struct brcms_c_info *wlc = (struct brcms_c_info *) arg;
|
||
|
|
struct brcms_hardware *wlc_hw = wlc->hw;
|
||
|
|
|
||
|
|
BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
|
||
|
|
@@ -4256,10 +4255,8 @@ static void brcms_b_watchdog(void *arg)
|
||
|
|
}
|
||
|
|
|
||
|
|
/* common watchdog code */
|
||
|
|
-static void brcms_c_watchdog(void *arg)
|
||
|
|
+static void brcms_c_watchdog(struct brcms_c_info *wlc)
|
||
|
|
{
|
||
|
|
- struct brcms_c_info *wlc = (struct brcms_c_info *) arg;
|
||
|
|
-
|
||
|
|
BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
|
||
|
|
|
||
|
|
if (!wlc->pub->up)
|
||
|
|
@@ -4299,7 +4296,9 @@ static void brcms_c_watchdog(void *arg)
|
||
|
|
|
||
|
|
static void brcms_c_watchdog_by_timer(void *arg)
|
||
|
|
{
|
||
|
|
- brcms_c_watchdog(arg);
|
||
|
|
+ struct brcms_c_info *wlc = (struct brcms_c_info *) arg;
|
||
|
|
+
|
||
|
|
+ brcms_c_watchdog(wlc);
|
||
|
|
}
|
||
|
|
|
||
|
|
static bool brcms_c_timers_init(struct brcms_c_info *wlc, int unit)
|