Staging: wlan-ng: Delete a pile of unused mibs. And fix WEXT SET_TXPOWER.

Signed-off-by: Solomon Peachy <pizza@shaftnet.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h
index 8d2d133a4df7e4e58ec58563f0eaadaf52513cb7..ff27d4ace391221c38c34215a6815d765b9d852c 100644 (file)
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -798,25 +798,6 @@
                        (P80211DID_MKSECTION(1) | \
                        P80211DID_MKGROUP(4) | \
                        P80211DID_MKITEM(4) | 0x0c000000)
-#define DIDmib_dot11smt_dot11WEPKeyMappingsTable \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(5))
-#define DIDmib_dot11smt_dot11WEPKeyMappingsTable_dot11WEPKeyMappingIndex \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(5) | \
-                       P80211DID_MKITEM(1) | 0x1c000000)
-#define DIDmib_dot11smt_dot11WEPKeyMappingsTable_dot11WEPKeyMappingAddress \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(5) | \
-                       P80211DID_MKITEM(2) | 0x1c000000)
-#define DIDmib_dot11smt_dot11WEPKeyMappingsTable_dot11WEPKeyMappingWEPOn \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(5) | \
-                       P80211DID_MKITEM(3) | 0x1c000000)
-#define DIDmib_dot11smt_dot11WEPKeyMappingsTable_dot11WEPKeyMappingValue \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(5) | \
-                       P80211DID_MKITEM(4) | 0x1c000000)
 #define DIDmib_dot11smt_dot11PrivacyTable \
                        (P80211DID_MKSECTION(1) | \
                        P80211DID_MKGROUP(6))
@@ -828,22 +809,10 @@
                        (P80211DID_MKSECTION(1) | \
                        P80211DID_MKGROUP(6) | \
                        P80211DID_MKITEM(2) | 0x18000000)
-#define DIDmib_dot11smt_dot11PrivacyTable_dot11WEPKeyMappingLength \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(3) | 0x18000000)
 #define DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted \
                        (P80211DID_MKSECTION(1) | \
                        P80211DID_MKGROUP(6) | \
                        P80211DID_MKITEM(4) | 0x18000000)
-#define DIDmib_dot11smt_dot11PrivacyTable_dot11WEPICVErrorCount \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(5) | 0x10000000)
-#define DIDmib_dot11smt_dot11PrivacyTable_dot11WEPExcludedCount \
-                       (P80211DID_MKSECTION(1) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(6) | 0x10000000)
 #define DIDmib_cat_dot11mac \
                        P80211DID_MKSECTION(2)
 #define DIDmib_dot11mac_dot11OperationTable \
@@ -877,73 +846,6 @@
                        (P80211DID_MKSECTION(2) | \
                        P80211DID_MKGROUP(1) | \
                        P80211DID_MKITEM(7) | 0x10000000)
