aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/sta_ioctl.c
diff options
context:
space:
mode:
authorMarc Yang <yangyang@marvell.com>2011-03-24 20:49:39 -0700
committerJohn W. Linville <linville@tuxdriver.com>2011-04-04 16:20:00 -0400
commit203afecaa320fa8c541ce130aed449ff53f5b4aa (patch)
treed52aedcfe5ff7cb3faf913e6ff8321874f7d1d99 /drivers/net/wireless/mwifiex/sta_ioctl.c
parent0022801c893e953ebff8e0ad00cc22716055babf (diff)
downloadkernel_samsung_smdk4412-203afecaa320fa8c541ce130aed449ff53f5b4aa.zip
kernel_samsung_smdk4412-203afecaa320fa8c541ce130aed449ff53f5b4aa.tar.gz
kernel_samsung_smdk4412-203afecaa320fa8c541ce130aed449ff53f5b4aa.tar.bz2
mwifiex: remove unnecessary _set_auth functions
mwifiex_set_encrypt_mode() mwifiex_set_auth_mode() mwifiex_set_auth() These functions are confusing and misleading. And they are really not needed at all. Some unused definitions are also removed. Signed-off-by: Marc Yang <yangyang@marvell.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex/sta_ioctl.c')
-rw-r--r--drivers/net/wireless/mwifiex/sta_ioctl.c44
1 files changed, 0 insertions, 44 deletions
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index 665a519..362301f 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -1691,20 +1691,6 @@ static int mwifiex_sec_ioctl_set_wapi_key(struct mwifiex_adapter *adapter,
}
/*
- * IOCTL request handler to set/get authentication mode.
- */
-static int mwifiex_set_auth_mode(struct mwifiex_private *priv, u32 auth_mode)
-{
- int ret = 0;
-
- priv->sec_info.authentication_mode = auth_mode;
- if (priv->sec_info.authentication_mode == MWIFIEX_AUTH_MODE_NETWORKEAP)
- ret = mwifiex_set_wpa_ie_helper(priv, NULL, 0);
-
- return ret;
-}
-
-/*
* IOCTL request handler to set WEP network key.
*
* This function prepares the correct firmware command and
@@ -1999,36 +1985,6 @@ int mwifiex_get_signal_info(struct mwifiex_private *priv, u8 wait_option,
}
/*
- * Sends IOCTL request to set encryption mode.
- *
- * This function allocates the IOCTL request buffer, fills it
- * with requisite parameters and calls the IOCTL handler.
- */
-static int mwifiex_set_encrypt_mode(struct mwifiex_private *priv,
- u8 wait_option, u32 encrypt_mode)
-{
- priv->sec_info.encryption_mode = encrypt_mode;
- return 0;
-}
-
-/*
- * This function set the authentication parameters. It sets both encryption
- * mode and authentication mode, and also enables WPA if required.
- */
-int
-mwifiex_set_auth(struct mwifiex_private *priv, int encrypt_mode,
- int auth_mode, int wpa_enabled)
-{
- if (mwifiex_set_encrypt_mode(priv, MWIFIEX_IOCTL_WAIT, encrypt_mode))
- return -EFAULT;
-
- if (mwifiex_set_auth_mode(priv, auth_mode))
- return -EFAULT;
-
- return 0;
-}
-
-/*
* Sends IOCTL request to set encoding parameters.
*
* This function allocates the IOCTL request buffer, fills it