leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ath9k_htc: remove unused variable sleepduration

Browse Source 
sleepduration is always = intval.

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Oleksij Rempel
2014-02-26 10:03:44 +01:00
committed by John W. Linville
parent 7fbdaa2a27
commit 527492eefc
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
View File

@@ -69,7 +69,7 @@ static void ath9k_htc_beacon_config_sta(struct ath9k_htc_priv *priv,
struct ath_common *common = ath9k_hw_common(priv->ah); struct ath_common *common = ath9k_hw_common(priv->ah);
struct ath9k_beacon_state bs; struct ath9k_beacon_state bs;
enum ath9k_int imask = 0; enum ath9k_int imask = 0;
int dtimperiod, dtimcount, sleepduration; int dtimperiod, dtimcount;
int bmiss_timeout; int bmiss_timeout;
u32 nexttbtt = 0, intval, tsftu; u32 nexttbtt = 0, intval, tsftu;
__be32 htc_imask = 0; __be32 htc_imask = 0;
@@ -94,10 +94,6 @@ static void ath9k_htc_beacon_config_sta(struct ath9k_htc_priv *priv,
if (dtimcount >= dtimperiod) /* NB: sanity check */ if (dtimcount >= dtimperiod) /* NB: sanity check */
dtimcount = 0; dtimcount = 0;
sleepduration = intval;
if (sleepduration <= 0)
sleepduration = intval;
/* /*
* Pull nexttbtt forward to reflect the current * Pull nexttbtt forward to reflect the current
* TSF and calculate dtim state for the result. * TSF and calculate dtim state for the result.
@@ -128,15 +124,11 @@ static void ath9k_htc_beacon_config_sta(struct ath9k_htc_priv *priv,
* need calculate based on the beacon interval. Note that we clamp the * need calculate based on the beacon interval. Note that we clamp the
* result to at most 15 beacons. * result to at most 15 beacons.
*/ */
if (sleepduration > intval) { bs.bs_bmissthreshold = DIV_ROUND_UP(bmiss_timeout, intval);
bs.bs_bmissthreshold = ATH_DEFAULT_BMISS_LIMIT / 2; if (bs.bs_bmissthreshold > 15)
} else { bs.bs_bmissthreshold = 15;
bs.bs_bmissthreshold = DIV_ROUND_UP(bmiss_timeout, intval); else if (bs.bs_bmissthreshold <= 0)
if (bs.bs_bmissthreshold > 15) bs.bs_bmissthreshold = 1;
bs.bs_bmissthreshold = 15;
else if (bs.bs_bmissthreshold <= 0)
bs.bs_bmissthreshold = 1;
}
/* /*
* Calculate sleep duration. The configuration is given in ms. * Calculate sleep duration. The configuration is given in ms.
@@ -148,7 +140,7 @@ static void ath9k_htc_beacon_config_sta(struct ath9k_htc_priv *priv,
*/ */
bs.bs_sleepduration = TU_TO_USEC(roundup(IEEE80211_MS_TO_TU(100), bs.bs_sleepduration = TU_TO_USEC(roundup(IEEE80211_MS_TO_TU(100),
sleepduration)); intval));
if (bs.bs_sleepduration > bs.bs_dtimperiod) if (bs.bs_sleepduration > bs.bs_dtimperiod)
bs.bs_sleepduration = bs.bs_dtimperiod; bs.bs_sleepduration = bs.bs_dtimperiod;