-#define DIDmib_dot11mac_dot11OperationTable_dot11ManufacturerID \
-                       (P80211DID_MKSECTION(2) | \
-                       P80211DID_MKGROUP(1) | \
-                       P80211DID_MKITEM(8) | 0x10000000)
-#define DIDmib_dot11mac_dot11OperationTable_dot11ProductID \
-                       (P80211DID_MKSECTION(2) | \
-                       P80211DID_MKGROUP(1) | \
-                       P80211DID_MKITEM(9) | 0x10000000)
-#define DIDmib_dot11mac_dot11CountersTable \
-                       (P80211DID_MKSECTION(2) | \
-                       P80211DID_MKGROUP(2))
-#define DIDmib_dot11mac_dot11CountersTable_dot11TransmittedFragmentCount \
-                       (P80211DID_MKSECTION(2) | \
-                       P80211DID_MKGROUP(2) | \
-                       P80211DID_MKITEM(1) | 0x10000000)
-#define DIDmib_dot11mac_dot11CountersTable_dot11MulticastTransmittedFrameCount \
-                       (P80211DID_MKSECTION(2) | \
-                       P80211DID_MKGROUP(2) | \
-                       P80211DID_MKITEM(2) | 0x10000000)
-#define DIDmib_dot11mac_dot11CountersTable_dot11FailedCount \
-                       (P80211DID_MKSECTION(2) | \
-                       P80211DID_MKGROUP(2) | \
-                       P80211DID_MKITEM(3) | 0x10000000)
-#define DIDmib_dot11mac_dot11CountersTable_dot11RetryCount \
-                       (P80211DID_MKSECTION(2) | \
-                       P80211DID_MKGROUP(2) | \
-                       P80211DID_MKITEM(4) | 0x10000000)
-#define DIDmib_dot11mac_dot11CountersTable_dot11MultipleRetryCount \
-                       (P80211DID_MKSECTION(2) | \
-                       P80211DID_MKGROUP(2) | \
-                       P80211DID_MKITEM(5) | 0x10000000)
-#define DIDmib_dot11mac_dot11CountersTable_dot11FrameDuplicateCount \
-                       (P80211DID_MKSECTION(2) | \
-                       P80211DID_MKGROUP(2) | \
-                       P80211DID_MKITEM(6) | 0x10000000)
-#define DIDmib_dot11mac_dot11CountersTable_dot11RTSSuccessCount \
-                       (P80211DID_MKSECTION(2) | \
-                       P80211DID_MKGROUP(2) | \
-                       P80211DID_MKITEM(7) | 0x10000000)
-#define DIDmib_dot11mac_dot11CountersTable_dot11RTSFailureCount \
-                       (P80211DID_MKSECTION(2) | \
-                       P80211DID_MKGROUP(2) | \
-                       P80211DID_MKITEM(8) | 0x10000000)
-#define DIDmib_dot11mac_dot11CountersTable_dot11ACKFailureCount \
-                       (P80211DID_MKSECTION(2) | \
-                       P80211DID_MKGROUP(2) | \
-                       P80211DID_MKITEM(9) | 0x10000000)
-#define DIDmib_dot11mac_dot11CountersTable_dot11ReceivedFragmentCount \
-                       (P80211DID_MKSECTION(2) | \
-                       P80211DID_MKGROUP(2) | \
-                       P80211DID_MKITEM(10) | 0x10000000)
-#define DIDmib_dot11mac_dot11CountersTable_dot11MulticastReceivedFrameCount \
-                       (P80211DID_MKSECTION(2) | \
-                       P80211DID_MKGROUP(2) | \
-                       P80211DID_MKITEM(11) | 0x10000000)
-#define DIDmib_dot11mac_dot11CountersTable_dot11FCSErrorCount \
-                       (P80211DID_MKSECTION(2) | \
-                       P80211DID_MKGROUP(2) | \
-                       P80211DID_MKITEM(12) | 0x10000000)
-#define DIDmib_dot11mac_dot11CountersTable_dot11TransmittedFrameCount \
-                       (P80211DID_MKSECTION(2) | \
-                       P80211DID_MKGROUP(2) | \
-                       P80211DID_MKITEM(13) | 0x10000000)
-#define DIDmib_dot11mac_dot11CountersTable_dot11WEPUndecryptableCount \
-                       (P80211DID_MKSECTION(2) | \
-                       P80211DID_MKGROUP(2) | \
-                       P80211DID_MKITEM(14) | 0x10000000)
 #define DIDmib_cat_dot11phy \
                        P80211DID_MKSECTION(3)
 #define DIDmib_dot11phy_dot11PhyOperationTable \
@@ -961,107 +863,14 @@
                        (P80211DID_MKSECTION(3) | \
                        P80211DID_MKGROUP(1) | \
                        P80211DID_MKITEM(3) | 0x10000000)
