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_types.h

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h b/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
index 50891c02c4c162640acca7dc44ed56aec27b7385..3749209651088b0c21beef1bbff9d240a475775f 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
@@ -112,6 +112,7 @@
 #define BRCMF_WOWL_MAXPATTERNS         8
 #define BRCMF_WOWL_MAXPATTERNSIZE      128
 
+#define BRCMF_COUNTRY_BUF_SZ           4
 
 /* join preference types for join_pref iovar */
 enum brcmf_join_pref_types {
@@ -525,4 +526,58 @@ struct brcmf_mbss_ssid_le {
        unsigned char SSID[32];
 };
 
+/**
+ * struct brcmf_fil_country_le - country configuration structure.
+ *
+ * @country_abbrev: null-terminated country code used in the country IE.
+ * @rev: revision specifier for ccode. on set, -1 indicates unspecified.
+ * @ccode: null-terminated built-in country code.
+ */
+struct brcmf_fil_country_le {
+       char country_abbrev[BRCMF_COUNTRY_BUF_SZ];
+       __le32 rev;
+       char ccode[BRCMF_COUNTRY_BUF_SZ];
+};
+
+/**
+ * struct brcmf_rev_info_le - device revision info.
+ *
+ * @vendorid: PCI vendor id.
+ * @deviceid: device id of chip.
+ * @radiorev: radio revision.
+ * @chiprev: chip revision.
+ * @corerev: core revision.
+ * @boardid: board identifier (usu. PCI sub-device id).
+ * @boardvendor: board vendor (usu. PCI sub-vendor id).
+ * @boardrev: board revision.
+ * @driverrev: driver version.
+ * @ucoderev: microcode version.
+ * @bus: bus type.
+ * @chipnum: chip number.
+ * @phytype: phy type.
+ * @phyrev: phy revision.
+ * @anarev: anacore rev.
+ * @chippkg: chip package info.
+ * @nvramrev: nvram revision number.
+ */
+struct brcmf_rev_info_le {
+       __le32 vendorid;
+       __le32 deviceid;
+       __le32 radiorev;
+       __le32 chiprev;
+       __le32 corerev;
+       __le32 boardid;
+       __le32 boardvendor;
+       __le32 boardrev;
+       __le32 driverrev;
+       __le32 ucoderev;
+       __le32 bus;
+       __le32 chipnum;
+       __le32 phytype;
+       __le32 phyrev;
+       __le32 anarev;
+       __le32 chippkg;
+       __le32 nvramrev;
+};
+
 #endif /* FWIL_TYPES_H_ */