diff options
Diffstat (limited to 'drivers/net/wireless/bcmdhd/bcmevent.c')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/bcmevent.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/net/wireless/bcmdhd/bcmevent.c b/drivers/net/wireless/bcmdhd/bcmevent.c index 6a25d9a5a57..3d805d0b838 100644 --- a/drivers/net/wireless/bcmdhd/bcmevent.c +++ b/drivers/net/wireless/bcmdhd/bcmevent.c @@ -1,9 +1,9 @@ /* * bcmevent read-only data shared by kernel or app layers * - * Copyright (C) 1999-2011, Broadcom Corporation + * Copyright (C) 1999-2012, Broadcom Corporation * - * Unless you and Broadcom execute a separate written software license + * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), * available at http://www.broadcom.com/licenses/GPLv2.php, with the @@ -20,7 +20,7 @@ * Notwithstanding the above, under no circumstances may you combine this * software in any way with any other Broadcom software provided under a license * other than the GPL, without Broadcom's express prior written consent. - * $Id: bcmevent.c,v 1.8.2.7 2011-02-01 06:23:39 $ + * $Id: bcmevent.c 300516 2011-12-04 17:39:44Z $ */ #include <typedefs.h> @@ -29,7 +29,7 @@ #include <proto/bcmeth.h> #include <proto/bcmevent.h> -#if WLC_E_LAST != 87 +#if WLC_E_LAST != 89 #error "You need to add an entry to bcmevent_names[] for the new event" #endif @@ -83,7 +83,9 @@ const bcmevent_name_t bcmevent_names[] = { { WLC_E_UNICAST_DECODE_ERROR, "UNICAST_DECODE_ERROR" }, { WLC_E_MULTICAST_DECODE_ERROR, "MULTICAST_DECODE_ERROR" }, { WLC_E_TRACE, "TRACE" }, +#ifdef WLBTAMP { WLC_E_BTA_HCI_EVENT, "BTA_HCI_EVENT" }, +#endif { WLC_E_IF, "IF" }, #ifdef WLP2P { WLC_E_P2P_DISC_LISTEN_COMPLETE, "WLC_E_P2P_DISC_LISTEN_COMPLETE" }, @@ -96,6 +98,10 @@ const bcmevent_name_t bcmevent_names[] = { { WLC_E_ACTION_FRAME_RX, "ACTION_FRAME_RX" }, { WLC_E_ACTION_FRAME_COMPLETE, "ACTION_FRAME_COMPLETE" }, #endif +#ifdef BCMWAPI_WAI + { WLC_E_WAI_STA_EVENT, "WAI_STA_EVENT" }, + { WLC_E_WAI_MSG, "WAI_MSG" }, +#endif /* BCMWAPI_WAI */ { WLC_E_ESCAN_RESULT, "WLC_E_ESCAN_RESULT" }, { WLC_E_ACTION_FRAME_OFF_CHAN_COMPLETE, "WLC_E_AF_OFF_CHAN_COMPLETE" }, #ifdef WLP2P @@ -112,7 +118,7 @@ const bcmevent_name_t bcmevent_names[] = { { WLC_E_HTSFSYNC, "HTSF_SYNC_EVENT" }, #endif { WLC_E_OVERLAY_REQ, "OVERLAY_REQ_EVENT" }, - { WLC_E_CSA_COMPLETE_IND, "WLC_E_CSA_COMPLETE_IND" }, + { WLC_E_CSA_COMPLETE_IND, "WLC_E_CSA_COMPLETE_IND"}, { WLC_E_EXCESS_PM_WAKE_EVENT, "EXCESS_PM_WAKE_EVENT" }, { WLC_E_PFN_SCAN_NONE, "PFN_SCAN_NONE" }, { WLC_E_PFN_SCAN_ALLGONE, "PFN_SCAN_ALLGONE" }, @@ -123,5 +129,4 @@ const bcmevent_name_t bcmevent_names[] = { { WLC_E_ASSOC_RESP_IE, "ASSOC_RESP_IE" } }; - const int bcmevent_names_size = ARRAYSIZE(bcmevent_names); |