-#define DIDmib_dot11phy_dot11PhyOperationTable_dot11ChannelAgilityPresent \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(1) | \
-                       P80211DID_MKITEM(4) | 0x10000000)
-#define DIDmib_dot11phy_dot11PhyOperationTable_dot11ChannelAgilityEnabled \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(1) | \
-                       P80211DID_MKITEM(5) | 0x10000000)
+#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel \
+                       (P80211DID_MKSECTION(3) | \
+                       P80211DID_MKGROUP(3) | \
+                       P80211DID_MKITEM(10) | 0x18000000)
 #define DIDmib_dot11phy_dot11PhyOperationTable_dot11ShortPreambleEnabled \
                        (P80211DID_MKSECTION(3) | \
                        P80211DID_MKGROUP(1) | \
                        P80211DID_MKITEM(6) | 0x10000000)
-#define DIDmib_dot11phy_dot11PhyAntennaTable \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(2))
-#define DIDmib_dot11phy_dot11PhyAntennaTable_dot11CurrentTxAntenna \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(2) | \
-                       P80211DID_MKITEM(1) | 0x18000000)
-#define DIDmib_dot11phy_dot11PhyAntennaTable_dot11DiversitySupport \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(2) | \
-                       P80211DID_MKITEM(2) | 0x10000000)
-#define DIDmib_dot11phy_dot11PhyAntennaTable_dot11CurrentRxAntenna \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(2) | \
-                       P80211DID_MKITEM(3) | 0x18000000)
-#define DIDmib_dot11phy_dot11PhyTxPowerTable \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(3))
-#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11NumberSupportedPowerLevels \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(3) | \
-                       P80211DID_MKITEM(1) | 0x10000000)
-#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel1 \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(3) | \
-                       P80211DID_MKITEM(2) | 0x10000000)
-#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel2 \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(3) | \
-                       P80211DID_MKITEM(3) | 0x10000000)
-#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel3 \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(3) | \
-                       P80211DID_MKITEM(4) | 0x10000000)
-#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel4 \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(3) | \
-                       P80211DID_MKITEM(5) | 0x10000000)
-#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel5 \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(3) | \
-                       P80211DID_MKITEM(6) | 0x10000000)
-#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel6 \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(3) | \
-                       P80211DID_MKITEM(7) | 0x10000000)
-#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel7 \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(3) | \
-                       P80211DID_MKITEM(8) | 0x10000000)
-#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel8 \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(3) | \
-                       P80211DID_MKITEM(9) | 0x10000000)
-#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(3) | \
-                       P80211DID_MKITEM(10) | 0x18000000)
-#define DIDmib_dot11phy_dot11PhyFHSSTable \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(4))
-#define DIDmib_dot11phy_dot11PhyFHSSTable_dot11HopTime \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(4) | \
-                       P80211DID_MKITEM(1) | 0x10000000)
-#define DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentChannelNumber \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(4) | \
-                       P80211DID_MKITEM(2) | 0x18000000)
-#define DIDmib_dot11phy_dot11PhyFHSSTable_dot11MaxDwellTime \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(4) | \
-                       P80211DID_MKITEM(3) | 0x10000000)
-#define DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentDwellTime \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(4) | \
-                       P80211DID_MKITEM(4) | 0x18000000)
-#define DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentSet \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(4) | \
-                       P80211DID_MKITEM(5) | 0x18000000)
-#define DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentPattern \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(4) | \
-                       P80211DID_MKITEM(6) | 0x18000000)
-#define DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentIndex \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(4) | \
-                       P80211DID_MKITEM(7) | 0x18000000)
 #define DIDmib_dot11phy_dot11PhyDSSSTable \
                        (P80211DID_MKSECTION(3) | \
                        P80211DID_MKGROUP(5))
@@ -1085,81 +894,6 @@
                        (P80211DID_MKSECTION(3) | \
                        P80211DID_MKGROUP(5) | \
                        P80211DID_MKITEM(5) | 0x10000000)
