diff options
author | Malcolm Priestley | 2014-08-30 23:25:49 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2014-08-31 00:19:17 +0200 |
commit | a9873673484b5aa4346111d021c83a2f11d62eb5 (patch) | |
tree | 4fb7c07958a29d7556d55e718ae44e5b8198bb74 /drivers/staging/vt6655/card.c | |
parent | staging: vt6655: s_uGetRTSCTSDuration always return __le16 (diff) | |
download | kernel-qcow2-linux-a9873673484b5aa4346111d021c83a2f11d62eb5.tar.gz kernel-qcow2-linux-a9873673484b5aa4346111d021c83a2f11d62eb5.tar.xz kernel-qcow2-linux-a9873673484b5aa4346111d021c83a2f11d62eb5.zip |
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/card.c')
-rw-r--r-- | drivers/staging/vt6655/card.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index c4ed8d55fc29..5a6950264bdc 100644 --- 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; } |