--- drivers/net/wireless/bcmdhd/include/bcmsdpcm.h

+++ drivers/net/wireless/bcmdhd/include/bcmsdpcm.h

@@ -22,7 +22,7 @@

* software in any way with any other Broadcom software provided under a license

* other than the GPL, without Broadcom's express prior written consent.

*

- * $Id: bcmsdpcm.h 291086 2011-10-21 01:17:24Z $

+ * $Id: bcmsdpcm.h 362722 2012-10-12 23:55:55Z $

*/

#ifndef _bcmsdpcm_h_

@@ -146,16 +146,23 @@

#define SDPCM_GLOMDESC(p) (((uint8 *)p)[1] & 0x80)

/* For TEST_CHANNEL packets, define another 4-byte header */

-#define SDPCM_TEST_HDRLEN 4 /* Generally: Cmd(1), Ext(1), Len(2);

- * Semantics of Ext byte depend on command.

- * Len is current or requested frame length, not

- * including test header; sent little-endian.

- */

-#define SDPCM_TEST_DISCARD 0x01 /* Receiver discards. Ext is a pattern id. */

-#define SDPCM_TEST_ECHOREQ 0x02 /* Echo request. Ext is a pattern id. */

-#define SDPCM_TEST_ECHORSP 0x03 /* Echo response. Ext is a pattern id. */

-#define SDPCM_TEST_BURST 0x04 /* Receiver to send a burst. Ext is a frame count */

-#define SDPCM_TEST_SEND 0x05 /* Receiver sets send mode. Ext is boolean on/off */

+#define SDPCM_TEST_HDRLEN 4 /* Generally: Cmd(1), Ext(1), Len(2);

+ * Semantics of Ext byte depend on command.

+ * Len is current or requested frame length, not

+ * including test header; sent little-endian.

+ */

+#define SDPCM_TEST_PKT_CNT_FLD_LEN 4 /* Packet count filed legth */

+#define SDPCM_TEST_DISCARD 0x01 /* Receiver discards. Ext is a pattern id. */

+#define SDPCM_TEST_ECHOREQ 0x02 /* Echo request. Ext is a pattern id. */

+#define SDPCM_TEST_ECHORSP 0x03 /* Echo response. Ext is a pattern id. */

+#define SDPCM_TEST_BURST 0x04 /* Receiver to send a burst. Ext is a frame count

+ * (Backward compatabilty) Set frame count in a

+ * 4 byte filed adjacent to the HDR

+ */

+#define SDPCM_TEST_SEND 0x05 /* Receiver sets send mode. Ext is boolean on/off

+ * Set frame count in a 4 byte filed adjacent to

+ * the HDR

+ */

/* Handy macro for filling in datagen packets with a pattern */

#define SDPCM_TEST_FILL(byteno, id) ((uint8)(id + byteno))