-#define DIDmib_dot11phy_dot11PhyDSSSTable_dot11PBCCOptionImplemented \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(5) | \
-                       P80211DID_MKITEM(6) | 0x10000000)
-#define DIDmib_dot11phy_dot11PhyIRTable \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(6))
-#define DIDmib_dot11phy_dot11PhyIRTable_dot11CCAWatchdogTimerMax \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(1) | 0x18000000)
-#define DIDmib_dot11phy_dot11PhyIRTable_dot11CCAWatchdogCountMax \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(2) | 0x18000000)
-#define DIDmib_dot11phy_dot11PhyIRTable_dot11CCAWatchdogTimerMin \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(3) | 0x18000000)
-#define DIDmib_dot11phy_dot11PhyIRTable_dot11CCAWatchdogCountMin \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(6) | \
-                       P80211DID_MKITEM(4) | 0x18000000)
-#define DIDmib_dot11phy_dot11RegDomainsSupportedTable \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(7))
-#define DIDmib_dot11phy_dot11RegDomainsSupportedTable_dot11RegDomainsSupportIndex \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(7) | \
-                       P80211DID_MKITEM(1) | 0x1c000000)
-#define DIDmib_dot11phy_dot11RegDomainsSupportedTable_dot11RegDomainsSupportValue \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(7) | \
-                       P80211DID_MKITEM(2) | 0x14000000)
-#define DIDmib_dot11phy_dot11AntennasListTable \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(8))
-#define DIDmib_dot11phy_dot11AntennasListTable_dot11AntennaListIndex \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(8) | \
-                       P80211DID_MKITEM(1) | 0x1c000000)
-#define DIDmib_dot11phy_dot11AntennasListTable_dot11SupportedTxAntenna \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(8) | \
-                       P80211DID_MKITEM(2) | 0x1c000000)
-#define DIDmib_dot11phy_dot11AntennasListTable_dot11SupportedRxAntenna \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(8) | \
-                       P80211DID_MKITEM(3) | 0x1c000000)
-#define DIDmib_dot11phy_dot11AntennasListTable_dot11DiversitySelectionRx \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(8) | \
-                       P80211DID_MKITEM(4) | 0x1c000000)
-#define DIDmib_dot11phy_dot11SupportedDataRatesTxTable \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(9))
-#define DIDmib_dot11phy_dot11SupportedDataRatesTxTable_dot11SupportedDataRatesTxIndex \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(9) | \
-                       P80211DID_MKITEM(1) | 0x1c000000)
-#define DIDmib_dot11phy_dot11SupportedDataRatesTxTable_dot11SupportedDataRatesTxValue \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(9) | \
-                       P80211DID_MKITEM(2) | 0x14000000)
-#define DIDmib_dot11phy_dot11SupportedDataRatesRxTable \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(10))
-#define DIDmib_dot11phy_dot11SupportedDataRatesRxTable_dot11SupportedDataRatesRxIndex \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(10) | \
-                       P80211DID_MKITEM(1) | 0x1c000000)
-#define DIDmib_dot11phy_dot11SupportedDataRatesRxTable_dot11SupportedDataRatesRxValue \
-                       (P80211DID_MKSECTION(3) | \
-                       P80211DID_MKGROUP(10) | \
-                       P80211DID_MKITEM(2) | 0x14000000)
 #define DIDmib_cat_lnx \
                        P80211DID_MKSECTION(4)
 #define DIDmib_lnx_lnxConfigTable \
@@ -1440,13 +1174,6 @@
                        (P80211DID_MKSECTION(5) | \
                        P80211DID_MKGROUP(3) | \
                        P80211DID_MKITEM(26) | 0x18000000)
-#define DIDmib_p2_p2Behavior \
-                       (P80211DID_MKSECTION(5) | \
-                       P80211DID_MKGROUP(4))
-#define DIDmib_p2_p2Behavior_p2TickTime \
-                       (P80211DID_MKSECTION(5) | \
-                       P80211DID_MKGROUP(4) | \
-                       P80211DID_MKITEM(1) | 0x18000000)
 #define DIDmib_p2_p2NIC \
                        (P80211DID_MKSECTION(5) | \
                        P80211DID_MKGROUP(5))

diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c
index 32adf3f177470a2a44b6274005f1da215b49b6e2..9cf05ce1f071d3fcbfdbd7bd2ff7817d56a4ed97 100644 (file)
--- a/drivers/staging/wlan-ng/p80211wext.c
+++ b/drivers/staging/wlan-ng/p80211wext.c
@@ -1181,20 +1181,11 @@ static int p80211wext_siwtxpow(netdevice_t *dev,
         }
 
         msg.msgcode = DIDmsg_dot11req_mibset;
-
-        switch (rrq->value) {
-
-          case 1 : mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel1; break;
-          case 2 : mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel2; break;
-          case 3 : mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel3; break;
-          case 4 : mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel4; break;
-          case 5 : mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel5; break;
-          case 6 : mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel6; break;
-          case 7 : mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel7; break;
-          case 8 : mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel8; break;
-          default: mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel8; break;
-       }
-
+       mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;
+       if (rrq->fixed == 0)
+         mibitem.data = 30;
+       else
+         mibitem.data = rrq->value;
         memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
         result = p80211req_dorequest(wlandev, (u8*)&msg);
 

diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
index 9cd5c74c778c931ea00fe92a2f9327583cdc5399..c15c2e48633cbd1eb3181b94fd98e5e9caf709ce 100644 (file)
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -627,13 +627,6 @@ static mibrec_t mibtab[] = {
           HFA384x_RID_PROMISCMODE, 0, 0,
           prism2mib_truth },
 
-    /* p2Behavior MIB's */
-
-    { DIDmib_p2_p2Behavior_p2TickTime,
-          F_STA | F_READ | F_WRITE,
-          HFA384x_RID_ITICKTIME, 0, 0,
-          prism2mib_uint32 },
-
     /* p2NIC MIB's */
 
     { DIDmib_p2_p2NIC_p2MaxLoadTime,
@@ -850,94 +843,6 @@ static mibrec_t mibtab[] = {
           prism2mib_priv },
     { 0, 0, 0, 0, 0, NULL}};
 
