mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>,
	devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 09/16] staging: rtl8192e: Remove rtllib_wx_get_encode_ext()
Date: Mon, 15 Jun 2015 00:58:53 +0200	[thread overview]
Message-ID: <1434322740-14454-10-git-send-email-mateusz.kulikowski@gmail.com> (raw)
In-Reply-To: <1434322740-14454-1-git-send-email-mateusz.kulikowski@gmail.com>

This function was declared but never unused.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
---
 drivers/staging/rtl8192e/rtllib.h    |  3 --
 drivers/staging/rtl8192e/rtllib_wx.c | 57 ------------------------------------
 2 files changed, 60 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 4b6ccb8..6d6e637 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -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);
diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index f31d864..967ba8b 100644
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -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)
-- 
1.8.4.1


  parent reply	other threads:[~2015-06-14 23:02 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-14 22:58 [PATCH 00/16] staging: rtl8192e: Remove unused code Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 01/16] staging: rtl8192e: Remove unused code in rtl819x_HT.h Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 02/16] staging: rtl8192e: Remove unused code in rtllib.h Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 03/16] staging: rtl8192e: Remove rt_hi_throughput::ChnkOp Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 04/16] staging: rtl8192e: Remove ENABLE_LOCK_DEBUG reference Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 05/16] staging: rtl8192e: Remove rtllib_stop_queue() Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 06/16] staging: rtl8192e: Remove rtllib_wake_queue() Mateusz Kulikowski
2015-06-15  6:38   ` Sudip Mukherjee
2015-06-15  6:41     ` Mateusz Kulikowski
2015-06-15  6:52       ` Sudip Mukherjee
2015-06-15  6:55         ` Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 07/16] staging: rtl8192e: Remove dequeue_mgmt() and rtllib_resume_tx() Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 08/16] staging: rtl8192e: Remove rtllib_is_shortslot() Mateusz Kulikowski
2015-06-14 22:58 ` Mateusz Kulikowski [this message]
2015-06-14 22:58 ` [PATCH 10/16] staging: rtl8192e: Remove rtllib_device::get_nic_desc_num() Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 11/16] staging: rtl8192e: Remove WIRELESS_EXT checks Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 12/16] staging: rtl8192e: Remove rtllib_network::last_associate Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 13/16] staging: rtl8192e: Remove rt_pwr_save_ctrl members Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 14/16] staging: rtl8192e: Remove unused rtllib_device members Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 15/16] staging: rtl8192e: Remove softmac_hint11d_wq queue Mateusz Kulikowski
2015-06-14 22:59 ` [PATCH 16/16] staging: rtl8192e: Remove rtllib_device::agregation Mateusz Kulikowski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1434322740-14454-10-git-send-email-mateusz.kulikowski@gmail.com \
    --to=mateusz.kulikowski@gmail.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®