staging: rtl8192e: Remove rtllib_wx_get_encode_ext()
authorMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Mon, 15 Jun 2015 19:06:03 +0000 (21:06 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Jun 2015 04:35:02 +0000 (21:35 -0700)
This function was declared but never unused.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192e/rtllib.h
drivers/staging/rtl8192e/rtllib_wx.c

index 4b6ccb8614a20c9c05252202551addbf127784a0..6d6e637fa6b4cbe143417dd49c68f229a54efe21 100644 (file)
@@ -2153,9 +2153,6 @@ extern int rtllib_wx_get_encode(struct rtllib_device *ieee,
                                   struct iw_request_info *info,
                                   union iwreq_data *wrqu, char *key);
 #if WIRELESS_EXT >= 18
-extern int rtllib_wx_get_encode_ext(struct rtllib_device *ieee,
-                           struct iw_request_info *info,
-                           union iwreq_data *wrqu, char *extra);
 extern int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,
                            struct iw_request_info *info,
                            union iwreq_data *wrqu, char *extra);
index f31d864df6ccbed17a6033ed3a94bba328f5c962..967ba8bc80bb5d760c6cc7e78971311df9a99901 100644 (file)
@@ -682,63 +682,6 @@ done:
 }
 EXPORT_SYMBOL(rtllib_wx_set_encode_ext);
 
-int rtllib_wx_get_encode_ext(struct rtllib_device *ieee,
-                              struct iw_request_info *info,
-                              union iwreq_data *wrqu, char *extra)
-{
-       struct iw_point *encoding = &wrqu->encoding;
-       struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
-       struct lib80211_crypt_data *crypt;
-       int idx, max_key_len;
-
-       max_key_len = encoding->length - sizeof(*ext);
-       if (max_key_len < 0)
-               return -EINVAL;
-
-       idx = encoding->flags & IW_ENCODE_INDEX;
-       if (idx) {
-               if (idx < 1 || idx > NUM_WEP_KEYS)
-                       return -EINVAL;
-               idx--;
-       } else {
-               idx = ieee->crypt_info.tx_keyidx;
-       }
-       if (!(ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) &&
-           (ext->alg != IW_ENCODE_ALG_WEP))
-               if (idx != 0 || (ieee->iw_mode != IW_MODE_INFRA))
-                       return -EINVAL;
-
-       crypt = ieee->crypt_info.crypt[idx];
-
-       encoding->flags = idx + 1;
-       memset(ext, 0, sizeof(*ext));
-
-       if (crypt == NULL || crypt->ops == NULL) {
-               ext->alg = IW_ENCODE_ALG_NONE;
-               ext->key_len = 0;
-               encoding->flags |= IW_ENCODE_DISABLED;
-       } else {
-               if (strcmp(crypt->ops->name, "R-WEP") == 0)
-                       ext->alg = IW_ENCODE_ALG_WEP;
-               else if (strcmp(crypt->ops->name, "R-TKIP"))
-                       ext->alg = IW_ENCODE_ALG_TKIP;
-               else if (strcmp(crypt->ops->name, "R-CCMP"))
-                       ext->alg = IW_ENCODE_ALG_CCMP;
-               else
-                       return -EINVAL;
-               ext->key_len = crypt->ops->get_key(ext->key, SCM_KEY_LEN,
-                                                  NULL, crypt->priv);
-               encoding->flags |= IW_ENCODE_ENABLED;
-               if (ext->key_len &&
-                   (ext->alg == IW_ENCODE_ALG_TKIP ||
-                    ext->alg == IW_ENCODE_ALG_CCMP))
-                       ext->ext_flags |= IW_ENCODE_EXT_TX_SEQ_VALID;
-
-       }
-
-       return 0;
-}
-
 int rtllib_wx_set_mlme(struct rtllib_device *ieee,
                               struct iw_request_info *info,
                               union iwreq_data *wrqu, char *extra)