提交 43631e15 编写于 作者: D Dan Williams 提交者: John W. Linville

[PATCH] libertas: remove setwpaie private ioctl

Obsoleted by SIOCSIWGENIE.
Signed-off-by: NDan Williams <dcbw@redhat.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 9408c297
master alk-4.19.24 alk-4.19.30 alk-4.19.34 alk-4.19.36 alk-4.19.43 alk-4.19.48 alk-4.19.57 ck-4.19.67 ck-4.19.81 ck-4.19.91 github/fork/deepanshu1422/fix-typo-in-comment github/fork/haosdent/fix-typo linux-next v4.19.91 v4.19.90 v4.19.89 v4.19.88 v4.19.87 v4.19.86 v4.19.85 v4.19.84 v4.19.83 v4.19.82 v4.19.81 v4.19.80 v4.19.79 v4.19.78 v4.19.77 v4.19.76 v4.19.75 v4.19.74 v4.19.73 v4.19.72 v4.19.71 v4.19.70 v4.19.69 v4.19.68 v4.19.67 v4.19.66 v4.19.65 v4.19.64 v4.19.63 v4.19.62 v4.19.61 v4.19.60 v4.19.59 v4.19.58 v4.19.57 v4.19.56 v4.19.55 v4.19.54 v4.19.53 v4.19.52 v4.19.51 v4.19.50 v4.19.49 v4.19.48 v4.19.47 v4.19.46 v4.19.45 v4.19.44 v4.19.43 v4.19.42 v4.19.41 v4.19.40 v4.19.39 v4.19.38 v4.19.37 v4.19.36 v4.19.35 v4.19.34 v4.19.33 v4.19.32 v4.19.31 v4.19.30 v4.19.29 v4.19.28 v4.19.27 v4.19.26 v4.19.25 v4.19.24 v4.19.23 v4.19.22 v4.19.21 v4.19.20 v4.19.19 v4.19.18 v4.19.17 v4.19.16 v4.19.15 v4.19.14 v4.19.13 v4.19.12 v4.19.11 v4.19.10 v4.19.9 v4.19.8 v4.19.7 v4.19.6 v4.19.5 v4.19.4 v4.19.3 v4.19.2 v4.19.1 v4.19 v4.19-rc8 v4.19-rc7 v4.19-rc6 v4.19-rc5 v4.19-rc4 v4.19-rc3 v4.19-rc2 v4.19-rc1 ck-release-21 ck-release-20 ck-release-19.2 ck-release-19.1 ck-release-19 ck-release-18 ck-release-17.2 ck-release-17.1 ck-release-17 ck-release-16 ck-release-15.1 ck-release-15 ck-release-14 ck-release-13.2 ck-release-13 ck-release-12 ck-release-11 ck-release-10 ck-release-9 ck-release-7 alk-release-15 alk-release-14 alk-release-13.2 alk-release-13 alk-release-12 alk-release-11 alk-release-10 alk-release-9 alk-release-7
无相关合并请求
......@@ -477,61 +477,6 @@ static int wlan_get_adhoc_status_ioctl(wlan_private * priv, struct iwreq *wrq)
return 0;
}
/**
* @brief Set/Get WPA IE
* @param priv A pointer to wlan_private structure
* @param req A pointer to ifreq structure
* @return 0 --success, otherwise fail
*/
static int wlan_setwpaie_ioctl(wlan_private * priv, struct ifreq *req)
{
struct iwreq *wrq = (struct iwreq *)req;
wlan_adapter *adapter = priv->adapter;
int ret = 0;
ENTER();
if (wrq->u.data.length) {
if (wrq->u.data.length > sizeof(adapter->wpa_ie)) {
lbs_pr_debug(1, "failed to copy WPA IE, too big \n");
return -EFAULT;
}
if (copy_from_user(adapter->wpa_ie, wrq->u.data.pointer,
wrq->u.data.length)) {
lbs_pr_debug(1, "failed to copy WPA IE \n");
return -EFAULT;
}
adapter->wpa_ie_len = wrq->u.data.length;
lbs_pr_debug(1, "Set wpa_ie_len=%d IE=%#x\n", adapter->wpa_ie_len,
adapter->wpa_ie[0]);
lbs_dbg_hex("wpa_ie", adapter->wpa_ie, adapter->wpa_ie_len);
if (adapter->wpa_ie[0] == WPA_IE)
adapter->secinfo.WPAenabled = 1;
else if (adapter->wpa_ie[0] == WPA2_IE)
adapter->secinfo.WPA2enabled = 1;
else {
adapter->secinfo.WPAenabled = 0;
adapter->secinfo.WPA2enabled = 0;
}
} else {
memset(adapter->wpa_ie, 0, sizeof(adapter->wpa_ie));
adapter->wpa_ie_len = wrq->u.data.length;
lbs_pr_debug(1, "Reset wpa_ie_len=%d IE=%#x\n",
adapter->wpa_ie_len, adapter->wpa_ie[0]);
adapter->secinfo.WPAenabled = 0;
adapter->secinfo.WPA2enabled = 0;
}
// enable/disable RSN in firmware if WPA is enabled/disabled
// depending on variable adapter->secinfo.WPAenabled is set or not
ret = libertas_prepare_and_send_command(priv, cmd_802_11_enable_rsn,
cmd_act_set, cmd_option_waitforrsp,
0, NULL);
LEAVE();
return ret;
}
/**
* @brief Set Auto prescan
* @param priv A pointer to wlan_private structure
......@@ -1846,9 +1791,6 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
} /* End of switch */
break;
case WLANSETWPAIE:
ret = wlan_setwpaie_ioctl(priv, req);
break;
case WLAN_SETINT_GETINT:
/* The first 4 bytes of req->ifr_data is sub-ioctl number
* after 4 bytes sits the payload.
......
......@@ -1329,11 +1329,6 @@ static const struct iw_priv_args wlan_private_args[] = {
IW_PRIV_TYPE_NONE,
IW_PRIV_TYPE_CHAR | 128,
""},
{
WLANSETWPAIE,
IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 24,
IW_PRIV_TYPE_NONE,
"setwpaie"},
{
WLANGETLOG,
IW_PRIV_TYPE_NONE,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册
反馈
建议
客服 返回
顶部