From: Philipp Hortmann Date: Fri, 6 Oct 2023 19:05:22 +0000 (+0200) Subject: staging: rtl8192e: Remove unchanged variable active_scan X-Git-Tag: block-6.7-2023-11-10~27^2~119 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f4840e34387ddc25a42968535c5105fa59661fae;p=linux-block.git staging: rtl8192e: Remove unchanged variable active_scan Remove variable active_scan as its value is set to 1 at initialization. No further writes to active_scan are done. The equation results accordingly. Remove dead code. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/eea9f6cb1feeb8aa5beb546034562f55a03da449.1696548527.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 7db01d68000a..ba35ae4a21fa 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -755,7 +755,6 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) priv->rtllib->current_network.beacon_interval = DEFAULT_BEACONINTERVAL; priv->rtllib->iw_mode = IW_MODE_INFRA; - priv->rtllib->active_scan = 1; priv->rtllib->be_scan_inprogress = false; priv->rtllib->fts = DEFAULT_FRAG_THRESHOLD; diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 307bcbb7fbb6..2f968c3c0229 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1332,8 +1332,6 @@ struct rtllib_device { int rate; /* current rate */ int basic_rate; - short active_scan; - /* this contains flags for selectively enable softmac support */ u16 softmac_features; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index f84133744bc3..ff98b41c94e0 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -419,8 +419,7 @@ static void rtllib_send_probe(struct rtllib_device *ieee) static void rtllib_send_probe_requests(struct rtllib_device *ieee) { - if (ieee->active_scan && (ieee->softmac_features & - IEEE_SOFTMAC_PROBERQ)) { + if (ieee->softmac_features & IEEE_SOFTMAC_PROBERQ) { rtllib_send_probe(ieee); rtllib_send_probe(ieee); }