diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-02-12 19:52:04 +0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-12 19:52:11 +0400 |
| commit | 94d2f0ba052150a6d7217aeb836f5a709d1cadda (patch) | |
| tree | 821df4458c8168253f9435894441e2d666f9f3e1 /drivers/net/wireless/brcm80211/brcmfmac/fweh.h | |
| parent | 5360cfb2bcbdd7a906cf290036bd406985973e88 (diff) | |
| parent | 8457703f1e86aaf0f134402dd1e09e1f13e65222 (diff) | |
| download | linux-94d2f0ba052150a6d7217aeb836f5a709d1cadda.tar.xz | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/fweh.h')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fweh.h b/drivers/net/wireless/brcm80211/brcmfmac/fweh.h index 36901f76a3b5..8c39b51dcccf 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/fweh.h +++ b/drivers/net/wireless/brcm80211/brcmfmac/fweh.h @@ -83,6 +83,7 @@ struct brcmf_event; BRCMF_ENUM_DEF(MULTICAST_DECODE_ERROR, 51) \ BRCMF_ENUM_DEF(TRACE, 52) \ BRCMF_ENUM_DEF(IF, 54) \ + BRCMF_ENUM_DEF(P2P_DISC_LISTEN_COMPLETE, 55) \ BRCMF_ENUM_DEF(RSSI, 56) \ BRCMF_ENUM_DEF(PFN_SCAN_COMPLETE, 57) \ BRCMF_ENUM_DEF(EXTLOG_MSG, 58) \ @@ -96,8 +97,11 @@ struct brcmf_event; BRCMF_ENUM_DEF(DFS_AP_RESUME, 66) \ BRCMF_ENUM_DEF(ESCAN_RESULT, 69) \ BRCMF_ENUM_DEF(ACTION_FRAME_OFF_CHAN_COMPLETE, 70) \ + BRCMF_ENUM_DEF(PROBERESP_MSG, 71) \ + BRCMF_ENUM_DEF(P2P_PROBEREQ_MSG, 72) \ BRCMF_ENUM_DEF(DCS_REQUEST, 73) \ - BRCMF_ENUM_DEF(FIFO_CREDIT_MAP, 74) + BRCMF_ENUM_DEF(FIFO_CREDIT_MAP, 74) \ + BRCMF_ENUM_DEF(ACTION_FRAME_RX, 75) #define BRCMF_ENUM_DEF(id, val) \ BRCMF_E_##id = (val), |