staging: vt6655: Replace typedef enum _CARD_OP_MODE eOPMode with enum nl80211_iftype...

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>

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index c4ed8d55fc29036260972a9aaad8a54d80270390..5a6950264bdc21cf2df9957d3e821422d435996e 100644 (file)
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -698,7 +698,7 @@ bool CARDbStartTxPacket(struct vnt_private *pDevice, CARD_PKT_TYPE ePktType)
 
        if ((pDevice->bStopBeacon == false) &&
            (pDevice->bBeaconBufReady == true) &&
-           (pDevice->eOPMode == OP_MODE_ADHOC)) {
+           (pDevice->op_mode == NL80211_IFTYPE_ADHOC)) {
                MACvRegBitsOn(pDevice->PortOffset, MAC_REG_TCR, TCR_AUTOBCNTX);
        }
 
@@ -720,22 +720,22 @@ bool CARDbStartTxPacket(struct vnt_private *pDevice, CARD_PKT_TYPE ePktType)
  *
  */
 bool CARDbSetBSSID(struct vnt_private *pDevice,
-                  unsigned char *pbyBSSID, CARD_OP_MODE eOPMode)
+                  unsigned char *pbyBSSID, enum nl80211_iftype op_mode)
 {
 
        MACvWriteBSSIDAddress(pDevice->PortOffset, pbyBSSID);
        memcpy(pDevice->abyBSSID, pbyBSSID, WLAN_BSSID_LEN);
-       if (eOPMode == OP_MODE_ADHOC)
+       if (op_mode == NL80211_IFTYPE_ADHOC)
                MACvRegBitsOn(pDevice->PortOffset, MAC_REG_HOSTCR, HOSTCR_ADHOC);
        else
                MACvRegBitsOff(pDevice->PortOffset, MAC_REG_HOSTCR, HOSTCR_ADHOC);
 
-       if (eOPMode == OP_MODE_AP)
+       if (op_mode == NL80211_IFTYPE_AP)
                MACvRegBitsOn(pDevice->PortOffset, MAC_REG_HOSTCR, HOSTCR_AP);
        else
                MACvRegBitsOff(pDevice->PortOffset, MAC_REG_HOSTCR, HOSTCR_AP);
 
-       if (eOPMode == OP_MODE_UNKNOWN) {
+       if (op_mode == NL80211_IFTYPE_UNSPECIFIED) {
                MACvRegBitsOff(pDevice->PortOffset, MAC_REG_RCR, RCR_BSSID);
                pDevice->bBSSIDFilter = false;
                pDevice->byRxMode &= ~RCR_BSSID;
@@ -749,7 +749,7 @@ bool CARDbSetBSSID(struct vnt_private *pDevice,
                pr_debug("wmgr: rx_mode = %x\n", pDevice->byRxMode);
        }
        // Adopt BSS state in Adapter Device Object
-       pDevice->eOPMode = eOPMode;
+       pDevice->op_mode = op_mode;
        return true;
 }
 

diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h
index f7fd83404f34d4ca3ca983948f595ec907024f6d..96f5b6c46e82ed06f5924e9b70b8a59c0708bf45 100644 (file)
--- a/drivers/staging/vt6655/card.h
+++ b/drivers/staging/vt6655/card.h
@@ -31,6 +31,7 @@
 
 #include "ttype.h"
 #include <linux/types.h>
+#include <linux/nl80211.h>
 
 //
 // Loopback mode
@@ -70,13 +71,6 @@ typedef enum _CARD_STATUS_TYPE {
        CARD_STATUS_PMKID
 } CARD_STATUS_TYPE, *PCARD_STATUS_TYPE;
 
-typedef enum _CARD_OP_MODE {
-       OP_MODE_INFRASTRUCTURE,
-       OP_MODE_ADHOC,
-       OP_MODE_AP,
-       OP_MODE_UNKNOWN
-} CARD_OP_MODE, *PCARD_OP_MODE;
-
 struct vnt_private;
 
 void CARDvSetRSPINF(struct vnt_private *, CARD_PHY_TYPE ePHYType);
@@ -108,7 +102,7 @@ bool CARDbStopTxPacket(struct vnt_private *, CARD_PKT_TYPE ePktType);
 bool CARDbStartTxPacket(struct vnt_private *, CARD_PKT_TYPE ePktType);
 bool CARDbSetBeaconPeriod(struct vnt_private *, unsigned short wBeaconInterval);
 bool CARDbSetBSSID(struct vnt_private *,
-                  unsigned char *pbyBSSID, CARD_OP_MODE eOPMode);
+                  unsigned char *pbyBSSID, enum nl80211_iftype);
 
 bool CARDbPowerDown(struct vnt_private *);
 

diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 15303d904ec15fd27484ec20d409698baeab4e9f..7db0404f6f2bc028c71c672d815b2f57825f7fce 100644 (file)
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -470,7 +470,7 @@ struct vnt_private {
        unsigned short wFragmentationThreshold;
        unsigned char byShortRetryLimit;
        unsigned char byLongRetryLimit;
-       CARD_OP_MODE                eOPMode;
+       enum nl80211_iftype op_mode;
        unsigned char byOpMode;
        bool bBSSIDFilter;
        unsigned short wMaxTransmitMSDULifetime;

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 047370274c00a96cb6d6232736b83164338bedba..f33795faa09ba7b6c6f4b67ea833a252c2ce6edb 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -2341,7 +2341,7 @@ static  irqreturn_t  device_intr(int irq,  void *dev_instance)
                                }
                        }
                        if (pDevice->bChannelSwitch &&
-                           (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE)) {
+                           (pDevice->op_mode == NL80211_IFTYPE_STATION)) {
                                pDevice->byChannelSwitchCount--;
                                if (pDevice->byChannelSwitchCount == 0) {
                                        pDevice->bChannelSwitch = false;
@@ -2354,7 +2354,7 @@ static  irqreturn_t  device_intr(int irq,  void *dev_instance)
 
                                }
                        }
