Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e40aed06 authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

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: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d76d1c8c

drivers/net/wireless/brcm80211/brcmfmac/dhd.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,7 @@ 
#define TOE_TX_CSUM_OL		0x00000001

#define TOE_TX_CSUM_OL		0x00000001

#define TOE_RX_CSUM_OL		0x00000002

#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 */

/* size of brcmf_scan_params not including variable length array */

#define BRCMF_SCAN_PARAMS_FIXED_SIZE 64

#define BRCMF_SCAN_PARAMS_FIXED_SIZE 64

drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ struct brcmf_proto_cdc_dcmd { 
 * Used on data packets to convey priority across USB.

 * Used on data packets to convey priority across USB.

 */

 */

#define	BDC_HEADER_LEN		4

#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_MASK	0xf0	/* Protocol version mask */

#define BDC_FLAG_VER_SHIFT	4	/* Protocol version shift */

#define BDC_FLAG_VER_SHIFT	4	/* Protocol version shift */

#define BDC_FLAG_SUM_GOOD	0x04	/* Good RX checksums */

#define BDC_FLAG_SUM_GOOD	0x04	/* Good RX checksums */
@@ -77,7 +77,7 @@ struct brcmf_proto_bdc_header { 
	u8 flags;

	u8 flags;

	u8 priority;	/* 802.1d Priority, 4:7 flow control info for usb */

	u8 priority;	/* 802.1d Priority, 4:7 flow control info for usb */

	u8 flags2;

	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->priority = (pktbuf->priority & BDC_PRIORITY_MASK);

	h->flags2 = 0;

	h->flags2 = 0;

	h->rssi = 0;

	h->data_offset = 0;

	BDC_SET_IF_IDX(h, ifidx);

	BDC_SET_IF_IDX(h, ifidx);

}

}