From patchwork Mon Nov 25 22:18:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 3234951 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 05CB09F3A0 for ; Mon, 25 Nov 2013 22:18:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E00A320334 for ; Mon, 25 Nov 2013 22:18:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF3B220328 for ; Mon, 25 Nov 2013 22:18:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752678Ab3KYWSo (ORCPT ); Mon, 25 Nov 2013 17:18:44 -0500 Received: from mail-wi0-f171.google.com ([209.85.212.171]:58072 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752588Ab3KYWSn (ORCPT ); Mon, 25 Nov 2013 17:18:43 -0500 Received: by mail-wi0-f171.google.com with SMTP id ca18so4315082wib.4 for ; Mon, 25 Nov 2013 14:18:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:content-type:mime-version :content-transfer-encoding; bh=U/8Z+67l7sQE8JQLYLBjNXAlCs07Y6pr75FWuEUmvYg=; b=VXQuFzlk6RicNMGo3S5GPawLD2ONFVJh5mAERt71uh952zvVeAZ4AT7mqbOrT6QBn+ RpZ06wCL/VlrRqmKbTA1TBTjyZre2BgBIokMsT/7UOlfp/klWLMyOJu2DXvPxXHjHTxC 5vSewRiWlTWpuoVNq1iHMCbYjlTt/031s47LdYP6+qPZ+j+qgJKCTvF+AyQsHfyRgqba 0zSl47PPagKkb5BcGEKp1vUVEzwf77LYdm/7RHfkTIbay+R+ROY996ypyfHPnYRB7uVO 6V8+LDctkY4bhJ5477vdT4T3qlv/67MT7c4R5VUvbAAqXM1S1i7qPPtZ8lr3jpww4Meo rbDg== X-Received: by 10.194.104.66 with SMTP id gc2mr407828wjb.75.1385417922636; Mon, 25 Nov 2013 14:18:42 -0800 (PST) Received: from [192.168.1.100] (92.40.111.248.threembb.co.uk. [92.40.111.248]) by mx.google.com with ESMTPSA id y20sm54198127wib.0.2013.11.25.14.18.41 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Mon, 25 Nov 2013 14:18:42 -0800 (PST) Message-ID: <1385417911.6327.4.camel@canaries32-MCP7A> Subject: [PATCH 2/2] staging: vt6656: Remove unused variable bAES. From: Malcolm Priestley To: "gregkh@linuxfoundation.org" Cc: "linux-wireless@vger.kernel.org" Date: Mon, 25 Nov 2013 22:18:31 +0000 X-Mailer: Evolution 3.8.5-2ubuntu1 Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP bAES flips from false to true but doesn't do anything. Signed-off-by: Malcolm Priestley --- drivers/staging/vt6656/device.h | 2 -- drivers/staging/vt6656/rxtx.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index 9a4dfbc..82e1e6d 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -667,8 +667,6 @@ struct vnt_private { u8 abyPRNG[WLAN_WEPMAX_KEYLEN+3]; u8 byKeyIndex; - int bAES; - u32 uKeyLength; u8 abyKey[WLAN_WEP232_KEYLEN]; diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index aa71d39..cc23029 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -1462,7 +1462,6 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, // Notes: // Although spec says MMPDU can be fragmented; In most case, // no one will send a MMPDU under fragmentation. With RTS may occur. - pDevice->bAES = false; //Set FRAGCTL_WEPTYP if (WLAN_GET_FC_ISWEP(pPacket->p80211Header->sA4.wFrameCtl) != 0) { if (pDevice->eEncryptionStatus == Ndis802_11Encryption1Enabled) { @@ -1483,7 +1482,6 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, cbIVlen = 8;//RSN Header cbICVlen = 8;//MIC pTxBufHead->wFragCtl |= FRAGCTL_AES; - pDevice->bAES = true; } //MAC Header should be padding 0 to DW alignment. uPadding = 4 - (cbMacHdLen%4); @@ -1858,7 +1856,6 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb) // Notes: // Although spec says MMPDU can be fragmented; In most case, // no one will send a MMPDU under fragmentation. With RTS may occur. - pDevice->bAES = false; //Set FRAGCTL_WEPTYP if (WLAN_GET_FC_ISWEP(p80211Header->sA4.wFrameCtl) != 0) { if (pDevice->eEncryptionStatus == Ndis802_11Encryption1Enabled) { @@ -1880,7 +1877,6 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb) cbICVlen = 8;//MIC cbMICHDR = sizeof(struct vnt_mic_hdr); pTxBufHead->wFragCtl |= FRAGCTL_AES; - pDevice->bAES = true; } //MAC Header should be padding 0 to DW alignment. uPadding = 4 - (cbMacHdLen%4);