-/*----------------------------------------------------------------
-These MIB's are not supported at this time:
-
-DIDmib_dot11phy_dot11PhyOperationTable_dot11ChannelAgilityPresent
-DIDmib_dot11phy_dot11PhyOperationTable_dot11ChannelAgilityEnabled
-DIDmib_dot11phy_dot11PhyDSSSTable_dot11PBCCOptionImplemented
-DIDmib_dot11phy_dot11RegDomainsSupportedTable_dot11RegDomainsSupportIndex
-DIDmib_dot11phy_dot11SupportedDataRatesTxTable_dot11SupportedDataRatesTxIndex
-DIDmib_dot11phy_dot11SupportedDataRatesTxTable_dot11SupportedDataRatesTxValue
-DIDmib_dot11phy_dot11SupportedDataRatesRxTable_dot11SupportedDataRatesRxIndex
-DIDmib_dot11phy_dot11SupportedDataRatesRxTable_dot11SupportedDataRatesRxValue
-
-DIDmib_dot11phy_dot11RegDomainsSupportedTable_dot11RegDomainsSupportValue
-TODO: need to investigate why wlan has this as enumerated and Prism2 has this
-      as btye str.
-
-DIDmib_dot11phy_dot11PhyDSSSTable_dot11ShortPreambleOptionImplemented
-TODO: Find out the firmware version number(s) for identifying
-      whether the firmware is capable of short preamble. TRUE or FALSE
-      will be returned based on the version of the firmware.
-
-WEP Key mappings aren't supported in the f/w.
-DIDmib_dot11smt_dot11WEPKeyMappingsTable_dot11WEPKeyMappingIndex
-DIDmib_dot11smt_dot11WEPKeyMappingsTable_dot11WEPKeyMappingAddress
-DIDmib_dot11smt_dot11WEPKeyMappingsTable_dot11WEPKeyMappingWEPOn
-DIDmib_dot11smt_dot11WEPKeyMappingsTable_dot11WEPKeyMappingValue
-DIDmib_dot11smt_dot11PrivacyTable_dot11WEPKeyMappingLength
-
-TODO: implement counters.
-DIDmib_dot11smt_dot11PrivacyTable_dot11WEPICVErrorCount
-DIDmib_dot11smt_dot11PrivacyTable_dot11WEPExcludedCount
-DIDmib_dot11mac_dot11CountersTable_dot11TransmittedFragmentCount
-DIDmib_dot11mac_dot11CountersTable_dot11MulticastTransmittedFrameCount
-DIDmib_dot11mac_dot11CountersTable_dot11FailedCount
-DIDmib_dot11mac_dot11CountersTable_dot11RetryCount
-DIDmib_dot11mac_dot11CountersTable_dot11MultipleRetryCount
-DIDmib_dot11mac_dot11CountersTable_dot11FrameDuplicateCount
-DIDmib_dot11mac_dot11CountersTable_dot11RTSSuccessCount
-DIDmib_dot11mac_dot11CountersTable_dot11RTSFailureCount
-DIDmib_dot11mac_dot11CountersTable_dot11ACKFailureCount
-DIDmib_dot11mac_dot11CountersTable_dot11ReceivedFragmentCount
-DIDmib_dot11mac_dot11CountersTable_dot11MulticastReceivedFrameCount
-DIDmib_dot11mac_dot11CountersTable_dot11FCSErrorCount
-DIDmib_dot11mac_dot11CountersTable_dot11TransmittedFrameCount
-DIDmib_dot11mac_dot11CountersTable_dot11WEPUndecryptableCount
-
-TODO: implement sane values for these.
-DIDmib_dot11mac_dot11OperationTable_dot11ManufacturerID
-DIDmib_dot11mac_dot11OperationTable_dot11ProductID
-
-Not too worried about these at the moment.
-DIDmib_dot11phy_dot11PhyAntennaTable_dot11CurrentTxAntenna
-DIDmib_dot11phy_dot11PhyAntennaTable_dot11DiversitySupport
-DIDmib_dot11phy_dot11PhyAntennaTable_dot11CurrentRxAntenna
-DIDmib_dot11phy_dot11PhyTxPowerTable_dot11NumberSupportedPowerLevels
-DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel1
-DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel2
-DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel3
-DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel4
-DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel5
-DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel6
-DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel7
-DIDmib_dot11phy_dot11PhyTxPowerTable_dot11TxPowerLevel8
-DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel
-
-Ummm, FH and IR don't apply
-DIDmib_dot11phy_dot11PhyFHSSTable_dot11HopTime
-DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentChannelNumber
-DIDmib_dot11phy_dot11PhyFHSSTable_dot11MaxDwellTime
-DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentDwellTime
-DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentSet
-DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentPattern
-DIDmib_dot11phy_dot11PhyFHSSTable_dot11CurrentIndex
-DIDmib_dot11phy_dot11PhyDSSSTable_dot11CCAModeSupported
-DIDmib_dot11phy_dot11PhyDSSSTable_dot11EDThreshold
-DIDmib_dot11phy_dot11PhyIRTable_dot11CCAWatchdogTimerMax
-DIDmib_dot11phy_dot11PhyIRTable_dot11CCAWatchdogCountMax
-DIDmib_dot11phy_dot11PhyIRTable_dot11CCAWatchdogTimerMin
-DIDmib_dot11phy_dot11PhyIRTable_dot11CCAWatchdogCountMin
-
-We just don't have enough antennas right now to worry about this.
-DIDmib_dot11phy_dot11AntennasListTable_dot11AntennaListIndex
-DIDmib_dot11phy_dot11AntennasListTable_dot11SupportedTxAntenna
-DIDmib_dot11phy_dot11AntennasListTable_dot11SupportedRxAntenna
-DIDmib_dot11phy_dot11AntennasListTable_dot11DiversitySelectionRx
-
-------------------------------------------------------------------*/
-
 /*================================================================*/
 /* Function Definitions */
 