-                       if (pDevice->eOPMode != OP_MODE_ADHOC) {
+                       if (pDevice->op_mode != NL80211_IFTYPE_ADHOC) {
                                if ((pDevice->bUpdateBBVGA) && pDevice->bLinkPass && (pDevice->uCurrRSSI != 0)) {
                                        long            ldBm;
 
@@ -2394,8 +2394,8 @@ static  irqreturn_t  device_intr(int irq,  void *dev_instance)
                        if (pDevice->bEnablePSMode)
                                PSbIsNextTBTTWakeUp((void *)pDevice);
 
-                       if ((pDevice->eOPMode == OP_MODE_AP) ||
-                           (pDevice->eOPMode == OP_MODE_ADHOC)) {
+                       if ((pDevice->op_mode == NL80211_IFTYPE_AP) ||
+                           (pDevice->op_mode == NL80211_IFTYPE_ADHOC)) {
                                MACvOneShotTimer1MicroSec(pDevice->PortOffset,
                                                          (pMgmt->wIBSSBeaconPeriod - MAKE_BEACON_RESERVED) << 10);
                        }
@@ -2405,12 +2405,12 @@ static  irqreturn_t  device_intr(int irq,  void *dev_instance)
                }
 
                if (pDevice->dwIsr & ISR_BNTX) {
-                       if (pDevice->eOPMode == OP_MODE_ADHOC) {
+                       if (pDevice->op_mode == NL80211_IFTYPE_ADHOC) {
                                pDevice->bIsBeaconBufReadySet = false;
                                pDevice->cbBeaconBufReadySetCnt = 0;
                        }
 
-                       if (pDevice->eOPMode == OP_MODE_AP) {
+                       if (pDevice->op_mode == NL80211_IFTYPE_AP) {
                                if (pMgmt->byDTIMCount > 0) {
                                        pMgmt->byDTIMCount--;
                                        pMgmt->sNodeDBTable[0].bRxPSPoll = false;
@@ -2453,7 +2453,7 @@ static  irqreturn_t  device_intr(int irq,  void *dev_instance)
                        max_count += device_tx_srv(pDevice, TYPE_AC0DMA);
 
                if (pDevice->dwIsr & ISR_SOFTTIMER1) {
-                       if (pDevice->eOPMode == OP_MODE_AP) {
+                       if (pDevice->op_mode == NL80211_IFTYPE_AP) {
                                if (pDevice->bShortSlotTime)
                                        pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_SHORTSLOTTIME(1);
                                else

diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c
index 60eb1297ed83a3ef05bb0ee8fd06e1d9282bac75..6fb6cdfbf5bce03ae3cae05f7d9e6d01fa69c3cd 100644 (file)
--- a/drivers/staging/vt6655/dpc.c
+++ b/drivers/staging/vt6655/dpc.c
@@ -603,7 +603,7 @@ device_receive_frame(
 
        // Now it only supports 802.11g Infrastructure Mode, and support rate must up to 54 Mbps
        if (pDevice->bDiversityEnable && (FrameSize > 50) &&
-           (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) &&
+           (pDevice->op_mode == NL80211_IFTYPE_STATION) &&
            pDevice->bLinkPass) {
                BBvAntennaDiversity(pDevice, s_byGetRateIdx(*pbyRxRate), 0);
        }

diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwctl.c
index 6a6bdd31cfd798122b94460891fa32866f5bfc6b..14a62bdae278476d29e7a3ff461dc278d0180dd9 100644 (file)
--- a/drivers/staging/vt6655/iwctl.c
+++ b/drivers/staging/vt6655/iwctl.c
@@ -76,7 +76,7 @@ struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev)
        struct vnt_private *pDevice = netdev_priv(dev);
        long ldBm;
 
-       pDevice->wstats.status = pDevice->eOPMode;
+       pDevice->wstats.status = pDevice->op_mode;
 #ifdef Calcu_LinkQual
        if (pDevice->scStatistic.LinkQuality > 100)
                pDevice->scStatistic.LinkQuality = 100;

diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c
index 93681b338c1b403f0c82a22fb68a010a359945c5..08241b91777770a65d3c467c38e78dc0b7e34972 100644 (file)
--- a/drivers/staging/vt6655/power.c
+++ b/drivers/staging/vt6655/power.c
@@ -78,7 +78,7 @@ PSvEnablePowerSaving(
 
        // set period of power up before TBTT
        VNSvOutPortW(pDevice->PortOffset + MAC_REG_PWBT, C_PWBT);
-       if (pDevice->eOPMode != OP_MODE_ADHOC) {
+       if (pDevice->op_mode != NL80211_IFTYPE_ADHOC) {
                // set AID
                VNSvOutPortW(pDevice->PortOffset + MAC_REG_AIDATIM, wAID);
        } else {
@@ -107,7 +107,8 @@ PSvEnablePowerSaving(
        pDevice->bEnablePSMode = true;
 
        /* We don't send null pkt in ad hoc mode since beacon will handle this. */
-       if (pDevice->eOPMode != OP_MODE_ADHOC && pDevice->eOPMode == OP_MODE_INFRASTRUCTURE)
+       if (pDevice->op_mode != NL80211_IFTYPE_ADHOC &&
+           pDevice->op_mode == NL80211_IFTYPE_STATION)
                PSbSendNullPacket(pDevice);
 
        pDevice->bPWBitOn = true;
@@ -142,7 +143,7 @@ PSvDisablePowerSaving(
 
        pDevice->bEnablePSMode = false;
 
-       if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE)
+       if (pDevice->op_mode == NL80211_IFTYPE_STATION)
                PSbSendNullPacket(pDevice);
 
        pDevice->bPWBitOn = false;

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 0c69193a1d5b8182885d2a62d8d0a68627894000..7a183f55e7eb2f12a79b3a55cdd63571b832b77f 100644 (file)
--- 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

diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c
index 7565073122de3d531f6eff7844755c619650369b..985e1b99362ddc45006d0ea346faa90424937b7a 100644 (file)
--- a/drivers/staging/vt6655/wcmd.c
+++ b/drivers/staging/vt6655/wcmd.c
@@ -328,7 +328,7 @@ vCommandTimer(
 
                if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
                        s_bCommandComplete(pDevice);
-                       CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_AP);
+                       CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, NL80211_IFTYPE_AP);
                        spin_unlock_irq(&pDevice->lock);
                        return;
                }
@@ -356,9 +356,9 @@ vCommandTimer(
                        pr_debug("Scanning, set back to channel: [%d]\n",
                                 pMgmt->uCurrChannel);
                        if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA)
-                               CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_ADHOC);
+                               CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, NL80211_IFTYPE_ADHOC);
                        else
-                               CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_INFRASTRUCTURE);
+                               CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, NL80211_IFTYPE_STATION);
 
                        vAdHocBeaconRestart(pDevice);
                        s_bCommandComplete(pDevice);
@@ -393,7 +393,7 @@ vCommandTimer(
                                pr_debug("SET SCAN Channel Fail: %d\n",
                                         pMgmt->uScanChannel);
 
-                       CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_UNKNOWN);
+                       CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, NL80211_IFTYPE_UNSPECIFIED);
                        pMgmt->uScanChannel++;
 //2008-8-4 <modify> by chester
                        if (!is_channel_valid(pMgmt->uScanChannel) &&
@@ -427,9 +427,9 @@ vCommandTimer(
                pr_debug("Scanning, set back to channel: [%d]\n",
                         pMgmt->uCurrChannel);
                if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA)
-                       CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_ADHOC);
+                       CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, NL80211_IFTYPE_ADHOC);
                else
-                       CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_INFRASTRUCTURE);
+                       CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, NL80211_IFTYPE_STATION);
 
                pMgmt->eScanState = WMAC_NO_SCANNING;
                vAdHocBeaconRestart(pDevice);

diff --git a/drivers/staging/vt6655/wmgr.c b/drivers/staging/vt6655/wmgr.c
index ba273c75d2621e5cb4a0b89be0d7fc25da102b84..c73c39d7adfdcdba769727f6703e5a91fe1f1a50 100644 (file)
--- a/drivers/staging/vt6655/wmgr.c
+++ b/drivers/staging/vt6655/wmgr.c
@@ -2356,9 +2356,9 @@ vMgrCreateOwnIBSS(
        pMgmt->byERPContext = 0;
 
        if (pMgmt->eConfigMode == WMAC_CONFIG_AP) {
-               CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_AP);
+               CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, NL80211_IFTYPE_AP);
        } else {
-               CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_ADHOC);
+               CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, NL80211_IFTYPE_ADHOC);
        }
 
        CARDbSetPhyParameter(pMgmt->pAdapter,
@@ -2727,13 +2727,13 @@ s_vMgrSynchBSS(
        }
 
        if (WLAN_GET_CAP_INFO_ESS(pCurr->wCapInfo)) {
-               CARDbSetBSSID(pMgmt->pAdapter, pCurr->abyBSSID, OP_MODE_INFRASTRUCTURE);
+               CARDbSetBSSID(pMgmt->pAdapter, pCurr->abyBSSID, NL80211_IFTYPE_STATION);
                // Add current BSS to Candidate list
                // This should only works for WPA2 BSS, and WPA2 BSS check must be done before.
                if (pMgmt->eAuthenMode == WMAC_AUTH_WPA2)
                        CARDbAdd_PMKID_Candidate(pMgmt->pAdapter, pMgmt->abyCurrBSSID, pCurr->sRSNCapObj.bRSNCapExist, pCurr->sRSNCapObj.wRSNCap);
        } else {
-               CARDbSetBSSID(pMgmt->pAdapter, pCurr->abyBSSID, OP_MODE_ADHOC);
+               CARDbSetBSSID(pMgmt->pAdapter, pCurr->abyBSSID, NL80211_IFTYPE_ADHOC);
        }
 
        if (!CARDbSetPhyParameter(pMgmt->pAdapter,