diff options
author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-08-30 22:25:49 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-30 15:19:17 -0700 |
commit | a9873673484b5aa4346111d021c83a2f11d62eb5 (patch) | |
tree | 4fb7c07958a29d7556d55e718ae44e5b8198bb74 /drivers/staging/vt6655/rxtx.c | |
parent | 96372bd9b42e917cb83add7d43bcfbe60307da56 (diff) | |
download | op-kernel-dev-a9873673484b5aa4346111d021c83a2f11d62eb5.zip op-kernel-dev-a9873673484b5aa4346111d021c83a2f11d62eb5.tar.gz |
staging: vt6655: Replace typedef enum _CARD_OP_MODE eOPMode with enum nl80211_iftype op_mode.
Using the nl80211 header.
Using enum changes
OP_MODE_ADHOC -> NL80211_IFTYPE_ADHOC
OP_MODE_AP -> NL80211_IFTYPE_AP
OP_MODE_INFRASTRUCTURE -> NL80211_IFTYPE_STATION
OP_MODE_UNKNOWN -> NL80211_IFTYPE_UNSPECIFIED
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655/rxtx.c')
-rw-r--r-- | drivers/staging/vt6655/rxtx.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 0c69193..7a183f5 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -851,13 +851,13 @@ s_vFillRTSHead( IEEE80211_STYPE_RTS); - if ((pDevice->eOPMode == OP_MODE_ADHOC) || - (pDevice->eOPMode == OP_MODE_AP)) { + if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) || + (pDevice->op_mode == NL80211_IFTYPE_AP)) { memcpy(&buf->data.ra, psEthHeader->abyDstAddr, ETH_ALEN); } else { memcpy(&buf->data.ra, pDevice->abyBSSID, ETH_ALEN); } - if (pDevice->eOPMode == OP_MODE_AP) + if (pDevice->op_mode == NL80211_IFTYPE_AP) memcpy(&buf->data.ta, pDevice->abyBSSID, ETH_ALEN); else memcpy(&buf->data.ta, psEthHeader->abySrcAddr, ETH_ALEN); @@ -915,14 +915,14 @@ s_vFillRTSHead( IEEE80211_STYPE_RTS); - if ((pDevice->eOPMode == OP_MODE_ADHOC) || - (pDevice->eOPMode == OP_MODE_AP)) { + if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) || + (pDevice->op_mode == NL80211_IFTYPE_AP)) { memcpy(&buf->data.ra, psEthHeader->abyDstAddr, ETH_ALEN); } else { memcpy(&buf->data.ra, pDevice->abyBSSID, ETH_ALEN); } - if (pDevice->eOPMode == OP_MODE_AP) + if (pDevice->op_mode == NL80211_IFTYPE_AP) memcpy(&buf->data.ta, pDevice->abyBSSID, ETH_ALEN); else memcpy(&buf->data.ta, psEthHeader->abySrcAddr, ETH_ALEN); @@ -948,14 +948,14 @@ s_vFillRTSHead( IEEE80211_STYPE_RTS); - if ((pDevice->eOPMode == OP_MODE_ADHOC) || - (pDevice->eOPMode == OP_MODE_AP)) { + if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) || + (pDevice->op_mode == NL80211_IFTYPE_AP)) { memcpy(&buf->data.ra, psEthHeader->abyDstAddr, ETH_ALEN); } else { memcpy(&buf->data.ra, pDevice->abyBSSID, ETH_ALEN); } - if (pDevice->eOPMode == OP_MODE_AP) + if (pDevice->op_mode == NL80211_IFTYPE_AP) memcpy(&buf->data.ta, pDevice->abyBSSID, ETH_ALEN); else memcpy(&buf->data.ta, psEthHeader->abySrcAddr, ETH_ALEN); @@ -988,13 +988,13 @@ s_vFillRTSHead( cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_RTS); - if ((pDevice->eOPMode == OP_MODE_ADHOC) || - (pDevice->eOPMode == OP_MODE_AP)) { + if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) || + (pDevice->op_mode == NL80211_IFTYPE_AP)) { memcpy(&buf->data.ra, psEthHeader->abyDstAddr, ETH_ALEN); } else { memcpy(&buf->data.ra, pDevice->abyBSSID, ETH_ALEN); } - if (pDevice->eOPMode == OP_MODE_AP) + if (pDevice->op_mode == NL80211_IFTYPE_AP) memcpy(&buf->data.ta, pDevice->abyBSSID, ETH_ALEN); else memcpy(&buf->data.ta, psEthHeader->abySrcAddr, ETH_ALEN); @@ -1016,14 +1016,14 @@ s_vFillRTSHead( buf->data.frame_control = cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_RTS); - if ((pDevice->eOPMode == OP_MODE_ADHOC) || - (pDevice->eOPMode == OP_MODE_AP)) { + if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) || + (pDevice->op_mode == NL80211_IFTYPE_AP)) { memcpy(&buf->data.ra, psEthHeader->abyDstAddr, ETH_ALEN); } else { memcpy(&buf->data.ra, pDevice->abyBSSID, ETH_ALEN); } - if (pDevice->eOPMode == OP_MODE_AP) + if (pDevice->op_mode == NL80211_IFTYPE_AP) memcpy(&buf->data.ta, pDevice->abyBSSID, ETH_ALEN); else memcpy(&buf->data.ta, psEthHeader->abySrcAddr, ETH_ALEN); @@ -1335,8 +1335,8 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType, pvRrvTime = pMICHDR = pvRTS = pvCTS = pvTxDataHd = NULL; - if ((pDevice->eOPMode == OP_MODE_ADHOC) || - (pDevice->eOPMode == OP_MODE_AP)) { + if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) || + (pDevice->op_mode == NL80211_IFTYPE_AP)) { if (is_multicast_ether_addr(&(psEthHeader->abyDstAddr[0]))) bNeedACK = false; else @@ -1976,8 +1976,8 @@ vGenerateFIFOHeader(struct vnt_private *pDevice, unsigned char byPktType, memset(pTxBufHead, 0, wTxBufSize); //Set FIFOCTL_NEEDACK - if ((pDevice->eOPMode == OP_MODE_ADHOC) || - (pDevice->eOPMode == OP_MODE_AP)) { + if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) || + (pDevice->op_mode == NL80211_IFTYPE_AP)) { if (is_multicast_ether_addr(&(psEthHeader->abyDstAddr[0]))) { bNeedACK = false; pTxBufHead->wFIFOCtl = pTxBufHead->wFIFOCtl & (~FIFOCTL_NEEDACK); @@ -2104,13 +2104,13 @@ vGenerateMACHeader( else pMACHeader->wFrameCtl = TYPE_802_11_DATA; - if (pDevice->eOPMode == OP_MODE_AP) { + if (pDevice->op_mode == NL80211_IFTYPE_AP) { memcpy(&(pMACHeader->abyAddr1[0]), &(psEthHeader->abyDstAddr[0]), ETH_ALEN); memcpy(&(pMACHeader->abyAddr2[0]), &(pDevice->abyBSSID[0]), ETH_ALEN); memcpy(&(pMACHeader->abyAddr3[0]), &(psEthHeader->abySrcAddr[0]), ETH_ALEN); pMACHeader->wFrameCtl |= FC_FROMDS; } else { - if (pDevice->eOPMode == OP_MODE_ADHOC) { + if (pDevice->op_mode == NL80211_IFTYPE_ADHOC) { memcpy(&(pMACHeader->abyAddr1[0]), &(psEthHeader->abyDstAddr[0]), ETH_ALEN); memcpy(&(pMACHeader->abyAddr2[0]), &(psEthHeader->abySrcAddr[0]), ETH_ALEN); memcpy(&(pMACHeader->abyAddr3[0]), &(pDevice->abyBSSID[0]), ETH_ALEN); @@ -2349,7 +2349,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, PSTxMgmtPacket pPacket) // S/W or H/W Encryption //--------------------------- do { - if ((pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) && + if ((pDevice->op_mode == NL80211_IFTYPE_STATION) && (pDevice->bLinkPass == true)) { pbyBSSID = pDevice->abyBSSID; // get pairwise key @@ -2369,7 +2369,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, PSTxMgmtPacket pPacket) if (KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == false) { pTransmitKey = NULL; pr_debug("KEY is NULL. OP Mode[%d]\n", - pDevice->eOPMode); + pDevice->op_mode); } else { pr_debug("Get GTK\n"); } @@ -2531,8 +2531,8 @@ cbGetFragCount( unsigned int uMACfragNum = 1; bool bNeedACK; - if ((pDevice->eOPMode == OP_MODE_ADHOC) || - (pDevice->eOPMode == OP_MODE_AP)) { + if ((pDevice->op_mode == NL80211_IFTYPE_ADHOC) || + (pDevice->op_mode == NL80211_IFTYPE_AP)) { if (is_multicast_ether_addr(&(psEthHeader->abyDstAddr[0]))) bNeedACK = false; else |