diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-10-21 16:45:09 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 15:23:12 -0500 |
commit | 5a1322317abff17a6cdaf53bd33a4102d456ec23 (patch) | |
tree | 423f327433528bef23181153d9a6e4323a9b0343 | |
parent | ef3e746815954ada673fab6545679e7418d1b1d3 (diff) |
Staging: rt28x0: remove dead code
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/rt2860/oid.h | 19 | ||||
-rw-r--r-- | drivers/staging/rt2860/rt_config.h | 8 | ||||
-rw-r--r-- | drivers/staging/rt2860/rt_linux.h | 10 | ||||
-rw-r--r-- | drivers/staging/rt2860/rtmp.h | 13 | ||||
-rw-r--r-- | drivers/staging/rt2860/rtmp_def.h | 9 |
5 files changed, 0 insertions, 59 deletions
diff --git a/drivers/staging/rt2860/oid.h b/drivers/staging/rt2860/oid.h index a03293cabd87..f3fb5ff74061 100644 --- a/drivers/staging/rt2860/oid.h +++ b/drivers/staging/rt2860/oid.h | |||
@@ -502,19 +502,6 @@ typedef struct _NDIS_802_11_AUTHENTICATION_EVENT | |||
502 | NDIS_802_11_AUTHENTICATION_REQUEST Request[1]; | 502 | NDIS_802_11_AUTHENTICATION_REQUEST Request[1]; |
503 | } NDIS_802_11_AUTHENTICATION_EVENT, *PNDIS_802_11_AUTHENTICATION_EVENT; | 503 | } NDIS_802_11_AUTHENTICATION_EVENT, *PNDIS_802_11_AUTHENTICATION_EVENT; |
504 | 504 | ||
505 | /* | ||
506 | typedef struct _NDIS_802_11_TEST | ||
507 | { | ||
508 | ULONG Length; | ||
509 | ULONG Type; | ||
510 | union | ||
511 | { | ||
512 | NDIS_802_11_AUTHENTICATION_EVENT AuthenticationEvent; | ||
513 | NDIS_802_11_RSSI RssiTrigger; | ||
514 | }; | ||
515 | } NDIS_802_11_TEST, *PNDIS_802_11_TEST; | ||
516 | */ | ||
517 | |||
518 | // 802.11 Media stream constraints, associated with OID_802_11_MEDIA_STREAM_MODE | 505 | // 802.11 Media stream constraints, associated with OID_802_11_MEDIA_STREAM_MODE |
519 | typedef enum _NDIS_802_11_MEDIA_STREAM_MODE | 506 | typedef enum _NDIS_802_11_MEDIA_STREAM_MODE |
520 | { | 507 | { |
@@ -553,10 +540,6 @@ typedef struct _NDIS_802_11_CAPABILITY | |||
553 | NDIS_802_11_AUTHENTICATION_ENCRYPTION AuthenticationEncryptionSupported[1]; | 540 | NDIS_802_11_AUTHENTICATION_ENCRYPTION AuthenticationEncryptionSupported[1]; |
554 | } NDIS_802_11_CAPABILITY, *PNDIS_802_11_CAPABILITY; | 541 | } NDIS_802_11_CAPABILITY, *PNDIS_802_11_CAPABILITY; |
555 | 542 | ||
556 | #ifdef LINUX | ||
557 | #endif // LINUX // | ||
558 | |||
559 | |||
560 | #define RT_PRIV_IOCTL (SIOCIWFIRSTPRIV + 0x01) // Sync. with AP for wsc upnp daemon | 543 | #define RT_PRIV_IOCTL (SIOCIWFIRSTPRIV + 0x01) // Sync. with AP for wsc upnp daemon |
561 | #define RTPRIV_IOCTL_SET (SIOCIWFIRSTPRIV + 0x02) | 544 | #define RTPRIV_IOCTL_SET (SIOCIWFIRSTPRIV + 0x02) |
562 | 545 | ||
@@ -593,8 +576,6 @@ enum { | |||
593 | #define OID_802_11_GET_COUNTRY_CODE 0x0716 | 576 | #define OID_802_11_GET_COUNTRY_CODE 0x0716 |
594 | #define OID_802_11_GET_CHANNEL_GEOGRAPHY 0x0717 | 577 | #define OID_802_11_GET_CHANNEL_GEOGRAPHY 0x0717 |
595 | 578 | ||
596 | //#define RT_OID_802_11_STATISTICS (OID_GET_SET_TOGGLE | OID_802_11_STATISTICS) | ||
597 | |||
598 | #define RT_OID_WSC_SET_PASSPHRASE 0x0740 // passphrase for wpa(2)-psk | 579 | #define RT_OID_WSC_SET_PASSPHRASE 0x0740 // passphrase for wpa(2)-psk |
599 | #define RT_OID_WSC_DRIVER_AUTO_CONNECT 0x0741 | 580 | #define RT_OID_WSC_DRIVER_AUTO_CONNECT 0x0741 |
600 | #define RT_OID_WSC_QUERY_DEFAULT_PROFILE 0x0742 | 581 | #define RT_OID_WSC_QUERY_DEFAULT_PROFILE 0x0742 |
diff --git a/drivers/staging/rt2860/rt_config.h b/drivers/staging/rt2860/rt_config.h index 67b957b271e9..9e684ae1f4bb 100644 --- a/drivers/staging/rt2860/rt_config.h +++ b/drivers/staging/rt2860/rt_config.h | |||
@@ -64,14 +64,6 @@ | |||
64 | #include "rtmp_mcu.h" | 64 | #include "rtmp_mcu.h" |
65 | #endif | 65 | #endif |
66 | 66 | ||
67 | #undef AP_WSC_INCLUDED | ||
68 | #undef STA_WSC_INCLUDED | ||
69 | #undef WSC_INCLUDED | ||
70 | |||
71 | |||
72 | |||
73 | |||
74 | |||
75 | #ifdef IGMP_SNOOP_SUPPORT | 67 | #ifdef IGMP_SNOOP_SUPPORT |
76 | #include "igmp_snoop.h" | 68 | #include "igmp_snoop.h" |
77 | #endif // IGMP_SNOOP_SUPPORT // | 69 | #endif // IGMP_SNOOP_SUPPORT // |
diff --git a/drivers/staging/rt2860/rt_linux.h b/drivers/staging/rt2860/rt_linux.h index e8c7d887de1e..d16bcf3bbd39 100644 --- a/drivers/staging/rt2860/rt_linux.h +++ b/drivers/staging/rt2860/rt_linux.h | |||
@@ -75,16 +75,6 @@ | |||
75 | #include <linux/kthread.h> | 75 | #include <linux/kthread.h> |
76 | #endif // KTHREAD_SUPPORT // | 76 | #endif // KTHREAD_SUPPORT // |
77 | 77 | ||
78 | #undef AP_WSC_INCLUDED | ||
79 | #undef STA_WSC_INCLUDED | ||
80 | #undef WSC_INCLUDED | ||
81 | |||
82 | |||
83 | |||
84 | |||
85 | #ifdef KTHREAD_SUPPORT | ||
86 | #endif // KTHREAD_SUPPORT // | ||
87 | |||
88 | /*********************************************************************************** | 78 | /*********************************************************************************** |
89 | * Profile related sections | 79 | * Profile related sections |
90 | ***********************************************************************************/ | 80 | ***********************************************************************************/ |
diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h index d213387d74bd..2ca1ca68b818 100644 --- a/drivers/staging/rt2860/rtmp.h +++ b/drivers/staging/rt2860/rtmp.h | |||
@@ -41,23 +41,10 @@ | |||
41 | #define __RTMP_H__ | 41 | #define __RTMP_H__ |
42 | 42 | ||
43 | #include "spectrum_def.h" | 43 | #include "spectrum_def.h" |
44 | |||
45 | #include "rtmp_dot11.h" | 44 | #include "rtmp_dot11.h" |
46 | |||
47 | #undef AP_WSC_INCLUDED | ||
48 | #undef STA_WSC_INCLUDED | ||
49 | #undef WSC_INCLUDED | ||
50 | |||
51 | |||
52 | |||
53 | #if defined(AP_WSC_INCLUDED) || defined(STA_WSC_INCLUDED) | ||
54 | #define WSC_INCLUDED | ||
55 | #endif | ||
56 | |||
57 | #include "rtmp_chip.h" | 45 | #include "rtmp_chip.h" |
58 | 46 | ||
59 | 47 | ||
60 | |||
61 | typedef struct _RTMP_ADAPTER RTMP_ADAPTER; | 48 | typedef struct _RTMP_ADAPTER RTMP_ADAPTER; |
62 | typedef struct _RTMP_ADAPTER *PRTMP_ADAPTER; | 49 | typedef struct _RTMP_ADAPTER *PRTMP_ADAPTER; |
63 | 50 | ||
diff --git a/drivers/staging/rt2860/rtmp_def.h b/drivers/staging/rt2860/rtmp_def.h index ca700d064a91..816ae6294449 100644 --- a/drivers/staging/rt2860/rtmp_def.h +++ b/drivers/staging/rt2860/rtmp_def.h | |||
@@ -41,15 +41,6 @@ | |||
41 | 41 | ||
42 | #include "oid.h" | 42 | #include "oid.h" |
43 | 43 | ||
44 | #undef AP_WSC_INCLUDED | ||
45 | #undef STA_WSC_INCLUDED | ||
46 | #undef WSC_INCLUDED | ||
47 | |||
48 | |||
49 | |||
50 | #if defined(AP_WSC_INCLUDED) || defined(STA_WSC_INCLUDED) | ||
51 | #define WSC_INCLUDED | ||
52 | #endif | ||
53 | // | 44 | // |
54 | // Debug information verbosity: lower values indicate higher urgency | 45 | // Debug information verbosity: lower values indicate higher urgency |
55 | // | 46 | // |