From 4b6c32a20d10df0e3177059bac2f947882952a34 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Wed, 1 Jun 2011 13:44:52 +0200 Subject: [PATCH] --- yaml --- r: 259347 b: refs/heads/master c: 0a0ad7d255d6e84fb265f61ac090ff1c1e546444 h: refs/heads/master i: 259345: 3ac031f0c047ef0758f225a5af3dad295f350757 259343: 07b8e17ec2d9d5c9fc40d5ac69d63380dee611e0 v: v3 --- [refs] | 2 +- .../staging/brcm80211/brcmsmac/wlc_main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 6f187d4ef4cc..3acc857ea27f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5dc168747b4eed2795ac3b1555e4fd2d09f2a970 +refs/heads/master: 0a0ad7d255d6e84fb265f61ac090ff1c1e546444 diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c index 33045d59dda4..c1257d4d9f2b 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c @@ -732,22 +732,6 @@ void wlc_set_chanspec(struct wlc_info *wlc, chanspec_t chanspec) wlc_ucode_mac_upd(wlc); } -static u32 wlc_watchdog_backup_bi(struct wlc_info *wlc) -{ - u32 bi; - bi = 2 * wlc->cfg->current_bss->dtim_period * - wlc->cfg->current_bss->beacon_period; - if (wlc->bcn_li_dtim) - bi *= wlc->bcn_li_dtim; - else if (wlc->bcn_li_bcn) - /* recalculate bi based on bcn_li_bcn */ - bi = 2 * wlc->bcn_li_bcn * wlc->cfg->current_bss->beacon_period; - - if (bi < 2 * TIMER_INTERVAL_WATCHDOG) - bi = 2 * TIMER_INTERVAL_WATCHDOG; - return bi; -} - ratespec_t wlc_lowest_basic_rspec(struct wlc_info *wlc, wlc_rateset_t *rs) { ratespec_t lowest_basic_rspec;