@@ -2543,108 +2448,3 @@ void prism2mgmt_set_oprateset(u16 *rate, p80211pstrd_t *pstr)
        DBFEXIT;
        return;
 }
-
-
-
-/*----------------------------------------------------------------
-* prism2mgmt_get_grpaddr
-*
-* Retrieves a particular group address from the list of
-* group addresses.
-*
-* Arguments:
-*      did             mibitem did
-*      pstr            wlan octet string
-*      priv            prism2 driver private data structure
-*
-* Returns:
-*      Nothing
-*
-----------------------------------------------------------------*/
-void prism2mgmt_get_grpaddr(u32 did, p80211pstrd_t *pstr,
-       hfa384x_t *hw )
-{
-       int     index;
-
-       DBFENTER;
-
-       index = prism2mgmt_get_grpaddr_index(did);
-
-       if ( index >= 0 ) {
-               pstr->len = WLAN_ADDR_LEN;
-               memcpy(pstr->data, hw->dot11_grp_addr[index],
-                       WLAN_ADDR_LEN);
-       }
-
-       DBFEXIT;
-       return;
-}
-
-
-
-/*----------------------------------------------------------------
-* prism2mgmt_set_grpaddr
-*
-* Convert the wlan octet string into an hfa384x bit area.
-*
-* Arguments:
-*      did             mibitem did
-*      buf
-*      groups
-*
-* Returns:
-*      0       Success
-*      !0      Error
-*
-----------------------------------------------------------------*/
-int prism2mgmt_set_grpaddr(u32 did, u8 *prism2buf,
-       p80211pstrd_t *pstr, hfa384x_t *hw )
-{
-       u8      no_addr[WLAN_ADDR_LEN];
-       int     index;
-
-       DBFENTER;
-
-       memset(no_addr, 0, WLAN_ADDR_LEN);
-       if (memcmp(no_addr, pstr->data, WLAN_ADDR_LEN) != 0) {
-
-               /*
-               ** The address is NOT 0 so we are "adding" an address to the
-               ** group address list.  Check to make sure we aren't trying
-               ** to add more than the maximum allowed number of group
-               ** addresses in the list.  The new address is added to the
-               ** end of the list regardless of the DID used to add the
-               ** address.
-               */
-
-               if (hw->dot11_grpcnt >= MAX_GRP_ADDR) return(-1);
-
-               memcpy(hw->dot11_grp_addr[hw->dot11_grpcnt], pstr->data,
-                                                                WLAN_ADDR_LEN);
-               hw->dot11_grpcnt += 1;
-       } else {
-
-               /*
-               ** The address is 0.  Interpret this as "deleting" an address
-               ** from the group address list.  Get the address index from
-               ** the DID.  If this is within the range of used addresses,
-               ** then delete the specified address by shifting all following
-               ** addresses down.  Then clear the last address (which should
-               ** now be unused).  If the address index is NOT within the
-               ** range of used addresses, then just ignore the address.
-               */
-
-               index = prism2mgmt_get_grpaddr_index(did);
-               if (index >= 0 && index < hw->dot11_grpcnt) {
-                       hw->dot11_grpcnt -= 1;
-                       memmove(hw->dot11_grp_addr[index],
-                               hw->dot11_grp_addr[index + 1],
-                               ((hw->dot11_grpcnt)-index) * WLAN_ADDR_LEN);
-                       memset(hw->dot11_grp_addr[hw->dot11_grpcnt], 0,
-                                                                WLAN_ADDR_LEN);
-               }
-       }
-
-       DBFEXIT;
-       return(0);
-}