Staging: rt3070: remove dead NINTENDO_AP code

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rt3070/oid.h b/drivers/staging/rt3070/oid.h
index 249454bcf306dab563a0f4fd2c322e1c18bef1ff..c999d6548946f5a2eedf589a40e452f71e80cfe6 100644 (file)
--- a/drivers/staging/rt3070/oid.h
+++ b/drivers/staging/rt3070/oid.h
@@ -765,13 +765,6 @@ enum {
 #define RT_OID_GET_PHY_MODE                         0x761
 #endif // LLTD_SUPPORT //
 
-#ifdef NINTENDO_AP
-//#define RT_OID_NINTENDO                             0x0D010770
-#define RT_OID_802_11_NINTENDO_GET_TABLE                       0x0771 //((RT_OID_NINTENDO + 0x01) & 0xffff)
-#define RT_OID_802_11_NINTENDO_SET_TABLE                       0x0772 //((RT_OID_NINTENDO + 0x02) & 0xffff)
-#define RT_OID_802_11_NINTENDO_CAPABLE                         0x0773 //((RT_OID_NINTENDO + 0x03) & 0xffff)
-#endif // NINTENDO_AP //
-
 //Add Paul Chen for Accton
 //#define RT_OID_TX_POWER_LEVEL                 0xFF020010
 //#define RT_OID_SET_TX_POWER_LEVEL              (OID_GET_SET_TOGGLE | RT_OID_TX_POWER_LEVEL)
@@ -992,52 +985,6 @@ typedef struct {
        UCHAR           rsv;
 } OID_SET_HT_PHYMODE, *POID_SET_HT_PHYMODE;
 
-#ifdef NINTENDO_AP
-#define NINTENDO_MAX_ENTRY 16
-#define NINTENDO_SSID_NAME_LN 8
-#define NINTENDO_SSID_NAME "NWCUSBAP"
-#define NINTENDO_PROBE_REQ_FLAG_MASK 0x03
-#define NINTENDO_PROBE_REQ_ON 0x01
-#define NINTENDO_PROBE_REQ_SIGNAL 0x02
-#define NINTENDO_PROBE_RSP_ON 0x01
-#define NINTENDO_SSID_NICKNAME_LN 20
-
-#define NINTENDO_WEPKEY_LN 13
-
-typedef struct _NINTENDO_SSID
-{
-       UCHAR   NINTENDOFixChar[NINTENDO_SSID_NAME_LN];
-       UCHAR   zero1;
-       UCHAR   registe;
-       UCHAR   ID;
-       UCHAR   zero2;
-       UCHAR   NICKname[NINTENDO_SSID_NICKNAME_LN];
-} RT_NINTENDO_SSID, *PRT_NINTENDO_SSID;
-
-typedef struct _NINTENDO_ENTRY
-{
-       UCHAR   NICKname[NINTENDO_SSID_NICKNAME_LN];
-    UCHAR   DS_Addr[ETH_LENGTH_OF_ADDRESS];
-       UCHAR   registe;
-       UCHAR   UserSpaceAck;
-} RT_NINTENDO_ENTRY, *PRT_NINTENDO_ENTRY;
-
-//RTPRIV_IOCTL_NINTENDO_GET_TABLE
-//RTPRIV_IOCTL_NINTENDO_SET_TABLE
-typedef struct _NINTENDO_TABLE
-{
-       UINT                            number;
-       RT_NINTENDO_ENTRY       entry[NINTENDO_MAX_ENTRY];
-} RT_NINTENDO_TABLE, *PRT_NINTENDO_TABLE;
-
-//RTPRIV_IOCTL_NINTENDO_SEED_WEPKEY
-typedef struct _NINTENDO_SEED_WEPKEY
-{
-       UCHAR   seed[NINTENDO_SSID_NICKNAME_LN];
-       UCHAR   wepkey[16];//use 13 for 104 bits wep key
-} RT_NINTENDO_SEED_WEPKEY, *PRT_NINTENDO_SEED_WEPKEY;
-#endif // NINTENDO_AP //
-
 #ifdef LLTD_SUPPORT
 typedef struct _RT_LLTD_ASSOICATION_ENTRY {
     UCHAR           Addr[ETH_LENGTH_OF_ADDRESS];

diff --git a/drivers/staging/rt3070/rtmp.h b/drivers/staging/rt3070/rtmp.h
index b70c9543d04da29a247da430a0ce933d10a2d531..2410157fd9b9b906ef198e24da00da765327e1d6 100644 (file)
--- a/drivers/staging/rt3070/rtmp.h
+++ b/drivers/staging/rt3070/rtmp.h
@@ -2663,28 +2663,6 @@ typedef struct _INF_USB_CONFIG
        };
 #endif // IKANOS_VX_1X0 //
 
-#ifdef NINTENDO_AP
-typedef struct _NINDO_CTRL_BLOCK {
-
-       RT_NINTENDO_TABLE       DS_TABLE;
-
-#ifdef CHIP25XX
-       spinlock_t                      NINTENDO_TABLE_Lock;
-#else
-       NDIS_SPIN_LOCK          NINTENDO_TABLE_Lock;
-#endif // CHIP25XX //
-
-       UCHAR                           NINTENDO_UP_BUFFER[512];
-       UCHAR                           Local_KeyIdx;
-       CIPHER_KEY                      Local_SharedKey;
-       UCHAR                           Local_bHideSsid;
-       UCHAR                           Local_AuthMode;
-       UCHAR                           Local_WepStatus;
-       USHORT                          Local_CapabilityInfo;
-} NINDO_CTRL_BLOCK;
-#endif // NINTENDO_AP //
-
-
 #ifdef DBG_DIAGNOSE
 #define DIAGNOSE_TIME  10   // 10 sec
 typedef struct _RtmpDiagStrcut_
@@ -3143,11 +3121,6 @@ typedef struct _RTMP_ADAPTER
        UCHAR                                   flg_be_adjust;
        ULONG                                   be_adjust_last_time;
 
-#ifdef NINTENDO_AP
-       NINDO_CTRL_BLOCK                nindo_ctrl_block;
-#endif // NINTENDO_AP //
-
-
 #ifdef IKANOS_VX_1X0
        struct IKANOS_TX_INFO   IkanosTxInfo;
        struct IKANOS_TX_INFO   IkanosRxInfo[MAX_MBSSID_NUM + MAX_WDS_ENTRY + MAX_APCLI_NUM + MAX_MESH_NUM];
@@ -6472,35 +6445,6 @@ void ChannelInfoDestroy(
 UCHAR New_ApAutoSelectChannel(
        IN PRTMP_ADAPTER pAd);
 
-
-#ifdef NINTENDO_AP
-VOID   InitNINTENDO_TABLE(
-       IN PRTMP_ADAPTER pAd);
-
-UCHAR  CheckNINTENDO_TABLE(
-       IN PRTMP_ADAPTER pAd,
-       PCHAR pDS_Ssid,
-       UCHAR DS_SsidLen,
-       PUCHAR pDS_Addr);
-
-UCHAR  DelNINTENDO_ENTRY(
-       IN      PRTMP_ADAPTER pAd,
-       UCHAR * pDS_Addr);
-
-VOID   RTMPIoctlNintendoCapable(
-       IN      PRTMP_ADAPTER   pAd,
-       IN      struct iwreq    *wrq);
-
-VOID   RTMPIoctlNintendoGetTable(
-       IN      PRTMP_ADAPTER   pAd,
-       IN      struct iwreq    *wrq);
-
-VOID   RTMPIoctlNintendoSetTable(
-       IN      PRTMP_ADAPTER   pAd,
-       IN      struct iwreq    *wrq);
-
-#endif // NINTENDO_AP //
-
 BOOLEAN rtstrmactohex(
        IN char *s1,
        IN char *s2);