Skip to content

L
linux
Commit 90f96acd authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files
Options

staging: vt6656: Remove hostapd functions. 

Remove throughout driver
bEnableHostapd
bEnable8021x
bEnableHostWEP
struct net_device *apdev
tx_80211
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a30d534b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 1001 deletions
drivers/staging/vt6656/bssdb.c
View file @ 90f96acd
......@@ -771,8 +771,8 @@ void BSSvAddMulticastNode(struct vnt_private *pDevice)
{
struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
if (!pDevice->bEnableHostWEP)
memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB));
memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB));
memset(pMgmt->sNodeDBTable[0].abyMACAddr, 0xff, WLAN_ADDR_LEN);
pMgmt->sNodeDBTable[0].bActive = true;
pMgmt->sNodeDBTable[0].bPSEnable = false;
......
drivers/staging/vt6656/device.h
View file @ 90f96acd
......@@ -707,13 +707,6 @@ struct vnt_private {
int bwextstep3;
int bWPASuppWextEnabled;
/* user space daemon: hostapd, is used for HOSTAP */
int bEnableHostapd;
int bEnable8021x;
int bEnableHostWEP;
struct net_device *apdev;
int (*tx_80211)(struct sk_buff *skb, struct net_device *dev);
u32 uChannel;
struct iw_statistics wstats; /* wireless stats */
......
drivers/staging/vt6656/dpc.c
View file @ 90f96acd
This diff is collapsed.
drivers/staging/vt6656/iocmd.h
View file @ 90f96acd
......@@ -29,57 +29,12 @@
#ifndef __IOCMD_H__
#define __IOCMD_H__
// ioctl Command code
#define MAGIC_CODE 0x3142
#define IOCTL_CMD_TEST (SIOCDEVPRIVATE + 0)
#define IOCTL_CMD_SET (SIOCDEVPRIVATE + 1)
#define IOCTL_CMD_HOSTAPD (SIOCDEVPRIVATE + 2)
#define IOCTL_CMD_WPA (SIOCDEVPRIVATE + 3)
typedef enum tagWMAC_CMD {
WLAN_CMD_BSS_SCAN,
WLAN_CMD_BSS_JOIN,
WLAN_CMD_DISASSOC,
WLAN_CMD_SET_WEP,
WLAN_CMD_GET_LINK,
WLAN_CMD_GET_LISTLEN,
WLAN_CMD_GET_LIST,
WLAN_CMD_GET_MIB,
WLAN_CMD_GET_STAT,
WLAN_CMD_STOP_MAC,
WLAN_CMD_START_MAC,
WLAN_CMD_AP_START,
WLAN_CMD_SET_HOSTAPD,
WLAN_CMD_SET_HOSTAPD_STA,
WLAN_CMD_SET_802_1X,
WLAN_CMD_SET_HOST_WEP,
WLAN_CMD_SET_WPA,
WLAN_CMD_GET_NODE_CNT,
WLAN_CMD_ZONETYPE_SET,
WLAN_CMD_GET_NODE_LIST
} WMAC_CMD, *PWMAC_CMD;
typedef enum tagWZONETYPE {
ZoneType_USA = 0,
ZoneType_Japan = 1,
ZoneType_Europe = 2
} WZONETYPE;
#define ADHOC 0
#define INFRA 1
#define BOTH 2
#define AP 3
#define ADHOC_STARTED 1
#define ADHOC_JOINTED 2
#define PHY80211a 0
#define PHY80211b 1
#define PHY80211g 2
#define SSID_ID 0
#define SSID_MAXLEN 32
#define BSSID_LEN 6
#define WEP_NKEYS 4
......@@ -88,82 +43,6 @@ typedef enum tagWZONETYPE {
#define WEP_104BIT_LEN 13
#define WEP_232BIT_LEN 16
// Ioctl interface structure
// Command structure
//
typedef struct tagSCmdRequest {
u8 name[16];
void *data;
u16 wResult;
u16 wCmdCode;
} __packed SCmdRequest, *PSCmdRequest;
//
// Scan
//
typedef struct tagSCmdScan {
u8 ssid[SSID_MAXLEN + 2];
} __packed SCmdScan, *PSCmdScan;
//
// BSS Join
//
typedef struct tagSCmdBSSJoin {
u16 wBSSType;
u16 wBBPType;
u8 ssid[SSID_MAXLEN + 2];
u32 uChannel;
bool bPSEnable;
bool bShareKeyAuth;
} __packed SCmdBSSJoin, *PSCmdBSSJoin;
//
// Zonetype Setting
//
typedef struct tagSCmdZoneTypeSet {
bool bWrite;
WZONETYPE ZoneType;
} __packed SCmdZoneTypeSet, *PSCmdZoneTypeSet;
typedef struct tagSWPAResult {
char ifname[100];
u8 proto;
u8 key_mgmt;
u8 eap_type;
bool authenticated;
} __packed SWPAResult, *PSWPAResult;
typedef struct tagSCmdStartAP {
u16 wBSSType;
u16 wBBPType;
u8 ssid[SSID_MAXLEN + 2];
u32 uChannel;
u32 uBeaconInt;
bool bShareKeyAuth;
u8 byBasicRate;
} __packed SCmdStartAP, *PSCmdStartAP;
typedef struct tagSCmdSetWEP {
bool bEnableWep;
u8 byKeyIndex;
u8 abyWepKey[WEP_NKEYS][WEP_KEYMAXLEN];
bool bWepKeyAvailable[WEP_NKEYS];
u32 auWepKeyLength[WEP_NKEYS];
} __packed SCmdSetWEP, *PSCmdSetWEP;
typedef struct tagSBSSIDItem {
u32 uChannel;
......@@ -177,12 +56,6 @@ typedef struct tagSBSSIDItem {
} __packed SBSSIDItem;
typedef struct tagSBSSIDList {
u32 uItem;
SBSSIDItem sBSSIDList[0];
} __packed SBSSIDList, *PSBSSIDList;
typedef struct tagSNodeItem {
// STA info
u16 wAID;
......@@ -203,180 +76,6 @@ typedef struct tagSNodeItem {
} __packed SNodeItem;
typedef struct tagSNodeList {
u32 uItem;
SNodeItem sNodeList[0];
} __packed SNodeList, *PSNodeList;
typedef struct tagSCmdLinkStatus {
bool bLink;
u16 wBSSType;
u8 byState;
u8 abyBSSID[BSSID_LEN];
u8 abySSID[SSID_MAXLEN + 2];
u32 uChannel;
u32 uLinkRate;
} __packed SCmdLinkStatus, *PSCmdLinkStatus;
//
// 802.11 counter
//
typedef struct tagSDot11MIBCount {
u32 TransmittedFragmentCount;
u32 MulticastTransmittedFrameCount;
u32 FailedCount;
u32 RetryCount;
u32 MultipleRetryCount;
u32 RTSSuccessCount;
u32 RTSFailureCount;
u32 ACKFailureCount;
u32 FrameDuplicateCount;
u32 ReceivedFragmentCount;
u32 MulticastReceivedFrameCount;
u32 FCSErrorCount;
} __packed SDot11MIBCount, *PSDot11MIBCount;
//
// statistic counter
//
typedef struct tagSStatMIBCount {
//
// ISR status count
//
u32 dwIsrTx0OK;
u32 dwIsrTx1OK;
u32 dwIsrBeaconTxOK;
u32 dwIsrRxOK;
u32 dwIsrTBTTInt;
u32 dwIsrSTIMERInt;
u32 dwIsrUnrecoverableError;
u32 dwIsrSoftInterrupt;
u32 dwIsrRxNoBuf;
/////////////////////////////////////
u32 dwIsrUnknown; /* unknown interrupt count */
// RSR status count
//
u32 dwRsrFrmAlgnErr;
u32 dwRsrErr;
u32 dwRsrCRCErr;
u32 dwRsrCRCOk;
u32 dwRsrBSSIDOk;
u32 dwRsrADDROk;
u32 dwRsrICVOk;
u32 dwNewRsrShortPreamble;
u32 dwRsrLong;
u32 dwRsrRunt;
u32 dwRsrRxControl;
u32 dwRsrRxData;
u32 dwRsrRxManage;
u32 dwRsrRxPacket;
u32 dwRsrRxOctet;
u32 dwRsrBroadcast;
u32 dwRsrMulticast;
u32 dwRsrDirected;
// 64-bit OID
u32 ullRsrOK;
// for some optional OIDs (64 bits) and DMI support
u32 ullRxBroadcastBytes;
u32 ullRxMulticastBytes;
u32 ullRxDirectedBytes;
u32 ullRxBroadcastFrames;
u32 ullRxMulticastFrames;
u32 ullRxDirectedFrames;
u32 dwRsrRxFragment;
u32 dwRsrRxFrmLen64;
u32 dwRsrRxFrmLen65_127;
u32 dwRsrRxFrmLen128_255;
u32 dwRsrRxFrmLen256_511;
u32 dwRsrRxFrmLen512_1023;
u32 dwRsrRxFrmLen1024_1518;
// TSR0,1 status count
//
u32 dwTsrTotalRetry[2]; /* total collision retry count */
u32 dwTsrOnceRetry[2]; /* this packet had one collision */
u32 dwTsrMoreThanOnceRetry[2]; /* this packet had many collisions */
u32 dwTsrRetry[2]; /* this packet has ever occur collision,
* that is (dwTsrOnceCollision0 plus
* dwTsrMoreThanOnceCollision0) */
u32 dwTsrACKData[2];
u32 dwTsrErr[2];
u32 dwAllTsrOK[2];
u32 dwTsrRetryTimeout[2];
u32 dwTsrTransmitTimeout[2];
u32 dwTsrTxPacket[2];
u32 dwTsrTxOctet[2];
u32 dwTsrBroadcast[2];
u32 dwTsrMulticast[2];
u32 dwTsrDirected[2];
// RD/TD count
u32 dwCntRxFrmLength;
u32 dwCntTxBufLength;
u8 abyCntRxPattern[16];
u8 abyCntTxPattern[16];
/* Software check.... */
u32 dwCntRxDataErr; /* rx buffer data CRC err count */
u32 dwCntDecryptErr; /* rx buffer data CRC err count */
u32 dwCntRxICVErr; /* rx buffer data CRC err count */
u32 idxRxErrorDesc; /* index for rx data error RD */
/* 64-bit OID */
u32 ullTsrOK[2];
// for some optional OIDs (64 bits) and DMI support
u32 ullTxBroadcastFrames[2];
u32 ullTxMulticastFrames[2];
u32 ullTxDirectedFrames[2];
u32 ullTxBroadcastBytes[2];
u32 ullTxMulticastBytes[2];
u32 ullTxDirectedBytes[2];
} __packed SStatMIBCount, *PSStatMIBCount;
typedef struct tagSCmdValue {
u32 dwValue;
} __packed SCmdValue, *PSCmdValue;
//
// hostapd & viawget ioctl related
//
// VIAGWET_IOCTL_HOSTAPD ioctl() cmd:
enum {
VIAWGET_HOSTAPD_FLUSH = 1,
VIAWGET_HOSTAPD_ADD_STA = 2,
VIAWGET_HOSTAPD_REMOVE_STA = 3,
VIAWGET_HOSTAPD_GET_INFO_STA = 4,
VIAWGET_HOSTAPD_SET_ENCRYPTION = 5,
VIAWGET_HOSTAPD_GET_ENCRYPTION = 6,
VIAWGET_HOSTAPD_SET_FLAGS_STA = 7,
VIAWGET_HOSTAPD_SET_ASSOC_AP_ADDR = 8,
VIAWGET_HOSTAPD_SET_GENERIC_ELEMENT = 9,
VIAWGET_HOSTAPD_MLME = 10,
VIAWGET_HOSTAPD_SCAN_REQ = 11,
VIAWGET_HOSTAPD_STA_CLEAR_STATS = 12,
};
#define VIAWGET_HOSTAPD_GENERIC_ELEMENT_HDR_LEN \
((int) (&((struct viawget_hostapd_param *) 0)->u.generic_elem.data))
// Maximum length for algorithm names (-1 for nul termination) used in ioctl()
struct viawget_hostapd_param {
u32 cmd;
u8 sta_addr[6];
......
drivers/staging/vt6656/iwctl.c
View file @ 90f96acd
......@@ -382,12 +382,6 @@ int iwctl_siwmode(struct net_device *dev, struct iw_request_info *info,
if (pMgmt == NULL)
return -EFAULT;
if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP && pDevice->bEnableHostapd) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
"Can't set operation mode, hostapd is running\n");
return rc;
}
switch (*wmode) {
case IW_MODE_ADHOC:
if (pMgmt->eConfigMode != WMAC_CONFIG_IBSS_STA) {
......@@ -407,19 +401,9 @@ int iwctl_siwmode(struct net_device *dev, struct iw_request_info *info,
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "set mode to infrastructure\n");
break;
case IW_MODE_MASTER:
pMgmt->eConfigMode = WMAC_CONFIG_ESS_STA;
rc = -EOPNOTSUPP;
break;
if (pMgmt->eConfigMode != WMAC_CONFIG_AP) {
pMgmt->eConfigMode = WMAC_CONFIG_AP;
if (pDevice->flags & DEVICE_FLAGS_OPENED)
pDevice->bCommit = true;
}
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "set mode to Access Point\n");
break;
case IW_MODE_REPEAT:
pMgmt->eConfigMode = WMAC_CONFIG_ESS_STA;
rc = -EOPNOTSUPP;
......
drivers/staging/vt6656/main_usb.c
View file @ 90f96acd
......@@ -216,7 +216,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
static int device_init_registers(struct vnt_private *pDevice);
static bool device_init_defrag_cb(struct vnt_private *pDevice);
static void device_init_diversity_timer(struct vnt_private *pDevice);
static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev);
static int ethtool_ioctl(struct net_device *dev, struct ifreq *);
static void device_free_tx_bufs(struct vnt_private *pDevice);
......@@ -683,7 +682,6 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
INIT_WORK(&pDevice->read_work_item, RXvWorkItem);
INIT_WORK(&pDevice->rx_mng_work_item, RXvMngWorkItem);
pDevice->tx_80211 = device_dma0_tx_80211;
pDevice->vnt_mgmt.pAdapter = (void *) pDevice;
netdev->netdev_ops = &device_netdev_ops;
......@@ -1108,22 +1106,6 @@ static void vt6656_disconnect(struct usb_interface *intf)
}
}
static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev)
{
struct vnt_private *pDevice = netdev_priv(dev);
spin_lock_irq(&pDevice->lock);
if (unlikely(pDevice->bStopTx0Pkt))
dev_kfree_skb_irq(skb);
else
vDMA0_tx_80211(pDevice, skb);
spin_unlock_irq(&pDevice->lock);
return NETDEV_TX_OK;
}
static int device_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct vnt_private *pDevice = netdev_priv(dev);
......
drivers/staging/vt6656/rxtx.c
View file @ 90f96acd
This diff is collapsed.
drivers/staging/vt6656/wcmd.c
View file @ 90f96acd
......@@ -627,10 +627,9 @@ void vRunCommand(struct work_struct *work)
pMgmt->eCurrMode = WMAC_MODE_STANDBY;
pDevice->bLinkPass = false;
ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_SLOW);
if (pDevice->bEnableHostWEP == true)
BSSvClearNodeDBTable(pDevice, 1);
else
BSSvClearNodeDBTable(pDevice, 0);
BSSvClearNodeDBTable(pDevice, 0);
pDevice->uAssocCount = 0;
pMgmt->eCurrState = WMAC_STATE_IDLE;
pDevice->bFixRate = false;
......
drivers/staging/vt6656/wmgr.c
View file @ 90f96acd
......@@ -540,10 +540,6 @@ static void s_vMgrRxAssocRequest(struct vnt_private *pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates
);
if (pTxPacket != NULL ){
if (pDevice->bEnableHostapd) {
return;
}
/* send the frame */
Status = csMgmt_xmit(pDevice, pTxPacket);
if (Status != CMD_STATUS_PENDING) {
......@@ -689,9 +685,6 @@ static void s_vMgrRxReAssocRequest(struct vnt_private *pDevice,
if (pTxPacket != NULL ){
/* send the frame */
if (pDevice->bEnableHostapd) {
return;
}
Status = csMgmt_xmit(pDevice, pTxPacket);
if (Status != CMD_STATUS_PENDING) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:ReAssoc response tx failed\n");
......@@ -1074,9 +1067,6 @@ static void s_vMgrRxAuthenSequence_1(struct vnt_private *pDevice,
pTxPacket->cbMPDULen = sFrame.len;
pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN;
// send the frame
if (pDevice->bEnableHostapd) {
return;
}
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Authreq_reply sequence_1 tx.. \n");
if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Authreq_reply sequence_1 tx failed.\n");
......@@ -1256,9 +1246,6 @@ static void s_vMgrRxAuthenSequence_3(struct vnt_private *pDevice,
pTxPacket->cbMPDULen = sFrame.len;
pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN;
// send the frame
if (pDevice->bEnableHostapd) {
return;
}
if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Authreq_reply sequence_4 tx failed.\n");
}
......@@ -2929,16 +2916,6 @@ static struct vnt_tx_mgmt *s_MgrMakeBeacon(struct vnt_private *pDevice,
((PWLAN_IE_SUPP_RATES)pCurrExtSuppRates)->len + WLAN_IEHDR_LEN
);
}
// hostapd wpa/wpa2 IE
if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) && (pDevice->bEnableHostapd == true)) {
if (pMgmt->eAuthenMode == WMAC_AUTH_WPANONE) {
if (pMgmt->wWPAIELen != 0) {
sFrame.pRSN = (PWLAN_IE_RSN)(sFrame.pBuf + sFrame.len);
memcpy(sFrame.pRSN, pMgmt->abyWPAIE, pMgmt->wWPAIELen);
sFrame.len += pMgmt->wWPAIELen;
}
}
}
/* Adjust the length fields */
pTxPacket->cbMPDULen = sFrame.len;
......@@ -3049,17 +3026,6 @@ static struct vnt_tx_mgmt *s_MgrMakeProbeResponse(struct vnt_private *pDevice,
);
}
// hostapd wpa/wpa2 IE
if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) && (pDevice->bEnableHostapd == true)) {
if (pMgmt->eAuthenMode == WMAC_AUTH_WPANONE) {
if (pMgmt->wWPAIELen != 0) {
sFrame.pRSN = (PWLAN_IE_RSN)(sFrame.pBuf + sFrame.len);
memcpy(sFrame.pRSN, pMgmt->abyWPAIE, pMgmt->wWPAIELen);
sFrame.len += pMgmt->wWPAIELen;
}
}
}
// Adjust the length fields
pTxPacket->cbMPDULen = sFrame.len;
pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN;
......@@ -4058,12 +4024,11 @@ int bMgrPrepareBeaconToSend(struct vnt_private *pDevice,
unsigned long flags;
// pDevice->bBeaconBufReady = false;
if (pDevice->bEncryptionEnable || pDevice->bEnable8021x){
pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_PRIVACY(1);
}
else {
pMgmt->wCurrCapInfo &= ~WLAN_SET_CAP_INFO_PRIVACY(1);
}
if (pDevice->bEncryptionEnable)
pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_PRIVACY(1);
else
pMgmt->wCurrCapInfo &= ~WLAN_SET_CAP_INFO_PRIVACY(1);
pTxPacket = s_MgrMakeBeacon
(
pDevice,
......
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