From d5fdaa3ae73ef61de5a82b63a601afa9c4dc1d3b Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Mon, 31 Jan 2011 22:09:58 +0900 Subject: [PATCH] Staging: rtl8192e: Move static variable to device struct Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/r8192E.h | 2 ++ drivers/staging/rtl8192e/r8192E_core.c | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h index 0de74da..0189a3d 100644 --- a/drivers/staging/rtl8192e/r8192E.h +++ b/drivers/staging/rtl8192e/r8192E.h @@ -964,6 +964,8 @@ typedef struct r8192_priv bool brfpath_rxenable[4]; //+by amy 080507 struct timer_list watch_dog_timer; + u8 watchdog_last_time; + u8 watchdog_check_reset_cnt; //+by amy 080515 for dynamic mechenism //Add by amy Tx Power Control for Near/Far Range 2008/05/15 diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index f631376..c5be6bcb 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c @@ -4115,10 +4115,8 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work) struct net_device *dev = priv->ieee80211->dev; struct ieee80211_device* ieee = priv->ieee80211; RESET_TYPE ResetType = RESET_TYPE_NORESET; - static u8 check_reset_cnt=0; unsigned long flags; bool bBusyTraffic = false; - static u8 last_time = 0; bool bEnterPS = false; if ((!priv->up) || priv->bHwRadioOff) @@ -4216,10 +4214,11 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work) } //check if reset the driver spin_lock_irqsave(&priv->tx_lock,flags); - if(check_reset_cnt++ >= 3 && !ieee->is_roaming && (last_time != 1)) + if (priv->watchdog_check_reset_cnt++ >= 3 && !ieee->is_roaming && + priv->watchdog_last_time != 1) { ResetType = rtl819x_ifcheck_resetornot(dev); - check_reset_cnt = 3; + priv->watchdog_check_reset_cnt = 3; } spin_unlock_irqrestore(&priv->tx_lock,flags); if(!priv->bDisableNormalResetCheck && ResetType == RESET_TYPE_NORMAL) @@ -4232,11 +4231,11 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work) #if 1 if( ((priv->force_reset) || (!priv->bDisableNormalResetCheck && ResetType==RESET_TYPE_SILENT))) // This is control by OID set in Pomelo { - last_time = 1; + priv->watchdog_last_time = 1; rtl819x_ifsilentreset(dev); } else - last_time = 0; + priv->watchdog_last_time = 0; #endif priv->force_reset = false; priv->bForcedSilentReset = false; -- 2.7.4