aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/bcm/CmHost.c10
-rw-r--r--drivers/staging/bcm/IPv6Protocol.c2
-rw-r--r--drivers/staging/bcm/InterfaceDld.c4
-rw-r--r--drivers/staging/bcm/InterfaceTx.c2
4 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 8ec1dd175eba..cc91b5e934aa 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -837,7 +837,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
837 UINT nCurClassifierCnt; 837 UINT nCurClassifierCnt;
838 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); 838 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
839 839
840 pstAddIndication = (struct bcm_add_indication_alt *)pvBuffer; 840 pstAddIndication = pvBuffer;
841 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "======>"); 841 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "======>");
842 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8Type: 0x%X", pstAddIndication->u8Type); 842 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8Type: 0x%X", pstAddIndication->u8Type);
843 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8Direction: 0x%X", pstAddIndication->u8Direction); 843 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8Direction: 0x%X", pstAddIndication->u8Direction);
@@ -1339,14 +1339,14 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
1339 UINT uiSearchRuleIndex; 1339 UINT uiSearchRuleIndex;
1340 ULONG ulSFID; 1340 ULONG ulSFID;
1341 1341
1342 pstAddIndicationAlt = (struct bcm_add_indication_alt *)(pvBuffer); 1342 pstAddIndicationAlt = pvBuffer;
1343 1343
1344 /* 1344 /*
1345 * In case of DSD Req By MS, we should immediately delete this SF so that 1345 * In case of DSD Req By MS, we should immediately delete this SF so that
1346 * we can stop the further classifying the pkt for this SF. 1346 * we can stop the further classifying the pkt for this SF.
1347 */ 1347 */
1348 if (pstAddIndicationAlt->u8Type == DSD_REQ) { 1348 if (pstAddIndicationAlt->u8Type == DSD_REQ) {
1349 pstDeletionRequest = (struct bcm_del_request *)pvBuffer; 1349 pstDeletionRequest = pvBuffer;
1350 1350
1351 ulSFID = ntohl(pstDeletionRequest->u32SFID); 1351 ulSFID = ntohl(pstDeletionRequest->u32SFID);
1352 uiSearchRuleIndex = SearchSfid(Adapter, ulSFID); 1352 uiSearchRuleIndex = SearchSfid(Adapter, ulSFID);
@@ -1452,12 +1452,12 @@ static inline struct bcm_add_indication_alt
1452 struct bcm_add_indication *pstAddIndication = NULL; 1452 struct bcm_add_indication *pstAddIndication = NULL;
1453 struct bcm_add_indication_alt *pstAddIndicationDest = NULL; 1453 struct bcm_add_indication_alt *pstAddIndicationDest = NULL;
1454 1454
1455 pstAddIndication = (struct bcm_add_indication *)(pvBuffer); 1455 pstAddIndication = pvBuffer;
1456 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "=====>"); 1456 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "=====>");
1457 if ((pstAddIndication->u8Type == DSD_REQ) || 1457 if ((pstAddIndication->u8Type == DSD_REQ) ||
1458 (pstAddIndication->u8Type == DSD_RSP) || 1458 (pstAddIndication->u8Type == DSD_RSP) ||
1459 (pstAddIndication->u8Type == DSD_ACK)) 1459 (pstAddIndication->u8Type == DSD_ACK))
1460 return (struct bcm_add_indication_alt *)pvBuffer; 1460 return pvBuffer;
1461 1461
1462 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Inside RestoreCmControlResponseMessage "); 1462 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Inside RestoreCmControlResponseMessage ");
1463 /* 1463 /*
diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c
index f48c9c42fb13..cd160670e028 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -192,7 +192,7 @@ USHORT IpVersion6(struct bcm_mini_adapter *Adapter, PVOID pcIpHeader,
192 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG, 192 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG,
193 DBG_LVL_ALL, "IpVersion6 ==========>\n"); 193 DBG_LVL_ALL, "IpVersion6 ==========>\n");
194 194
195 pstIpv6Header = (struct bcm_ipv6_hdr *)pcIpHeader; 195 pstIpv6Header = pcIpHeader;
196 196
197 DumpIpv6Header(pstIpv6Header); 197 DumpIpv6Header(pstIpv6Header);
198 198
diff --git a/drivers/staging/bcm/InterfaceDld.c b/drivers/staging/bcm/InterfaceDld.c
index d02b7d67c854..463bdee9dfca 100644
--- a/drivers/staging/bcm/InterfaceDld.c
+++ b/drivers/staging/bcm/InterfaceDld.c
@@ -6,7 +6,7 @@ int InterfaceFileDownload(PVOID arg, struct file *flp, unsigned int on_chip_loc)
6 mm_segment_t oldfs = {0}; 6 mm_segment_t oldfs = {0};
7 int errno = 0, len = 0; /* ,is_config_file = 0 */ 7 int errno = 0, len = 0; /* ,is_config_file = 0 */
8 loff_t pos = 0; 8 loff_t pos = 0;
9 struct bcm_interface_adapter *psIntfAdapter = (struct bcm_interface_adapter *)arg; 9 struct bcm_interface_adapter *psIntfAdapter = arg;
10 /* struct bcm_mini_adapter *Adapter = psIntfAdapter->psAdapter; */ 10 /* struct bcm_mini_adapter *Adapter = psIntfAdapter->psAdapter; */
11 char *buff = kmalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL); 11 char *buff = kmalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL);
12 12
@@ -61,7 +61,7 @@ int InterfaceFileReadbackFromChip(PVOID arg, struct file *flp, unsigned int on_c
61 loff_t pos = 0; 61 loff_t pos = 0;
62 static int fw_down; 62 static int fw_down;
63 INT Status = STATUS_SUCCESS; 63 INT Status = STATUS_SUCCESS;
64 struct bcm_interface_adapter *psIntfAdapter = (struct bcm_interface_adapter *)arg; 64 struct bcm_interface_adapter *psIntfAdapter = arg;
65 int bytes; 65 int bytes;
66 66
67 buff = kmalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_DMA); 67 buff = kmalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_DMA);
diff --git a/drivers/staging/bcm/InterfaceTx.c b/drivers/staging/bcm/InterfaceTx.c
index 3457954d0982..b9c2784e9811 100644
--- a/drivers/staging/bcm/InterfaceTx.c
+++ b/drivers/staging/bcm/InterfaceTx.c
@@ -184,7 +184,7 @@ int InterfaceTransmitPacket(PVOID arg, PVOID data, UINT len)
184{ 184{
185 struct bcm_usb_tcb *pTcb= NULL; 185 struct bcm_usb_tcb *pTcb= NULL;
186 186
187 struct bcm_interface_adapter *psIntfAdapter = (struct bcm_interface_adapter *)arg; 187 struct bcm_interface_adapter *psIntfAdapter = arg;
188 pTcb= GetBulkOutTcb(psIntfAdapter); 188 pTcb= GetBulkOutTcb(psIntfAdapter);
189 if(pTcb == NULL) 189 if(pTcb == NULL)
190 { 190 {