Commit 349db421 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Remove is_mesh from rtllib_start_scan_syncro 



Function rtllib_start_scan_syncro() has parameter is_mesh which is in all
calls 0. Remove dead code.

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/6050a1d7764364190dda252f79d75c7cc47143de.1690615475.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fc6ea9d3

drivers/staging/rtl8192e/rtl8192e/rtl_wx.c

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, 


			ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_BACKUP);



			rtllib_start_scan_syncro(priv->rtllib, 0);

			rtllib_start_scan_syncro(priv->rtllib);



			ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_RESTORE);

		}

drivers/staging/rtl8192e/rtllib.h

+1 −1
Original line number Diff line number Diff line
@@ -1887,7 +1887,7 @@ void rtllib_disassociate(struct rtllib_device *ieee); 
void rtllib_stop_scan(struct rtllib_device *ieee);

bool rtllib_act_scanning(struct rtllib_device *ieee, bool sync_scan);

void rtllib_stop_scan_syncro(struct rtllib_device *ieee);

void rtllib_start_scan_syncro(struct rtllib_device *ieee, u8 is_mesh);

void rtllib_start_scan_syncro(struct rtllib_device *ieee);

void rtllib_sta_ps_send_null_frame(struct rtllib_device *ieee, short pwr);

void rtllib_sta_ps_send_pspoll_frame(struct rtllib_device *ieee);

void rtllib_start_protocol(struct rtllib_device *ieee);

drivers/staging/rtl8192e/rtllib_softmac.c

+3 −3
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ static void rtllib_start_scan(struct rtllib_device *ieee) 
}



/* called with wx_mutex held */

void rtllib_start_scan_syncro(struct rtllib_device *ieee, u8 is_mesh)

void rtllib_start_scan_syncro(struct rtllib_device *ieee)

{

	if (IS_DOT11D_ENABLE(ieee)) {

		if (IS_COUNTRY_IE_VALID(ieee))
@@ -715,7 +715,7 @@ void rtllib_start_scan_syncro(struct rtllib_device *ieee, u8 is_mesh) 
	}

	ieee->sync_scan_hurryup = 0;

	if (ieee->softmac_features & IEEE_SOFTMAC_SCAN)

		rtllib_softmac_scan_syncro(ieee, is_mesh);

		rtllib_softmac_scan_syncro(ieee, 0);

}

EXPORT_SYMBOL(rtllib_start_scan_syncro);
@@ -2500,7 +2500,7 @@ static void rtllib_start_ibss_wq(void *data) 
	 * associated.

	 */

	if (ieee->link_state == MAC80211_NOLINK)

		rtllib_start_scan_syncro(ieee, 0);

		rtllib_start_scan_syncro(ieee);



	/* the network definitively is not here.. create a new cell */

	if (ieee->link_state == MAC80211_NOLINK) {

drivers/staging/rtl8192e/rtllib_softmac_wx.c

+2 −2
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ void rtllib_wx_sync_scan_wq(void *data) 


	mutex_lock(&ieee->wx_mutex);

	if (!(ieee->softmac_features & IEEE_SOFTMAC_SCAN)) {

		rtllib_start_scan_syncro(ieee, 0);

		rtllib_start_scan_syncro(ieee);

		goto out;

	}
@@ -339,7 +339,7 @@ void rtllib_wx_sync_scan_wq(void *data) 
				       HT_EXTCHNL_OFFSET_NO_EXT);

	}



	rtllib_start_scan_syncro(ieee, 0);

	rtllib_start_scan_syncro(ieee);



	if (b40M) {

		if (chan_offset == HT_EXTCHNL_OFFSET_UPPER)