Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44129530 authored by Roland Vossen's avatar Roland Vossen Committed by John W. Linville
Browse files

brcm80211: smac: removed MPC related variables 



Several member variables were never read.

Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0bf1f883

drivers/net/wireless/brcm80211/brcmsmac/main.c

+2 −6
Original line number Diff line number Diff line
@@ -4303,10 +4303,6 @@ static void brcms_c_radio_timer(void *arg) 
		return;

	}



	/* cap mpc off count */

	if (wlc->mpc_offcnt < BRCMS_MPC_MAX_DELAYCNT)

		wlc->mpc_offcnt++;



	brcms_c_radio_hwdisable_upd(wlc);

	brcms_c_radio_upd(wlc);

}
@@ -4488,7 +4484,7 @@ static void brcms_c_info_init(struct brcms_c_info *wlc, int unit) 
	wlc->pub->bcmerror = 0;



	/* initialize mpc delay */

	wlc->mpc_delay_off = wlc->mpc_dlycnt = BRCMS_MPC_MIN_DELAYCNT;

	wlc->mpc_delay_off = BRCMS_MPC_MIN_DELAYCNT;

}



static uint brcms_c_attach_module(struct brcms_c_info *wlc)
@@ -8447,7 +8443,7 @@ void brcms_c_init(struct brcms_c_info *wlc) 
	W_REG(&wlc->regs->rfdisabledly, RFDISABLE_DEFAULT);



	/* initialize mpc delay */

	wlc->mpc_delay_off = wlc->mpc_dlycnt = BRCMS_MPC_MIN_DELAYCNT;

	wlc->mpc_delay_off = BRCMS_MPC_MIN_DELAYCNT;



	/*

	 * Initialize WME parameters; if they haven't been set by some other

drivers/net/wireless/brcm80211/brcmsmac/main.h

+0 −6
Original line number Diff line number Diff line
@@ -427,10 +427,7 @@ struct brcms_txq_info { 
 * bandinit_pending: track band init in auto band.

 * radio_monitor: radio timer is running.

 * going_down: down path intermediate variable.

 * mpc_dlycnt: # of watchdog cnt before turn disable radio.

 * mpc_offcnt: # of watchdog cnt that radio is disabled.

 * mpc_delay_off: delay radio disable by # of watchdog cnt.

 * prev_non_delay_mpc: prev state brcms_c_is_non_delay_mpc.

 * wdtimer: timer for watchdog routine.

 * radio_timer: timer for hw radio button monitor routine.

 * monitor: monitor (MPDU sniffing) mode.
@@ -521,10 +518,7 @@ struct brcms_c_info { 
	bool radio_monitor;

	bool going_down;



	u8 mpc_dlycnt;

	u8 mpc_offcnt;

	u8 mpc_delay_off;

	u8 prev_non_delay_mpc;



	struct brcms_timer *wdtimer;

	struct brcms_timer *radio_timer;