From 805c1bc2b9fdf85073a82b425c961a41a33693d8 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 20 Oct 2018 18:15:44 -0600 Subject: [PATCH] Cosmetic changes for coding standard fixes. --- arch/arm/src/lpc43xx/lpc43_sdmmc.c | 2 +- arch/arm/src/lpc54xx/lpc54_sdmmc.c | 2 +- drivers/wireless/ieee80211/bcmf_ioctl.h | 422 +++++++++++++----------- drivers/wireless/ieee80211/bcmf_sdio.c | 2 +- 4 files changed, 237 insertions(+), 191 deletions(-) diff --git a/arch/arm/src/lpc43xx/lpc43_sdmmc.c b/arch/arm/src/lpc43xx/lpc43_sdmmc.c index 6425bf87b06..daab422009d 100644 --- a/arch/arm/src/lpc43xx/lpc43_sdmmc.c +++ b/arch/arm/src/lpc43xx/lpc43_sdmmc.c @@ -2501,7 +2501,7 @@ static int lpc43_dmarecvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, /* Another descriptor is needed */ g_sdmmc_dmadd[i].des0 = ctrl; - g_sdmmc_dmadd[i].des3 = (uint32_t) &g_sdmmc_dmadd[i + 1]; + g_sdmmc_dmadd[i].des3 = (uint32_t)&g_sdmmc_dmadd[i + 1]; i++; } diff --git a/arch/arm/src/lpc54xx/lpc54_sdmmc.c b/arch/arm/src/lpc54xx/lpc54_sdmmc.c index 8a5a5b9f479..d9dffcd1342 100644 --- a/arch/arm/src/lpc54xx/lpc54_sdmmc.c +++ b/arch/arm/src/lpc54xx/lpc54_sdmmc.c @@ -2501,7 +2501,7 @@ static int lpc54_dmarecvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, /* Another descriptor is needed */ g_sdmmc_dmadd[i].des0 = ctrl; - g_sdmmc_dmadd[i].des3 = (uint32_t) &g_sdmmc_dmadd[i + 1]; + g_sdmmc_dmadd[i].des3 = (uint32_t)&g_sdmmc_dmadd[i + 1]; i++; } diff --git a/drivers/wireless/ieee80211/bcmf_ioctl.h b/drivers/wireless/ieee80211/bcmf_ioctl.h index f306ec137f5..b43b0dbd8ae 100644 --- a/drivers/wireless/ieee80211/bcmf_ioctl.h +++ b/drivers/wireless/ieee80211/bcmf_ioctl.h @@ -33,10 +33,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ -/* - * Custom OID/ioctl definitions for + +/* Custom OID/ioctl definitions for * Broadcom 802.11abg Networking Device Driver */ + #ifndef __DRIVERS_WIRELESS_IEEE80211_BCMF_IOCTL_H #define __DRIVERS_WIRELESS_IEEE80211_BCMF_IOCTL_H @@ -1404,6 +1405,7 @@ typedef struct uint16_t length; /* length of entire structure */ /* transmit stat counters */ + uint32_t txframe; /* tx data frames */ uint32_t txbyte; /* tx data bytes */ uint32_t txretrans; /* tx mac retransmits */ @@ -1418,11 +1420,13 @@ typedef struct uint32_t txcmiss; /* tx header cache miss (slowpath) */ /* transmit chip error counters */ + uint32_t txuflo; /* tx fifo underflows */ uint32_t txphyerr; /* tx phy errors (indicated in tx status) */ uint32_t txphycrs; /* PR8861/8963 counter */ /* receive stat counters */ + uint32_t rxframe; /* rx data frames */ uint32_t rxbyte; /* rx data bytes */ uint32_t rxerror; /* rx data errors (derived: sum of others) */ @@ -1441,6 +1445,7 @@ typedef struct uint32_t rxfilter; /* rx frames filtered out */ /* receive chip error counters */ + uint32_t rxoflo; /* rx fifo overflow errors */ uint32_t rxuflo[NFIFO]; /* rx dma descriptor underflow errors */ @@ -1449,6 +1454,7 @@ typedef struct uint32_t d11cnt_txnocts_off; /* d11cnt txnocts value when reset d11cnt */ /* misc counters */ + uint32_t dmade; /* tx/rx dma descriptor errors */ uint32_t dmada; /* tx/rx dma data errors */ uint32_t dmape; /* tx/rx dma descriptor protocol errors */ @@ -1458,6 +1464,7 @@ typedef struct uint32_t pkt_callback_reg_fail; /* callbacks register failure */ /* MAC counters: 32-bit version of d11.h's macstat_t */ + uint32_t txallfrm; /* total number of frames sent, incl. Data, ACK, RTS, CTS, * Control Management (includes retransmissions) */ @@ -1535,6 +1542,7 @@ typedef struct uint32_t txburst; /* obsolete */ /* 802.11 MIB counters, pp. 614 of 802.11 reaff doc. */ + uint32_t txfrag; /* dot11TransmittedFragmentCount */ uint32_t txmulti; /* dot11MulticastTransmittedFrameCount */ uint32_t txfail; /* dot11FailedCount */ @@ -1551,6 +1559,7 @@ typedef struct uint32_t rxundec; /* dot11WEPUndecryptableCount */ /* WPA2 counters (see rxundec for DecryptFailureCount) */ + uint32_t tkipmicfaill; /* TKIPLocalMICFailures */ uint32_t tkipcntrmsr; /* TKIPCounterMeasuresInvoked */ uint32_t tkipreplay; /* TKIPReplays */ @@ -1567,6 +1576,7 @@ typedef struct uint32_t rxundec_mcst; /* dot11WEPUndecryptableCount */ /* WPA2 counters (see rxundec for DecryptFailureCount) */ + uint32_t tkipmicfaill_mcst; /* TKIPLocalMICFailures */ uint32_t tkipcntrmsr_mcst; /* TKIPCounterMeasuresInvoked */ uint32_t tkipreplay_mcst; /* TKIPReplays */ @@ -1586,6 +1596,7 @@ typedef struct uint32_t phywatchdog; /* Count Phy watchdogs (triggered by ucode) */ /* MBSS counters, AP only */ + uint32_t prq_entries_handled; /* PRQ entries read in */ uint32_t prq_undirected_entries; /* which were bcast bss & ssid */ uint32_t prq_bad_entries; /* which could not be translated to info */ @@ -1595,6 +1606,7 @@ typedef struct uint32_t late_tbtt_dpc; /* TBTT DPC did not happen in time */ /* per-rate receive stat counters */ + uint32_t rx1mbps; /* packets rx at 1Mbps */ uint32_t rx2mbps; /* packets rx at 2Mbps */ uint32_t rx5mbps5; /* packets rx at 5.5Mbps */ @@ -1618,6 +1630,7 @@ typedef struct uint32_t rx540mbps; /* packets rx at 540 mbps */ /* pkteng rx frame stats */ + uint32_t pktengrxducast; /* unicast frames rxed by the pkteng code */ uint32_t pktengrxdmcast; /* multicast frames rxed by the pkteng code */ @@ -1636,6 +1649,7 @@ typedef struct uint16_t length; /* length of entire structure */ /* transmit stat counters */ + uint32_t txframe; /* tx data frames */ uint32_t txbyte; /* tx data bytes */ uint32_t txretrans; /* tx mac retransmits */ @@ -1650,11 +1664,13 @@ typedef struct uint32_t txcmiss; /* tx header cache miss (slowpath) */ /* transmit chip error counters */ + uint32_t txuflo; /* tx fifo underflows */ uint32_t txphyerr; /* tx phy errors (indicated in tx status) */ uint32_t txphycrs; /* PR8861/8963 counter */ /* receive stat counters */ + uint32_t rxframe; /* rx data frames */ uint32_t rxbyte; /* rx data bytes */ uint32_t rxerror; /* rx data errors (derived: sum of others) */ @@ -1673,6 +1689,7 @@ typedef struct uint32_t rxfilter; /* rx frames filtered out */ /* receive chip error counters */ + uint32_t rxoflo; /* rx fifo overflow errors */ uint32_t rxuflo[NFIFO]; /* rx dma descriptor underflow errors */ @@ -1681,6 +1698,7 @@ typedef struct uint32_t d11cnt_txnocts_off; /* d11cnt txnocts value when reset d11cnt */ /* misc counters */ + uint32_t dmade; /* tx/rx dma descriptor errors */ uint32_t dmada; /* tx/rx dma data errors */ uint32_t dmape; /* tx/rx dma descriptor protocol errors */ @@ -1690,6 +1708,7 @@ typedef struct uint32_t pkt_callback_reg_fail; /* callbacks register failure */ /* MAC counters: 32-bit version of d11.h's macstat_t */ + uint32_t txallfrm; /* total number of frames sent, incl. Data, ACK, RTS, CTS, * Control Management (includes retransmissions) */ @@ -1765,6 +1784,7 @@ typedef struct uint32_t txburst; /* obsolete */ /* 802.11 MIB counters, pp. 614 of 802.11 reaff doc. */ + uint32_t txfrag; /* dot11TransmittedFragmentCount */ uint32_t txmulti; /* dot11MulticastTransmittedFrameCount */ uint32_t txfail; /* dot11FailedCount */ @@ -1781,6 +1801,7 @@ typedef struct uint32_t rxundec; /* dot11WEPUndecryptableCount */ /* WPA2 counters (see rxundec for DecryptFailureCount) */ + uint32_t tkipmicfaill; /* TKIPLocalMICFailures */ uint32_t tkipcntrmsr; /* TKIPCounterMeasuresInvoked */ uint32_t tkipreplay; /* TKIPReplays */ @@ -1799,6 +1820,7 @@ typedef struct uint32_t phywatchdog; /* Count Phy watchdogs (triggered by ucode) */ /* MBSS counters, AP only */ + uint32_t prq_entries_handled; /* PRQ entries read in */ uint32_t prq_undirected_entries; /* which were bcast bss & ssid */ uint32_t prq_bad_entries; /* which could not be translated to info */ @@ -1808,6 +1830,7 @@ typedef struct uint32_t late_tbtt_dpc; /* TBTT DPC did not happen in time */ /* per-rate receive stat counters */ + uint32_t rx1mbps; /* packets rx at 1Mbps */ uint32_t rx2mbps; /* packets rx at 2Mbps */ uint32_t rx5mbps5; /* packets rx at 5.5Mbps */ @@ -1831,6 +1854,7 @@ typedef struct uint32_t rx540mbps; /* packets rx at 540 mbps */ /* pkteng rx frame stats */ + uint32_t pktengrxducast; /* unicast frames rxed by the pkteng code */ uint32_t pktengrxdmcast; /* multicast frames rxed by the pkteng code */ @@ -1847,6 +1871,7 @@ typedef struct uint32_t rxundec_mcst; /* dot11WEPUndecryptableCount */ /* WPA2 counters (see rxundec for DecryptFailureCount) */ + uint32_t tkipmicfaill_mcst; /* TKIPLocalMICFailures */ uint32_t tkipcntrmsr_mcst; /* TKIPCounterMeasuresInvoked */ uint32_t tkipreplay_mcst; /* TKIPReplays */ @@ -1869,6 +1894,7 @@ typedef struct uint16_t length; /* length of entire structure */ /* transmit stat counters */ + uint32_t txframe; /* tx data frames */ uint32_t txbyte; /* tx data bytes */ uint32_t txretrans; /* tx mac retransmits */ @@ -1883,11 +1909,13 @@ typedef struct uint32_t txcmiss; /* tx header cache miss (slowpath) */ /* transmit chip error counters */ + uint32_t txuflo; /* tx fifo underflows */ uint32_t txphyerr; /* tx phy errors (indicated in tx status) */ uint32_t txphycrs; /* PR8861/8963 counter */ /* receive stat counters */ + uint32_t rxframe; /* rx data frames */ uint32_t rxbyte; /* rx data bytes */ uint32_t rxerror; /* rx data errors (derived: sum of others) */ @@ -1906,6 +1934,7 @@ typedef struct uint32_t rxfilter; /* rx frames filtered out */ /* receive chip error counters */ + uint32_t rxoflo; /* rx fifo overflow errors */ uint32_t rxuflo[NFIFO]; /* rx dma descriptor underflow errors */ @@ -1914,6 +1943,7 @@ typedef struct uint32_t d11cnt_txnocts_off; /* d11cnt txnocts value when reset d11cnt */ /* misc counters */ + uint32_t dmade; /* tx/rx dma descriptor errors */ uint32_t dmada; /* tx/rx dma data errors */ uint32_t dmape; /* tx/rx dma descriptor protocol errors */ @@ -1923,6 +1953,7 @@ typedef struct uint32_t pkt_callback_reg_fail; /* callbacks register failure */ /* MAC counters: 32-bit version of d11.h's macstat_t */ + uint32_t txallfrm; /* total number of frames sent, incl. Data, ACK, RTS, CTS, * Control Management (includes retransmissions) */ @@ -2000,6 +2031,7 @@ typedef struct uint32_t txback; /* blockack txcnt */ /* 802.11 MIB counters, pp. 614 of 802.11 reaff doc. */ + uint32_t txfrag; /* dot11TransmittedFragmentCount */ uint32_t txmulti; /* dot11MulticastTransmittedFrameCount */ uint32_t txfail; /* dot11FailedCount */ @@ -2016,6 +2048,7 @@ typedef struct uint32_t rxundec; /* dot11WEPUndecryptableCount */ /* WPA2 counters (see rxundec for DecryptFailureCount) */ + uint32_t tkipmicfaill; /* TKIPLocalMICFailures */ uint32_t tkipcntrmsr; /* TKIPCounterMeasuresInvoked */ uint32_t tkipreplay; /* TKIPReplays */ @@ -2034,6 +2067,7 @@ typedef struct uint32_t phywatchdog; /* Count Phy watchdogs (triggered by ucode) */ /* MBSS counters, AP only */ + uint32_t prq_entries_handled; /* PRQ entries read in */ uint32_t prq_undirected_entries; /* which were bcast bss & ssid */ uint32_t prq_bad_entries; /* which could not be translated to info */ @@ -2043,6 +2077,7 @@ typedef struct uint32_t late_tbtt_dpc; /* TBTT DPC did not happen in time */ /* per-rate receive stat counters */ + uint32_t rx1mbps; /* packets rx at 1Mbps */ uint32_t rx2mbps; /* packets rx at 2Mbps */ uint32_t rx5mbps5; /* packets rx at 5.5Mbps */ @@ -2066,6 +2101,7 @@ typedef struct uint32_t rx540mbps; /* packets rx at 540 mbps */ /* pkteng rx frame stats */ + uint32_t pktengrxducast; /* unicast frames rxed by the pkteng code */ uint32_t pktengrxdmcast; /* multicast frames rxed by the pkteng code */ @@ -2083,6 +2119,7 @@ typedef struct uint32_t rxundec_mcst; /* dot11WEPUndecryptableCount */ /* WPA2 counters (see rxundec for DecryptFailureCount) */ + uint32_t tkipmicfaill_mcst; /* TKIPLocalMICFailures */ uint32_t tkipcntrmsr_mcst; /* TKIPCounterMeasuresInvoked */ uint32_t tkipreplay_mcst; /* TKIPReplays */ @@ -2671,6 +2708,7 @@ typedef struct sta_prbreq_wps_ie_list /* EDCF related items from 802.11.h */ /* ACI from 802.11.h */ + #define EDCF_AIFSN_MIN 1 /* AIFSN minimum value */ #define EDCF_AIFSN_MAX 15 /* AIFSN maximum value */ #define EDCF_AIFSN_MASK 0x0f /* AIFSN mask */ @@ -2680,6 +2718,7 @@ typedef struct sta_prbreq_wps_ie_list #define EDCF_AIFSN_SHIFT 12 /* 4 MSB(0xFFF) in ifs_ctl for AC idx */ /* ECW from 802.11.h */ + #define EDCF_ECW_MIN 0 /* cwmin/cwmax exponent minimum value */ #define EDCF_ECW_MAX 15 /* cwmin/cwmax exponent maximum value */ #define EDCF_ECW2CW(exp) ((1 << (exp)) - 1) @@ -2688,6 +2727,7 @@ typedef struct sta_prbreq_wps_ie_list #define EDCF_ECWMAX_SHIFT 4 /* cwmax exponent form shift */ /* TXOP from 802.11.h */ + #define EDCF_TXOP_MIN 0 /* TXOP minimum value */ #define EDCF_TXOP_MAX 65535 /* TXOP maximum value */ #define EDCF_TXOP2USEC(txop) ((txop) << 5) @@ -2701,146 +2741,146 @@ struct edcf_acparam typedef struct edcf_acparam edcf_acparam_t; /* Stop packing structures */ + #pragma pack() -/** - * Enumerated list of event types - */ +/* Enumerated list of event types */ + typedef enum { WLC_E_NONE = -1, - WLC_E_SET_SSID = 0 /** indicates status of set SSID */, - WLC_E_JOIN = 1, /** differentiates join IBSS from found (WLC_E_START) IBSS */ - WLC_E_START = 2, /** STA founded an IBSS or AP started a BSS */ - WLC_E_AUTH = 3, /** 802.11 AUTH request */ - WLC_E_AUTH_IND = 4, /** 802.11 AUTH indication */ - WLC_E_DEAUTH = 5, /** 802.11 DEAUTH request */ - WLC_E_DEAUTH_IND = 6, /** 802.11 DEAUTH indication */ - WLC_E_ASSOC = 7, /** 802.11 ASSOC request */ - WLC_E_ASSOC_IND = 8, /** 802.11 ASSOC indication */ - WLC_E_REASSOC = 9, /** 802.11 REASSOC request */ - WLC_E_REASSOC_IND = 10, /** 802.11 REASSOC indication */ - WLC_E_DISASSOC = 11, /** 802.11 DISASSOC request */ - WLC_E_DISASSOC_IND = 12, /** 802.11 DISASSOC indication */ - WLC_E_QUIET_START = 13, /** 802.11h Quiet period started */ - WLC_E_QUIET_END = 14, /** 802.11h Quiet period ended */ - WLC_E_BEACON_RX = 15, /** BEACONS received/lost indication */ - WLC_E_LINK = 16, /** generic link indication */ - WLC_E_MIC_ERROR = 17, /** TKIP MIC error occurred */ - WLC_E_NDIS_LINK = 18, /** NDIS style link indication */ - WLC_E_ROAM = 19, /** roam attempt occurred: indicate status & reason */ - WLC_E_TXFAIL = 20, /** change in dot11FailedCount (txfail) */ - WLC_E_PMKID_CACHE = 21, /** WPA2 pmkid cache indication */ - WLC_E_RETROGRADE_TSF = 22, /** current AP's TSF value went backward */ - WLC_E_PRUNE = 23, /** AP was pruned from join list for reason */ - WLC_E_AUTOAUTH = 24, /** report AutoAuth table entry match for join attempt */ - WLC_E_EAPOL_MSG = 25, /** Event encapsulating an EAPOL message */ - WLC_E_SCAN_COMPLETE = 26, /** Scan results are ready or scan was aborted */ - WLC_E_ADDTS_IND = 27, /** indicate to host addts fail/success */ - WLC_E_DELTS_IND = 28, /** indicate to host delts fail/success */ - WLC_E_BCNSENT_IND = 29, /** indicate to host of beacon transmit */ - WLC_E_BCNRX_MSG = 30, /** Send the received beacon up to the host */ - WLC_E_BCNLOST_MSG = 31, /** indicate to host loss of beacon */ - WLC_E_ROAM_PREP = 32, /** before attempting to roam */ - WLC_E_PFN_NET_FOUND = 33, /** PFN network found event */ - WLC_E_PFN_NET_LOST = 34, /** PFN network lost event */ + WLC_E_SET_SSID = 0 /* indicates status of set SSID */, + WLC_E_JOIN = 1, /* differentiates join IBSS from found (WLC_E_START) IBSS */ + WLC_E_START = 2, /* STA founded an IBSS or AP started a BSS */ + WLC_E_AUTH = 3, /* 802.11 AUTH request */ + WLC_E_AUTH_IND = 4, /* 802.11 AUTH indication */ + WLC_E_DEAUTH = 5, /* 802.11 DEAUTH request */ + WLC_E_DEAUTH_IND = 6, /* 802.11 DEAUTH indication */ + WLC_E_ASSOC = 7, /* 802.11 ASSOC request */ + WLC_E_ASSOC_IND = 8, /* 802.11 ASSOC indication */ + WLC_E_REASSOC = 9, /* 802.11 REASSOC request */ + WLC_E_REASSOC_IND = 10, /* 802.11 REASSOC indication */ + WLC_E_DISASSOC = 11, /* 802.11 DISASSOC request */ + WLC_E_DISASSOC_IND = 12, /* 802.11 DISASSOC indication */ + WLC_E_QUIET_START = 13, /* 802.11h Quiet period started */ + WLC_E_QUIET_END = 14, /* 802.11h Quiet period ended */ + WLC_E_BEACON_RX = 15, /* BEACONS received/lost indication */ + WLC_E_LINK = 16, /* generic link indication */ + WLC_E_MIC_ERROR = 17, /* TKIP MIC error occurred */ + WLC_E_NDIS_LINK = 18, /* NDIS style link indication */ + WLC_E_ROAM = 19, /* roam attempt occurred: indicate status & reason */ + WLC_E_TXFAIL = 20, /* change in dot11FailedCount (txfail) */ + WLC_E_PMKID_CACHE = 21, /* WPA2 pmkid cache indication */ + WLC_E_RETROGRADE_TSF = 22, /* current AP's TSF value went backward */ + WLC_E_PRUNE = 23, /* AP was pruned from join list for reason */ + WLC_E_AUTOAUTH = 24, /* report AutoAuth table entry match for join attempt */ + WLC_E_EAPOL_MSG = 25, /* Event encapsulating an EAPOL message */ + WLC_E_SCAN_COMPLETE = 26, /* Scan results are ready or scan was aborted */ + WLC_E_ADDTS_IND = 27, /* indicate to host addts fail/success */ + WLC_E_DELTS_IND = 28, /* indicate to host delts fail/success */ + WLC_E_BCNSENT_IND = 29, /* indicate to host of beacon transmit */ + WLC_E_BCNRX_MSG = 30, /* Send the received beacon up to the host */ + WLC_E_BCNLOST_MSG = 31, /* indicate to host loss of beacon */ + WLC_E_ROAM_PREP = 32, /* before attempting to roam */ + WLC_E_PFN_NET_FOUND = 33, /* PFN network found event */ + WLC_E_PFN_NET_LOST = 34, /* PFN network lost event */ WLC_E_RESET_COMPLETE = 35, WLC_E_JOIN_START = 36, WLC_E_ROAM_START = 37, WLC_E_ASSOC_START = 38, WLC_E_IBSS_ASSOC = 39, WLC_E_RADIO = 40, - WLC_E_PSM_WATCHDOG = 41, /** PSM microcode watchdog fired */ - WLC_E_CCX_ASSOC_START = 42, /** CCX association start */ - WLC_E_CCX_ASSOC_ABORT = 43, /** CCX association abort */ - WLC_E_PROBREQ_MSG = 44, /** probe request received */ + WLC_E_PSM_WATCHDOG = 41, /* PSM microcode watchdog fired */ + WLC_E_CCX_ASSOC_START = 42, /* CCX association start */ + WLC_E_CCX_ASSOC_ABORT = 43, /* CCX association abort */ + WLC_E_PROBREQ_MSG = 44, /* probe request received */ WLC_E_SCAN_CONFIRM_IND = 45, - WLC_E_PSK_SUP = 46, /** WPA Handshake */ + WLC_E_PSK_SUP = 46, /* WPA Handshake */ WLC_E_COUNTRY_CODE_CHANGED = 47, - WLC_E_EXCEEDED_MEDIUM_TIME = 48, /** WMMAC excedded medium time */ - WLC_E_ICV_ERROR = 49, /** WEP ICV error occurred */ - WLC_E_UNICAST_DECODE_ERROR = 50, /** Unsupported unicast encrypted frame */ - WLC_E_MULTICAST_DECODE_ERROR = 51, /** Unsupported multicast encrypted frame */ + WLC_E_EXCEEDED_MEDIUM_TIME = 48, /* WMMAC excedded medium time */ + WLC_E_ICV_ERROR = 49, /* WEP ICV error occurred */ + WLC_E_UNICAST_DECODE_ERROR = 50, /* Unsupported unicast encrypted frame */ + WLC_E_MULTICAST_DECODE_ERROR = 51, /* Unsupported multicast encrypted frame */ WLC_E_TRACE = 52, - WLC_E_BTA_HCI_EVENT = 53, /** BT-AMP HCI event */ - WLC_E_IF = 54, /** I/F change (for wlan host notification) */ - WLC_E_P2P_DISC_LISTEN_COMPLETE = 55, /** P2P Discovery listen state expires */ - WLC_E_RSSI = 56, /** indicate RSSI change based on configured levels */ - WLC_E_PFN_SCAN_COMPLETE = 57, /** PFN completed scan of network list */ + WLC_E_BTA_HCI_EVENT = 53, /* BT-AMP HCI event */ + WLC_E_IF = 54, /* I/F change (for wlan host notification) */ + WLC_E_P2P_DISC_LISTEN_COMPLETE = 55, /* P2P Discovery listen state expires */ + WLC_E_RSSI = 56, /* indicate RSSI change based on configured levels */ + WLC_E_PFN_SCAN_COMPLETE = 57, /* PFN completed scan of network list */ WLC_E_EXTLOG_MSG = 58, - WLC_E_ACTION_FRAME = 59, /** Action frame reception */ - WLC_E_ACTION_FRAME_COMPLETE = 60, /** Action frame Tx complete */ - WLC_E_PRE_ASSOC_IND = 61, /** assoc request received */ - WLC_E_PRE_REASSOC_IND = 62, /** re-assoc request received */ - WLC_E_CHANNEL_ADOPTED = 63, /** channel adopted (xxx: obsoleted) */ - WLC_E_AP_STARTED = 64, /** AP started */ - WLC_E_DFS_AP_STOP = 65, /** AP stopped due to DFS */ - WLC_E_DFS_AP_RESUME = 66, /** AP resumed due to DFS */ - WLC_E_WAI_STA_EVENT = 67, /** WAI stations event */ - WLC_E_WAI_MSG = 68, /** event encapsulating an WAI message */ - WLC_E_ESCAN_RESULT = 69, /** escan result event */ - WLC_E_ACTION_FRAME_OFF_CHAN_COMPLETE = 70, /** action frame off channel complete */ /* NOTE - This used to be WLC_E_WAKE_EVENT */ - WLC_E_PROBRESP_MSG = 71, /** probe response received */ - WLC_E_P2P_PROBREQ_MSG = 72, /** P2P Probe request received */ + WLC_E_ACTION_FRAME = 59, /* Action frame reception */ + WLC_E_ACTION_FRAME_COMPLETE = 60, /* Action frame Tx complete */ + WLC_E_PRE_ASSOC_IND = 61, /* assoc request received */ + WLC_E_PRE_REASSOC_IND = 62, /* re-assoc request received */ + WLC_E_CHANNEL_ADOPTED = 63, /* channel adopted (xxx: obsoleted) */ + WLC_E_AP_STARTED = 64, /* AP started */ + WLC_E_DFS_AP_STOP = 65, /* AP stopped due to DFS */ + WLC_E_DFS_AP_RESUME = 66, /* AP resumed due to DFS */ + WLC_E_WAI_STA_EVENT = 67, /* WAI stations event */ + WLC_E_WAI_MSG = 68, /* event encapsulating an WAI message */ + WLC_E_ESCAN_RESULT = 69, /* escan result event */ + WLC_E_ACTION_FRAME_OFF_CHAN_COMPLETE = 70, /* action frame off channel complete */ /* NOTE - This used to be WLC_E_WAKE_EVENT */ + WLC_E_PROBRESP_MSG = 71, /* probe response received */ + WLC_E_P2P_PROBREQ_MSG = 72, /* P2P Probe request received */ WLC_E_DCS_REQUEST = 73, - WLC_E_FIFO_CREDIT_MAP = 74, /** credits for D11 FIFOs. [AC0,AC1,AC2,AC3,BC_MC,ATIM] */ - WLC_E_ACTION_FRAME_RX = 75, /** Received action frame event WITH wl_event_rx_frame_data_t header */ - WLC_E_WAKE_EVENT = 76, /** Wake Event timer fired, used for wake WLAN test mode */ - WLC_E_RM_COMPLETE = 77, /** Radio measurement complete */ - WLC_E_HTSFSYNC = 78, /** Synchronize TSF with the host */ - WLC_E_OVERLAY_REQ = 79, /** request an overlay IOCTL/iovar from the host */ + WLC_E_FIFO_CREDIT_MAP = 74, /* credits for D11 FIFOs. [AC0,AC1,AC2,AC3,BC_MC,ATIM] */ + WLC_E_ACTION_FRAME_RX = 75, /* Received action frame event WITH wl_event_rx_frame_data_t header */ + WLC_E_WAKE_EVENT = 76, /* Wake Event timer fired, used for wake WLAN test mode */ + WLC_E_RM_COMPLETE = 77, /* Radio measurement complete */ + WLC_E_HTSFSYNC = 78, /* Synchronize TSF with the host */ + WLC_E_OVERLAY_REQ = 79, /* request an overlay IOCTL/iovar from the host */ WLC_E_CSA_COMPLETE_IND = 80, - WLC_E_EXCESS_PM_WAKE_EVENT = 81, /** excess PM Wake Event to inform host */ - WLC_E_PFN_SCAN_NONE = 82, /** no PFN networks around */ - WLC_E_PFN_SCAN_ALLGONE = 83, /** last found PFN network gets lost */ + WLC_E_EXCESS_PM_WAKE_EVENT = 81, /* excess PM Wake Event to inform host */ + WLC_E_PFN_SCAN_NONE = 82, /* no PFN networks around */ + WLC_E_PFN_SCAN_ALLGONE = 83, /* last found PFN network gets lost */ WLC_E_GTK_PLUMBED = 84, - WLC_E_ASSOC_IND_NDIS = 85, /** 802.11 ASSOC indication for NDIS only */ - WLC_E_REASSOC_IND_NDIS = 86, /** 802.11 REASSOC indication for NDIS only */ + WLC_E_ASSOC_IND_NDIS = 85, /* 802.11 ASSOC indication for NDIS only */ + WLC_E_REASSOC_IND_NDIS = 86, /* 802.11 REASSOC indication for NDIS only */ WLC_E_ASSOC_REQ_IE = 87, WLC_E_ASSOC_RESP_IE = 88, - WLC_E_ASSOC_RECREATED = 89, /** association recreated on resume */ - WLC_E_ACTION_FRAME_RX_NDIS = 90, /** rx action frame event for NDIS only */ - WLC_E_AUTH_REQ = 91, /** authentication request received */ - WLC_E_TDLS_PEER_EVENT = 92, /** discovered peer, connected/disconnected peer */ - WLC_E_SPEEDY_RECREATE_FAIL = 93, /** fast assoc recreation failed */ - WLC_E_NATIVE = 94, /** port-specific event and payload (e.g. NDIS) */ - WLC_E_PKTDELAY_IND = 95, /** event for tx pkt delay suddently jump */ - WLC_E_AWDL_AW = 96, /** AWDL AW period starts */ - WLC_E_AWDL_ROLE = 97, /** AWDL Master/Slave/NE master role event */ - WLC_E_AWDL_EVENT = 98, /** Generic AWDL event */ - WLC_E_NIC_AF_TXS = 99, /** NIC AF txstatus */ - WLC_E_NIC_NIC_REPORT = 100, /** NIC period report */ + WLC_E_ASSOC_RECREATED = 89, /* association recreated on resume */ + WLC_E_ACTION_FRAME_RX_NDIS = 90, /* rx action frame event for NDIS only */ + WLC_E_AUTH_REQ = 91, /* authentication request received */ + WLC_E_TDLS_PEER_EVENT = 92, /* discovered peer, connected/disconnected peer */ + WLC_E_SPEEDY_RECREATE_FAIL = 93, /* fast assoc recreation failed */ + WLC_E_NATIVE = 94, /* port-specific event and payload (e.g. NDIS) */ + WLC_E_PKTDELAY_IND = 95, /* event for tx pkt delay suddently jump */ + WLC_E_AWDL_AW = 96, /* AWDL AW period starts */ + WLC_E_AWDL_ROLE = 97, /* AWDL Master/Slave/NE master role event */ + WLC_E_AWDL_EVENT = 98, /* Generic AWDL event */ + WLC_E_NIC_AF_TXS = 99, /* NIC AF txstatus */ + WLC_E_NIC_NIC_REPORT = 100, /* NIC period report */ WLC_E_BEACON_FRAME_RX = 101, - WLC_E_SERVICE_FOUND = 102, /** desired service found */ - WLC_E_GAS_FRAGMENT_RX = 103, /** GAS fragment received */ - WLC_E_GAS_COMPLETE = 104, /** GAS sessions all complete */ - WLC_E_P2PO_ADD_DEVICE = 105, /** New device found by p2p offload */ - WLC_E_P2PO_DEL_DEVICE = 106, /** device has been removed by p2p offload */ - WLC_E_WNM_STA_SLEEP = 107, /** WNM event to notify STA enter sleep mode */ - WLC_E_TXFAIL_THRESH = 108, /** Indication of MAC tx failures (exhaustion of 802.11 retries) exceeding threshold(s) */ - WLC_E_PROXD = 109, /** Proximity Detection event */ - WLC_E_IBSS_COALESCE = 110, /** IBSS Coalescing */ - WLC_E_AWDL_RX_PRB_RESP = 111, /** AWDL RX Probe response */ - WLC_E_AWDL_RX_ACT_FRAME = 112, /** AWDL RX Action Frames */ - WLC_E_AWDL_WOWL_NULLPKT = 113, /** AWDL Wowl nulls */ - WLC_E_AWDL_PHYCAL_STATUS = 114, /** AWDL Phycal status */ - WLC_E_AWDL_OOB_AF_STATUS = 115, /** AWDL OOB AF status */ - WLC_E_AWDL_SCAN_STATUS = 116, /** Interleaved Scan status */ - WLC_E_AWDL_AW_START = 117, /** AWDL AW Start */ - WLC_E_AWDL_AW_END = 118, /** AWDL AW End */ - WLC_E_AWDL_AW_EXT = 119, /** AWDL AW Extensions */ + WLC_E_SERVICE_FOUND = 102, /* desired service found */ + WLC_E_GAS_FRAGMENT_RX = 103, /* GAS fragment received */ + WLC_E_GAS_COMPLETE = 104, /* GAS sessions all complete */ + WLC_E_P2PO_ADD_DEVICE = 105, /* New device found by p2p offload */ + WLC_E_P2PO_DEL_DEVICE = 106, /* device has been removed by p2p offload */ + WLC_E_WNM_STA_SLEEP = 107, /* WNM event to notify STA enter sleep mode */ + WLC_E_TXFAIL_THRESH = 108, /* Indication of MAC tx failures (exhaustion of 802.11 retries) exceeding threshold(s) */ + WLC_E_PROXD = 109, /* Proximity Detection event */ + WLC_E_IBSS_COALESCE = 110, /* IBSS Coalescing */ + WLC_E_AWDL_RX_PRB_RESP = 111, /* AWDL RX Probe response */ + WLC_E_AWDL_RX_ACT_FRAME = 112, /* AWDL RX Action Frames */ + WLC_E_AWDL_WOWL_NULLPKT = 113, /* AWDL Wowl nulls */ + WLC_E_AWDL_PHYCAL_STATUS = 114, /* AWDL Phycal status */ + WLC_E_AWDL_OOB_AF_STATUS = 115, /* AWDL OOB AF status */ + WLC_E_AWDL_SCAN_STATUS = 116, /* Interleaved Scan status */ + WLC_E_AWDL_AW_START = 117, /* AWDL AW Start */ + WLC_E_AWDL_AW_END = 118, /* AWDL AW End */ + WLC_E_AWDL_AW_EXT = 119, /* AWDL AW Extensions */ WLC_E_AWDL_PEER_CACHE_CONTROL = 120, WLC_E_CSA_START_IND = 121, WLC_E_CSA_DONE_IND = 122, WLC_E_CSA_FAILURE_IND = 123, - WLC_E_CCA_CHAN_QUAL = 124, /** CCA based channel quality report */ - WLC_E_BSSID = 125, /** to report change in BSSID while roaming */ - WLC_E_TX_STAT_ERROR = 126, /** tx error indication */ - WLC_E_BCMC_CREDIT_SUPPORT = 127, /** credit check for BCMC supported */ - WLC_E_PSTA_PRIMARY_INTF_IND = 128, /** psta primary interface indication */ - WLC_E_LAST = 129, /** highest val + 1 for range checking */ + WLC_E_CCA_CHAN_QUAL = 124, /* CCA based channel quality report */ + WLC_E_BSSID = 125, /* to report change in BSSID while roaming */ + WLC_E_TX_STAT_ERROR = 126, /* tx error indication */ + WLC_E_BCMC_CREDIT_SUPPORT = 127, /* credit check for BCMC supported */ + WLC_E_PSTA_PRIMARY_INTF_IND = 128, /* psta primary interface indication */ + WLC_E_LAST = 129, /* highest val + 1 for range checking */ - WLC_E_FORCE_32_BIT = 0x7FFFFFFE /** Force enum to be stored in 32 bit variable */ + WLC_E_FORCE_32_BIT = 0x7FFFFFFE /* Force enum to be stored in 32 bit variable */ } wl_event_num_t; #define BCMF_EVENT_COUNT WLC_E_LAST @@ -2848,31 +2888,32 @@ typedef enum #define WLC_SUP_STATUS_OFFSET (256) #define WLC_DOT11_SC_STATUS_OFFSET (512) -/** - * Enumerated list of event status codes +/* Enumerated list of event status codes * @note : WLC_SUP values overlap other values, so it is necessary * to check the event type */ + typedef enum { - WLC_E_STATUS_SUCCESS = 0, /** operation was successful */ - WLC_E_STATUS_FAIL = 1, /** operation failed */ - WLC_E_STATUS_TIMEOUT = 2, /** operation timed out */ - WLC_E_STATUS_NO_NETWORKS = 3, /** failed due to no matching network found */ - WLC_E_STATUS_ABORT = 4, /** operation was aborted */ - WLC_E_STATUS_NO_ACK = 5, /** protocol failure: packet not ack'd */ - WLC_E_STATUS_UNSOLICITED = 6, /** AUTH or ASSOC packet was unsolicited */ - WLC_E_STATUS_ATTEMPT = 7, /** attempt to assoc to an auto auth configuration */ - WLC_E_STATUS_PARTIAL = 8, /** scan results are incomplete */ - WLC_E_STATUS_NEWSCAN = 9, /** scan aborted by another scan */ - WLC_E_STATUS_NEWASSOC = 10, /** scan aborted due to assoc in progress */ - WLC_E_STATUS_11HQUIET = 11, /** 802.11h quiet period started */ - WLC_E_STATUS_SUPPRESS = 12, /** user disabled scanning (WLC_SET_SCANSUPPRESS) */ - WLC_E_STATUS_NOCHANS = 13, /** no allowable channels to scan */ - WLC_E_STATUS_CCXFASTRM = 14, /** scan aborted due to CCX fast roam */ - WLC_E_STATUS_CS_ABORT = 15, /** abort channel select */ + WLC_E_STATUS_SUCCESS = 0, /* operation was successful */ + WLC_E_STATUS_FAIL = 1, /* operation failed */ + WLC_E_STATUS_TIMEOUT = 2, /* operation timed out */ + WLC_E_STATUS_NO_NETWORKS = 3, /* failed due to no matching network found */ + WLC_E_STATUS_ABORT = 4, /* operation was aborted */ + WLC_E_STATUS_NO_ACK = 5, /* protocol failure: packet not ack'd */ + WLC_E_STATUS_UNSOLICITED = 6, /* AUTH or ASSOC packet was unsolicited */ + WLC_E_STATUS_ATTEMPT = 7, /* attempt to assoc to an auto auth configuration */ + WLC_E_STATUS_PARTIAL = 8, /* scan results are incomplete */ + WLC_E_STATUS_NEWSCAN = 9, /* scan aborted by another scan */ + WLC_E_STATUS_NEWASSOC = 10, /* scan aborted due to assoc in progress */ + WLC_E_STATUS_11HQUIET = 11, /* 802.11h quiet period started */ + WLC_E_STATUS_SUPPRESS = 12, /* user disabled scanning (WLC_SET_SCANSUPPRESS) */ + WLC_E_STATUS_NOCHANS = 13, /* no allowable channels to scan */ + WLC_E_STATUS_CCXFASTRM = 14, /* scan aborted due to CCX fast roam */ + WLC_E_STATUS_CS_ABORT = 15, /* abort channel select */ /* for WLC_SUP messages */ + WLC_SUP_DISCONNECTED = 0 + WLC_SUP_STATUS_OFFSET, WLC_SUP_CONNECTING = 1 + WLC_SUP_STATUS_OFFSET, WLC_SUP_IDREQUIRED = 2 + WLC_SUP_STATUS_OFFSET, @@ -2882,13 +2923,15 @@ typedef enum WLC_SUP_KEYED = 6 + WLC_SUP_STATUS_OFFSET, WLC_SUP_TIMEOUT = 7 + WLC_SUP_STATUS_OFFSET, WLC_SUP_LAST_BASIC_STATE = 8 + WLC_SUP_STATUS_OFFSET, + /* Extended supplicant authentication states */ - WLC_SUP_KEYXCHANGE_WAIT_M1 = (int) WLC_SUP_AUTHENTICATED + WLC_SUP_STATUS_OFFSET, /** Waiting to receive handshake msg M1 */ - WLC_SUP_KEYXCHANGE_PREP_M2 = (int) WLC_SUP_KEYXCHANGE + WLC_SUP_STATUS_OFFSET, /** Preparing to send handshake msg M2 */ - WLC_SUP_KEYXCHANGE_WAIT_M3 = (int) WLC_SUP_LAST_BASIC_STATE + WLC_SUP_STATUS_OFFSET, /** Waiting to receive handshake msg M3 */ - WLC_SUP_KEYXCHANGE_PREP_M4 = 9 + WLC_SUP_STATUS_OFFSET, /** Preparing to send handshake msg M4 */ - WLC_SUP_KEYXCHANGE_WAIT_G1 = 10 + WLC_SUP_STATUS_OFFSET, /** Waiting to receive handshake msg G1 */ - WLC_SUP_KEYXCHANGE_PREP_G2 = 11 + WLC_SUP_STATUS_OFFSET, /** Preparing to send handshake msg G2 */ + + WLC_SUP_KEYXCHANGE_WAIT_M1 = (int) WLC_SUP_AUTHENTICATED + WLC_SUP_STATUS_OFFSET, /* Waiting to receive handshake msg M1 */ + WLC_SUP_KEYXCHANGE_PREP_M2 = (int) WLC_SUP_KEYXCHANGE + WLC_SUP_STATUS_OFFSET, /* Preparing to send handshake msg M2 */ + WLC_SUP_KEYXCHANGE_WAIT_M3 = (int) WLC_SUP_LAST_BASIC_STATE + WLC_SUP_STATUS_OFFSET, /* Waiting to receive handshake msg M3 */ + WLC_SUP_KEYXCHANGE_PREP_M4 = 9 + WLC_SUP_STATUS_OFFSET, /* Preparing to send handshake msg M4 */ + WLC_SUP_KEYXCHANGE_WAIT_G1 = 10 + WLC_SUP_STATUS_OFFSET, /* Waiting to receive handshake msg G1 */ + WLC_SUP_KEYXCHANGE_PREP_G2 = 11 + WLC_SUP_STATUS_OFFSET, /* Preparing to send handshake msg G2 */ WLC_DOT11_SC_SUCCESS = 0 + WLC_DOT11_SC_STATUS_OFFSET, /* Successful */ WLC_DOT11_SC_FAILURE = 1 + WLC_DOT11_SC_STATUS_OFFSET, /* Unspecified failure */ @@ -2916,69 +2959,72 @@ typedef enum WLC_DOT11_SC_INVALID_MDID = 54 + WLC_DOT11_SC_STATUS_OFFSET, /* Association denied due to invalid MDID */ WLC_DOT11_SC_INVALID_FTIE = 55 + WLC_DOT11_SC_STATUS_OFFSET, /* Association denied due to invalid FTIE */ - WLC_E_STATUS_FORCE_32_BIT = 0x7FFFFFFE /** Force enum to be stored in 32 bit variable */ + WLC_E_STATUS_FORCE_32_BIT = 0x7FFFFFFE /* Force enum to be stored in 32 bit variable */ } wl_event_status_t; #define WLC_E_PRUNE_REASON_OFFSET (256) #define WLC_E_SUP_REASON_OFFSET (512) #define WLC_E_DOT11_RC_REASON_OFFSET (768) -/** - * Enumerated list of event reason codes +/* Enumerated list of event reason codes * @note : Several values overlap other values, so it is necessary * to check the event type */ + typedef enum { /* roam reason codes */ - WLC_E_REASON_INITIAL_ASSOC = 0, /** initial assoc */ - WLC_E_REASON_LOW_RSSI = 1, /** roamed due to low RSSI */ - WLC_E_REASON_DEAUTH = 2, /** roamed due to DEAUTH indication */ - WLC_E_REASON_DISASSOC = 3, /** roamed due to DISASSOC indication */ - WLC_E_REASON_BCNS_LOST = 4, /** roamed due to lost beacons */ - WLC_E_REASON_FAST_ROAM_FAILED = 5, /** roamed due to fast roam failure */ - WLC_E_REASON_DIRECTED_ROAM = 6, /** roamed due to request by AP */ - WLC_E_REASON_TSPEC_REJECTED = 7, /** roamed due to TSPEC rejection */ - WLC_E_REASON_BETTER_AP = 8, /** roamed due to finding better AP */ + + WLC_E_REASON_INITIAL_ASSOC = 0, /* initial assoc */ + WLC_E_REASON_LOW_RSSI = 1, /* roamed due to low RSSI */ + WLC_E_REASON_DEAUTH = 2, /* roamed due to DEAUTH indication */ + WLC_E_REASON_DISASSOC = 3, /* roamed due to DISASSOC indication */ + WLC_E_REASON_BCNS_LOST = 4, /* roamed due to lost beacons */ + WLC_E_REASON_FAST_ROAM_FAILED = 5, /* roamed due to fast roam failure */ + WLC_E_REASON_DIRECTED_ROAM = 6, /* roamed due to request by AP */ + WLC_E_REASON_TSPEC_REJECTED = 7, /* roamed due to TSPEC rejection */ + WLC_E_REASON_BETTER_AP = 8, /* roamed due to finding better AP */ /* prune reason codes */ - WLC_E_PRUNE_ENCR_MISMATCH = 1 + WLC_E_PRUNE_REASON_OFFSET, /** encryption mismatch */ - WLC_E_PRUNE_BCAST_BSSID = 2 + WLC_E_PRUNE_REASON_OFFSET, /** AP uses a broadcast BSSID */ - WLC_E_PRUNE_MAC_DENY = 3 + WLC_E_PRUNE_REASON_OFFSET, /** STA's MAC addr is in AP's MAC deny list */ - WLC_E_PRUNE_MAC_NA = 4 + WLC_E_PRUNE_REASON_OFFSET, /** STA's MAC addr is not in AP's MAC allow list */ - WLC_E_PRUNE_REG_PASSV = 5 + WLC_E_PRUNE_REASON_OFFSET, /** AP not allowed due to regulatory restriction */ - WLC_E_PRUNE_SPCT_MGMT = 6 + WLC_E_PRUNE_REASON_OFFSET, /** AP does not support STA locale spectrum mgmt */ - WLC_E_PRUNE_RADAR = 7 + WLC_E_PRUNE_REASON_OFFSET, /** AP is on a radar channel of STA locale */ - WLC_E_RSN_MISMATCH = 8 + WLC_E_PRUNE_REASON_OFFSET, /** STA does not support AP's RSN */ - WLC_E_PRUNE_NO_COMMON_RATES = 9 + WLC_E_PRUNE_REASON_OFFSET, /** No rates in common with AP */ - WLC_E_PRUNE_BASIC_RATES = 10 + WLC_E_PRUNE_REASON_OFFSET, /** STA does not support all basic rates of BSS */ - WLC_E_PRUNE_CCXFAST_PREVAP = 11 + WLC_E_PRUNE_REASON_OFFSET, /** CCX FAST ROAM: prune previous AP */ - WLC_E_PRUNE_CIPHER_NA = 12 + WLC_E_PRUNE_REASON_OFFSET, /** BSS's cipher not supported */ - WLC_E_PRUNE_KNOWN_STA = 13 + WLC_E_PRUNE_REASON_OFFSET, /** AP is already known to us as a STA */ - WLC_E_PRUNE_CCXFAST_DROAM = 14 + WLC_E_PRUNE_REASON_OFFSET, /** CCX FAST ROAM: prune unqualified AP */ - WLC_E_PRUNE_WDS_PEER = 15 + WLC_E_PRUNE_REASON_OFFSET, /** AP is already known to us as a WDS peer */ - WLC_E_PRUNE_QBSS_LOAD = 16 + WLC_E_PRUNE_REASON_OFFSET, /** QBSS LOAD - AAC is too low */ - WLC_E_PRUNE_HOME_AP = 17 + WLC_E_PRUNE_REASON_OFFSET, /** prune home AP */ - WLC_E_PRUNE_AP_BLOCKED = 18 + WLC_E_PRUNE_REASON_OFFSET, /** prune blocked AP */ - WLC_E_PRUNE_NO_DIAG_SUPPORT = 19 + WLC_E_PRUNE_REASON_OFFSET, /** prune due to diagnostic mode not supported */ + + WLC_E_PRUNE_ENCR_MISMATCH = 1 + WLC_E_PRUNE_REASON_OFFSET, /* encryption mismatch */ + WLC_E_PRUNE_BCAST_BSSID = 2 + WLC_E_PRUNE_REASON_OFFSET, /* AP uses a broadcast BSSID */ + WLC_E_PRUNE_MAC_DENY = 3 + WLC_E_PRUNE_REASON_OFFSET, /* STA's MAC addr is in AP's MAC deny list */ + WLC_E_PRUNE_MAC_NA = 4 + WLC_E_PRUNE_REASON_OFFSET, /* STA's MAC addr is not in AP's MAC allow list */ + WLC_E_PRUNE_REG_PASSV = 5 + WLC_E_PRUNE_REASON_OFFSET, /* AP not allowed due to regulatory restriction */ + WLC_E_PRUNE_SPCT_MGMT = 6 + WLC_E_PRUNE_REASON_OFFSET, /* AP does not support STA locale spectrum mgmt */ + WLC_E_PRUNE_RADAR = 7 + WLC_E_PRUNE_REASON_OFFSET, /* AP is on a radar channel of STA locale */ + WLC_E_RSN_MISMATCH = 8 + WLC_E_PRUNE_REASON_OFFSET, /* STA does not support AP's RSN */ + WLC_E_PRUNE_NO_COMMON_RATES = 9 + WLC_E_PRUNE_REASON_OFFSET, /* No rates in common with AP */ + WLC_E_PRUNE_BASIC_RATES = 10 + WLC_E_PRUNE_REASON_OFFSET, /* STA does not support all basic rates of BSS */ + WLC_E_PRUNE_CCXFAST_PREVAP = 11 + WLC_E_PRUNE_REASON_OFFSET, /* CCX FAST ROAM: prune previous AP */ + WLC_E_PRUNE_CIPHER_NA = 12 + WLC_E_PRUNE_REASON_OFFSET, /* BSS's cipher not supported */ + WLC_E_PRUNE_KNOWN_STA = 13 + WLC_E_PRUNE_REASON_OFFSET, /* AP is already known to us as a STA */ + WLC_E_PRUNE_CCXFAST_DROAM = 14 + WLC_E_PRUNE_REASON_OFFSET, /* CCX FAST ROAM: prune unqualified AP */ + WLC_E_PRUNE_WDS_PEER = 15 + WLC_E_PRUNE_REASON_OFFSET, /* AP is already known to us as a WDS peer */ + WLC_E_PRUNE_QBSS_LOAD = 16 + WLC_E_PRUNE_REASON_OFFSET, /* QBSS LOAD - AAC is too low */ + WLC_E_PRUNE_HOME_AP = 17 + WLC_E_PRUNE_REASON_OFFSET, /* prune home AP */ + WLC_E_PRUNE_AP_BLOCKED = 18 + WLC_E_PRUNE_REASON_OFFSET, /* prune blocked AP */ + WLC_E_PRUNE_NO_DIAG_SUPPORT = 19 + WLC_E_PRUNE_REASON_OFFSET, /* prune due to diagnostic mode not supported */ /* WPA failure reason codes carried in the WLC_E_PSK_SUP event */ - WLC_E_SUP_OTHER = 0 + WLC_E_SUP_REASON_OFFSET, /** Other reason */ - WLC_E_SUP_DECRYPT_KEY_DATA = 1 + WLC_E_SUP_REASON_OFFSET, /** Decryption of key data failed */ - WLC_E_SUP_BAD_UCAST_WEP128 = 2 + WLC_E_SUP_REASON_OFFSET, /** Illegal use of ucast WEP128 */ - WLC_E_SUP_BAD_UCAST_WEP40 = 3 + WLC_E_SUP_REASON_OFFSET, /** Illegal use of ucast WEP40 */ - WLC_E_SUP_UNSUP_KEY_LEN = 4 + WLC_E_SUP_REASON_OFFSET, /** Unsupported key length */ - WLC_E_SUP_PW_KEY_CIPHER = 5 + WLC_E_SUP_REASON_OFFSET, /** Unicast cipher mismatch in pairwise key */ - WLC_E_SUP_MSG3_TOO_MANY_IE = 6 + WLC_E_SUP_REASON_OFFSET, /** WPA IE contains > 1 RSN IE in key msg 3 */ - WLC_E_SUP_MSG3_IE_MISMATCH = 7 + WLC_E_SUP_REASON_OFFSET, /** WPA IE mismatch in key message 3 */ - WLC_E_SUP_NO_INSTALL_FLAG = 8 + WLC_E_SUP_REASON_OFFSET, /** INSTALL flag unset in 4-way msg */ - WLC_E_SUP_MSG3_NO_GTK = 9 + WLC_E_SUP_REASON_OFFSET, /** encapsulated GTK missing from msg 3 */ - WLC_E_SUP_GRP_KEY_CIPHER = 10 + WLC_E_SUP_REASON_OFFSET, /** Multicast cipher mismatch in group key */ - WLC_E_SUP_GRP_MSG1_NO_GTK = 11 + WLC_E_SUP_REASON_OFFSET, /** encapsulated GTK missing from group msg 1 */ - WLC_E_SUP_GTK_DECRYPT_FAIL = 12 + WLC_E_SUP_REASON_OFFSET, /** GTK decrypt failure */ - WLC_E_SUP_SEND_FAIL = 13 + WLC_E_SUP_REASON_OFFSET, /** message send failure */ - WLC_E_SUP_DEAUTH = 14 + WLC_E_SUP_REASON_OFFSET, /** received FC_DEAUTH */ - WLC_E_SUP_WPA_PSK_TMO = 15 + WLC_E_SUP_REASON_OFFSET, /** WPA PSK 4-way handshake timeout */ + + WLC_E_SUP_OTHER = 0 + WLC_E_SUP_REASON_OFFSET, /* Other reason */ + WLC_E_SUP_DECRYPT_KEY_DATA = 1 + WLC_E_SUP_REASON_OFFSET, /* Decryption of key data failed */ + WLC_E_SUP_BAD_UCAST_WEP128 = 2 + WLC_E_SUP_REASON_OFFSET, /* Illegal use of ucast WEP128 */ + WLC_E_SUP_BAD_UCAST_WEP40 = 3 + WLC_E_SUP_REASON_OFFSET, /* Illegal use of ucast WEP40 */ + WLC_E_SUP_UNSUP_KEY_LEN = 4 + WLC_E_SUP_REASON_OFFSET, /* Unsupported key length */ + WLC_E_SUP_PW_KEY_CIPHER = 5 + WLC_E_SUP_REASON_OFFSET, /* Unicast cipher mismatch in pairwise key */ + WLC_E_SUP_MSG3_TOO_MANY_IE = 6 + WLC_E_SUP_REASON_OFFSET, /* WPA IE contains > 1 RSN IE in key msg 3 */ + WLC_E_SUP_MSG3_IE_MISMATCH = 7 + WLC_E_SUP_REASON_OFFSET, /* WPA IE mismatch in key message 3 */ + WLC_E_SUP_NO_INSTALL_FLAG = 8 + WLC_E_SUP_REASON_OFFSET, /* INSTALL flag unset in 4-way msg */ + WLC_E_SUP_MSG3_NO_GTK = 9 + WLC_E_SUP_REASON_OFFSET, /* encapsulated GTK missing from msg 3 */ + WLC_E_SUP_GRP_KEY_CIPHER = 10 + WLC_E_SUP_REASON_OFFSET, /* Multicast cipher mismatch in group key */ + WLC_E_SUP_GRP_MSG1_NO_GTK = 11 + WLC_E_SUP_REASON_OFFSET, /* encapsulated GTK missing from group msg 1 */ + WLC_E_SUP_GTK_DECRYPT_FAIL = 12 + WLC_E_SUP_REASON_OFFSET, /* GTK decrypt failure */ + WLC_E_SUP_SEND_FAIL = 13 + WLC_E_SUP_REASON_OFFSET, /* message send failure */ + WLC_E_SUP_DEAUTH = 14 + WLC_E_SUP_REASON_OFFSET, /* received FC_DEAUTH */ + WLC_E_SUP_WPA_PSK_TMO = 15 + WLC_E_SUP_REASON_OFFSET, /* WPA PSK 4-way handshake timeout */ DOT11_RC_RESERVED = 0 + WLC_E_DOT11_RC_REASON_OFFSET, /* d11 RC reserved */ DOT11_RC_UNSPECIFIED = 1 + WLC_E_DOT11_RC_REASON_OFFSET, /* Unspecified reason */ @@ -3005,7 +3051,7 @@ typedef enum DOT11_RC_TIMEOUT = 39 + WLC_E_DOT11_RC_REASON_OFFSET, /* timeout */ DOT11_RC_MAX = 23 + WLC_E_DOT11_RC_REASON_OFFSET, /* Reason codes > 23 are reserved */ - WLC_E_REASON_FORCE_32_BIT = 0x7FFFFFFE /** Force enum to be stored in 32 bit variable */ + WLC_E_REASON_FORCE_32_BIT = 0x7FFFFFFE /* Force enum to be stored in 32 bit variable */ } wl_event_reason_t; #endif /* __DRIVERS_WIRELESS_IEEE80211_BCMF_IOCTL_H */ diff --git a/drivers/wireless/ieee80211/bcmf_sdio.c b/drivers/wireless/ieee80211/bcmf_sdio.c index f7440f0131f..256795af084 100644 --- a/drivers/wireless/ieee80211/bcmf_sdio.c +++ b/drivers/wireless/ieee80211/bcmf_sdio.c @@ -594,7 +594,7 @@ int bcmf_transfer_bytes(FAR struct bcmf_sdio_dev_s *sbus, bool write, /* Use block mode */ blocklen = 64; - nblocks = (len+63) / 64; + nblocks = (len + 63) / 64; } else {