staging: vt6656: dead code remove rc4.c/h

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/Makefile b/drivers/staging/vt6656/Makefile
index ca1c4251919862ef6df432407daa389329b48c44..2e0361b2f637e366eb3a99d47cb70bb87a1b5261 100644 (file)
--- a/drivers/staging/vt6656/Makefile
+++ b/drivers/staging/vt6656/Makefile
@@ -12,7 +12,6 @@ vt6656_stage-y +=     main_usb.o \
                        dpc.o \
                        power.o \
                        datarate.o \
-                       rc4.o \
                        tether.o \
                        key.o \
                        rf.o \

diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index 918170979aa8937cfb854bfd62cce52d1c38ee18..6652633eda46b664864f57f0f20a6096c444f582 100644 (file)
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -54,7 +54,6 @@
 #include "rf.h"
 #include "power.h"
 #include "key.h"
-#include "rc4.h"
 #include "datarate.h"
 #include "usbpipe.h"
 

diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index c2e495b868bdeea4a16d866321df74063ad308b5..c5b5b9f4b2e4f26b4a84d6e69d7c9dcf00b4eb21 100644 (file)
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -77,7 +77,6 @@
 #include "tether.h"
 #include "wmgr.h"
 #include "wcmd.h"
-#include "rc4.h"
 #include "desc.h"
 #include "key.h"
 #include "card.h"
@@ -640,7 +639,6 @@ struct vnt_private {
        SKeyManagement sKey;
        u32 dwIVCounter;
 
-       RC4Ext SBox;
        u8 abyPRNG[WLAN_WEPMAX_KEYLEN+3];
        u8 byKeyIndex;
 

diff --git a/drivers/staging/vt6656/rc4.c b/drivers/staging/vt6656/rc4.c
deleted file mode 100644 (file)
index 2fd836f..0000000
--- a/drivers/staging/vt6656/rc4.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * File: rc4.c
- *
- * Purpose:
- *
- * Functions:
- *
- * Revision History:
- *
- * Author: Kyle Hsu
- *
- * Date: Sep 4, 2002
- *
- */
-
-#include "rc4.h"
-
-void rc4_init(PRC4Ext pRC4, u8 * pbyKey, unsigned int cbKey_len)
-{
-       unsigned int  ust1, ust2;
-       unsigned int  keyindex;
-       unsigned int  stateindex;
-       u8 * pbyst;
-       unsigned int  idx;
-
-       pbyst = pRC4->abystate;
-       pRC4->ux = 0;
-       pRC4->uy = 0;
-       for (idx = 0; idx < 256; idx++)
-               pbyst[idx] = (u8)idx;
-       keyindex = 0;
-       stateindex = 0;
-       for (idx = 0; idx < 256; idx++) {
-               ust1 = pbyst[idx];
-               stateindex = (stateindex + pbyKey[keyindex] + ust1) & 0xff;
-               ust2 = pbyst[stateindex];
-               pbyst[stateindex] = (u8)ust1;
-               pbyst[idx] = (u8)ust2;
-               if (++keyindex >= cbKey_len)
-                       keyindex = 0;
-       }
-}
-
-unsigned int rc4_byte(PRC4Ext pRC4)
-{
-       unsigned int ux;
-       unsigned int uy;
-       unsigned int ustx, usty;
-       u8 * pbyst;
-
-       pbyst = pRC4->abystate;
-       ux = (pRC4->ux + 1) & 0xff;
-       ustx = pbyst[ux];
-       uy = (ustx + pRC4->uy) & 0xff;
-       usty = pbyst[uy];
-       pRC4->ux = ux;
-       pRC4->uy = uy;
-       pbyst[uy] = (u8)ustx;
-       pbyst[ux] = (u8)usty;
-
-       return pbyst[(ustx + usty) & 0xff];
-}
-
-void rc4_encrypt(PRC4Ext pRC4, u8 * pbyDest,
-                       u8 * pbySrc, unsigned int cbData_len)
-{
-       unsigned int ii;
-       for (ii = 0; ii < cbData_len; ii++)
-               pbyDest[ii] = (u8)(pbySrc[ii] ^ rc4_byte(pRC4));
-}

diff --git a/drivers/staging/vt6656/rc4.h b/drivers/staging/vt6656/rc4.h
deleted file mode 100644 (file)
index d376e1a..0000000
--- a/drivers/staging/vt6656/rc4.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * File: rc4.h
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Purpose:
- *
- * Functions:
- *
- * Revision History:
- *
- * Author: Kyle Hsu
- *
- * Date: Sep 4, 2002
- *
- */
-
-#ifndef __RC4_H__
-#define __RC4_H__
-
-#include <linux/types.h>
-
-typedef struct {
-    unsigned int ux;
-    unsigned int uy;
-    u8 abystate[256];
-} RC4Ext, *PRC4Ext;
-
-void rc4_init(PRC4Ext pRC4, u8 * pbyKey, unsigned int cbKey_len);
-unsigned int rc4_byte(PRC4Ext pRC4);
-void rc4_encrypt(PRC4Ext pRC4, u8 * pbyDest, u8 * pbySrc,
-                unsigned int cbData_len);
-
-#endif /* __RC4_H__ */