Skip to content

L
linux
Commit 1e720183 authored by Solomon Peachy's avatar Solomon Peachy Committed by Greg Kroah-Hartman
Browse files
Options

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

Signed-off-by: default avatarSolomon Peachy <pizza@shaftnet.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cbec30c4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 491 deletions
drivers/staging/wlan-ng/p80211metadef.h
View file @ 1e720183
This diff is collapsed.
drivers/staging/wlan-ng/p80211wext.c
View file @ 1e720183
......@@ -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);
......
drivers/staging/wlan-ng/prism2mib.c
View file @ 1e720183
......@@ -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);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7