brcm80211: fmac: fix firmware shared structures version

Some shared structures in fullmac have a wrong combination of
version number and declarations. This patch fixes it by upgrading
them to the latest version. This allows brcmfmac to support new
firmwares with new features.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index b68d1363105c5ca10aff59c8855aa5fe98214d4e..ed60f4d6962785a598cdb71cc2832e42da28fd16 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -87,7 +87,7 @@
 #define TOE_TX_CSUM_OL         0x00000001
 #define TOE_RX_CSUM_OL         0x00000002
 
-#define        BRCMF_BSS_INFO_VERSION  108 /* curr ver of brcmf_bss_info_le struct */
+#define        BRCMF_BSS_INFO_VERSION  109 /* curr ver of brcmf_bss_info_le struct */
 
 /* size of brcmf_scan_params not including variable length array */
 #define BRCMF_SCAN_PARAMS_FIXED_SIZE 64

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
index a527d5d4cc4ec98d30108b3352e233a6569309cb..ebd53aa7202bcff86ad480a00ca7a6bbea395ae8 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
@@ -58,7 +58,7 @@ struct brcmf_proto_cdc_dcmd {
  * Used on data packets to convey priority across USB.
  */
 #define        BDC_HEADER_LEN          4
-#define BDC_PROTO_VER          1       /* Protocol version */
+#define BDC_PROTO_VER          2       /* Protocol version */
 #define BDC_FLAG_VER_MASK      0xf0    /* Protocol version mask */
 #define BDC_FLAG_VER_SHIFT     4       /* Protocol version shift */
 #define BDC_FLAG_SUM_GOOD      0x04    /* Good RX checksums */
@@ -77,7 +77,7 @@ struct brcmf_proto_bdc_header {
        u8 flags;
        u8 priority;    /* 802.1d Priority, 4:7 flow control info for usb */
        u8 flags2;
-       u8 rssi;
+       u8 data_offset;
 };
 
 
@@ -372,7 +372,7 @@ void brcmf_proto_hdrpush(struct brcmf_pub *drvr, int ifidx,
 
        h->priority = (pktbuf->priority & BDC_PRIORITY_MASK);
        h->flags2 = 0;
-       h->rssi = 0;
+       h->data_offset = 0;
        BDC_SET_IF_IDX(h, ifidx);
 }