Merge tag 'char-misc-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[deliverable/linux.git] / drivers / net / wireless / brcm80211 / brcmfmac / fwil.h

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwil.h b/drivers/net/wireless/brcm80211/brcmfmac/fwil.h
index a30be683f4a15eff78c0fa2a5133ed176b4962a0..5434dcf64f7d8012206975ed743fe96145b924fb 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/fwil.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwil.h
@@ -43,6 +43,8 @@
 #define BRCMF_C_SET_RADIO                      38
 #define BRCMF_C_GET_PHYTYPE                    39
 #define BRCMF_C_SET_KEY                                45
+#define BRCMF_C_GET_REGULATORY                 46
+#define BRCMF_C_SET_REGULATORY                 47
 #define BRCMF_C_SET_PASSIVE_SCAN               49
 #define BRCMF_C_SCAN                           50
 #define BRCMF_C_SCAN_RESULTS                   51
@@ -57,9 +59,12 @@
 #define BRCMF_C_SET_COUNTRY                    84
 #define BRCMF_C_GET_PM                         85
 #define BRCMF_C_SET_PM                         86
+#define BRCMF_C_GET_REVINFO                    98
 #define BRCMF_C_GET_CURR_RATESET               114
 #define BRCMF_C_GET_AP                         117
 #define BRCMF_C_SET_AP                         118
+#define BRCMF_C_SET_SCB_AUTHORIZE              121
+#define BRCMF_C_SET_SCB_DEAUTHORIZE            122
 #define BRCMF_C_GET_RSSI                       127
 #define BRCMF_C_GET_WSEC                       133
 #define BRCMF_C_SET_WSEC                       134