From bfb7cc5cd2b899fccd5e40dba870e49224a98447 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Sun, 3 Mar 2013 12:45:26 +0100
Subject: [PATCH] --- yaml --- r: 368367 b: refs/heads/master c:
 bee1b848877b9e4512bdda480f73cda12b593e2f h: refs/heads/master i:   368365:
 5b478caa923bf4976da908814b63a96dd31778f1   368363:
 29d27412a522d7f56f9e49d1890a90b70f9bf9e6   368359:
 2e7d0a9183f99c4b898d431f3220115e0260e32c   368351:
 1557b293ef6e832f74052a5f76a787b1eaaef438 v: v3

---
 [refs]                                          |  2 +-
 .../net/wireless/brcm80211/brcmfmac/dhd_cdc.c   | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 87ddf3b52242..e6efb80a8a7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc7bdbf1ae939d74485569db285971274f4d8fea
+refs/heads/master: bee1b848877b9e4512bdda480f73cda12b593e2f
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
index a2354d951dd7..81e1be7051ca 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
@@ -71,13 +71,26 @@ struct brcmf_proto_cdc_dcmd {
 	((hdr)->flags2 = (((hdr)->flags2 & ~BDC_FLAG2_IF_MASK) | \
 	((idx) << BDC_FLAG2_IF_SHIFT)))
 
+/**
+ * struct brcmf_proto_bdc_header - BDC header format
+ *
+ * @flags: flags contain protocol and checksum info.
+ * @priority: 802.1d priority and USB flow control info (bit 4:7).
+ * @flags2: additional flags containing dongle interface index.
+ * @data_offset: start of packet data. header is following by firmware signals.
+ */
 struct brcmf_proto_bdc_header {
 	u8 flags;
-	u8 priority;	/* 802.1d Priority, 4:7 flow control info for usb */
+	u8 priority;
 	u8 flags2;
 	u8 data_offset;
 };
 
+/*
+ * maximum length of firmware signal data between
+ * the BDC header and packet data in the tx path.
+ */
+#define BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES	12
 
 #define RETRIES 2 /* # of retries to retrieve matching dcmd response */
 #define BUS_HEADER_LEN	(16+64)		/* Must be atleast SDPCM_RESERVE
@@ -350,7 +363,7 @@ int brcmf_proto_attach(struct brcmf_pub *drvr)
 	}
 
 	drvr->prot = cdc;
-	drvr->hdrlen += BDC_HEADER_LEN;
+	drvr->hdrlen += BDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES;
 	drvr->bus_if->maxctl = BRCMF_DCMD_MAXLEN +
 			sizeof(struct brcmf_proto_cdc_dcmd) + ROUND_UP_MARGIN;
 	return 0;