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

Commit 848819f4 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville
Browse files

mwifiex: stop AP at shutdown time 



Deauth is sent to AP when the device is acting as station at
shutdown time. Similarly we should stop AP operation also.
mwifiex_deauthenticate() takes care closing the connection
based on provided interface type.

Add a new function to simplify the code.

Reported-by: default avatarAvery Pennarun <apenwarr@gmail.com>
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ace27355

drivers/net/wireless/mwifiex/join.c

+14 −1
Original line number Diff line number Diff line
@@ -1443,7 +1443,20 @@ int mwifiex_deauthenticate(struct mwifiex_private *priv, u8 *mac) 


	return ret;

}

EXPORT_SYMBOL_GPL(mwifiex_deauthenticate);



/* This function deauthenticates/disconnects from all BSS. */

void mwifiex_deauthenticate_all(struct mwifiex_adapter *adapter)

{

	struct mwifiex_private *priv;

	int i;



	for (i = 0; i < adapter->priv_num; i++) {

		priv = adapter->priv[i];

		if (priv)

			mwifiex_deauthenticate(priv, NULL);

	}

}

EXPORT_SYMBOL_GPL(mwifiex_deauthenticate_all);



/*

 * This function converts band to radio type used in channel TLV.

drivers/net/wireless/mwifiex/main.h

+1 −0
Original line number Diff line number Diff line
@@ -927,6 +927,7 @@ int mwifiex_ret_802_11_associate(struct mwifiex_private *priv, 
void mwifiex_reset_connect_state(struct mwifiex_private *priv, u16 reason);

u8 mwifiex_band_to_radio_type(u8 band);

int mwifiex_deauthenticate(struct mwifiex_private *priv, u8 *mac);

void mwifiex_deauthenticate_all(struct mwifiex_adapter *adapter);

int mwifiex_adhoc_start(struct mwifiex_private *priv,

			struct cfg80211_ssid *adhoc_ssid);

int mwifiex_adhoc_join(struct mwifiex_private *priv,

drivers/net/wireless/mwifiex/pcie.c

+1 −6
Original line number Diff line number Diff line
@@ -211,7 +211,6 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev) 
	struct pcie_service_card *card;

	struct mwifiex_adapter *adapter;

	struct mwifiex_private *priv;

	int i;



	card = pci_get_drvdata(pdev);

	if (!card)
@@ -230,11 +229,7 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev) 
			mwifiex_pcie_resume(&pdev->dev);

#endif



		for (i = 0; i < adapter->priv_num; i++)

			if ((GET_BSS_ROLE(adapter->priv[i]) ==

			     MWIFIEX_BSS_ROLE_STA) &&

			    adapter->priv[i]->media_connected)

				mwifiex_deauthenticate(adapter->priv[i], NULL);

		mwifiex_deauthenticate_all(adapter);



		priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);

drivers/net/wireless/mwifiex/sdio.c

+1 −6
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ mwifiex_sdio_remove(struct sdio_func *func) 
	struct sdio_mmc_card *card;

	struct mwifiex_adapter *adapter;

	struct mwifiex_private *priv;

	int i;



	pr_debug("info: SDIO func num=%d\n", func->num);
@@ -185,11 +184,7 @@ mwifiex_sdio_remove(struct sdio_func *func) 
		if (adapter->is_suspended)

			mwifiex_sdio_resume(adapter->dev);



		for (i = 0; i < adapter->priv_num; i++)

			if ((GET_BSS_ROLE(adapter->priv[i]) ==

						MWIFIEX_BSS_ROLE_STA) &&

			    adapter->priv[i]->media_connected)

				mwifiex_deauthenticate(adapter->priv[i], NULL);

		mwifiex_deauthenticate_all(adapter);



		priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);

		mwifiex_disable_auto_ds(priv);

drivers/net/wireless/mwifiex/usb.c

+2 −6
Original line number Diff line number Diff line
@@ -1036,7 +1036,6 @@ static void mwifiex_usb_cleanup_module(void) 


	if (usb_card && usb_card->adapter) {

		struct mwifiex_adapter *adapter = usb_card->adapter;

		int i;



		/* In case driver is removed when asynchronous FW downloading is

		 * in progress
@@ -1047,11 +1046,8 @@ static void mwifiex_usb_cleanup_module(void) 
		if (adapter->is_suspended)

			mwifiex_usb_resume(usb_card->intf);

#endif

		for (i = 0; i < adapter->priv_num; i++)

			if ((GET_BSS_ROLE(adapter->priv[i]) ==

			     MWIFIEX_BSS_ROLE_STA) &&

			    adapter->priv[i]->media_connected)

				mwifiex_deauthenticate(adapter->priv[i], NULL);



		mwifiex_deauthenticate_all(adapter);



		mwifiex_init_shutdown_fw(mwifiex_get_priv(adapter,

							  MWIFIEX_BSS_ROLE_ANY),