diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index ea83bc03b69..fce61ed2ab0 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -15,11 +15,10 @@ struct _LEADER {
 } __packed;
 typedef struct _LEADER LEADER, *PLEADER;
 
-struct _PACKETTOSEND {
+struct bcm_packettosend {
 	LEADER	Leader;
 	UCHAR	ucPayload;
 } __packed;
-typedef struct _PACKETTOSEND PACKETTOSEND, *PPACKETTOSEND;
 
 struct bcm_control_packet {
 	PVOID	ControlBuff;
diff --git a/drivers/staging/bcm/Macros.h b/drivers/staging/bcm/Macros.h
index 8238cdba7a0..7c03cce5eed 100644
--- a/drivers/staging/bcm/Macros.h
+++ b/drivers/staging/bcm/Macros.h
@@ -109,10 +109,10 @@
 #define LEADER_STATUS         0x00
 #define LEADER_STATUS_TCP_ACK 0x1
 #define LEADER_SIZE           sizeof(LEADER)
-#define MAC_ADDR_REQ_SIZE     sizeof(PACKETTOSEND)
-#define SS_INFO_REQ_SIZE      sizeof(PACKETTOSEND)
+#define MAC_ADDR_REQ_SIZE     sizeof(struct bcm_packettosend)
+#define SS_INFO_REQ_SIZE      sizeof(struct bcm_packettosend)
 #define CM_REQUEST_SIZE       (LEADER_SIZE + sizeof(stLocalSFChangeRequest))
-#define IDLE_REQ_SIZE         sizeof(PACKETTOSEND)
+#define IDLE_REQ_SIZE         sizeof(struct bcm_packettosend)
 
 
 #define MAX_TRANSFER_CTRL_BYTE_USB (2*1024)