aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/bcm
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-11-01 09:35:21 -0400
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-11-01 09:35:21 -0400
commit082e889b475c46e71be6e779f15ab095f888e03f (patch)
tree77d984b6528f589c7cde533fbe60cbd45cb34601 /drivers/staging/bcm
parentc5113e3c111b03c8eaf3fb0ef39e33dc25171adc (diff)
beceem: remove OS wrapper library
Use native kernel functions for kmalloc/kfree directly Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Diffstat (limited to 'drivers/staging/bcm')
-rw-r--r--drivers/staging/bcm/Arp.c2
-rw-r--r--drivers/staging/bcm/Bcmchar.c68
-rw-r--r--drivers/staging/bcm/CmHost.c24
-rw-r--r--drivers/staging/bcm/HandleControlPacket.c4
-rw-r--r--drivers/staging/bcm/InterfaceDld.c24
-rw-r--r--drivers/staging/bcm/InterfaceInit.c2
-rw-r--r--drivers/staging/bcm/InterfaceRx.c2
-rw-r--r--drivers/staging/bcm/Makefile2
-rw-r--r--drivers/staging/bcm/Misc.c51
-rw-r--r--drivers/staging/bcm/Osal_Misc.c27
-rw-r--r--drivers/staging/bcm/PHSModule.c131
-rw-r--r--drivers/staging/bcm/Prototypes.h4
-rw-r--r--drivers/staging/bcm/Qos.c4
-rw-r--r--drivers/staging/bcm/Transmit.c8
-rw-r--r--drivers/staging/bcm/headers.h1
-rw-r--r--drivers/staging/bcm/hostmibs.c4
-rw-r--r--drivers/staging/bcm/led_control.c7
-rw-r--r--drivers/staging/bcm/nvm.c105
-rw-r--r--drivers/staging/bcm/osal_misc.h49
19 files changed, 180 insertions, 339 deletions
diff --git a/drivers/staging/bcm/Arp.c b/drivers/staging/bcm/Arp.c
index d60d8593d2e..7cb25b30b5c 100644
--- a/drivers/staging/bcm/Arp.c
+++ b/drivers/staging/bcm/Arp.c
@@ -50,7 +50,7 @@ reply_to_arp_request(struct sk_buff *skb)
50 { 50 {
51 if(memcmp(pethhdr->h_source, Adapter->dev->dev_addr, ETH_ALEN)) 51 if(memcmp(pethhdr->h_source, Adapter->dev->dev_addr, ETH_ALEN))
52 { 52 {
53 bcm_kfree_skb(skb); 53 dev_kfree_skb(skb);
54 return; 54 return;
55 } 55 }
56 } 56 }
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 01f961d9c70..f9979a87c42 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -93,7 +93,7 @@ static int bcm_char_release(struct inode *inode, struct file *filp)
93 /*Stop Queuing the control response Packets*/ 93 /*Stop Queuing the control response Packets*/
94 atomic_dec(&Adapter->ApplicationRunning); 94 atomic_dec(&Adapter->ApplicationRunning);
95 95
96 bcm_kfree(pTarang); 96 kfree(pTarang);
97 97
98 /* remove this filp from the asynchronously notified filp's */ 98 /* remove this filp from the asynchronously notified filp's */
99 filp->private_data = NULL; 99 filp->private_data = NULL;
@@ -141,12 +141,12 @@ static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size, l
141 PktLen = Packet->len; 141 PktLen = Packet->len;
142 if(copy_to_user(buf, Packet->data, PktLen)) 142 if(copy_to_user(buf, Packet->data, PktLen))
143 { 143 {
144 bcm_kfree_skb(Packet); 144 dev_kfree_skb(Packet);
145 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "\nReturning from copy to user failure \n"); 145 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "\nReturning from copy to user failure \n");
146 return -EFAULT; 146 return -EFAULT;
147 } 147 }
148 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Read %d Bytes From Adapter packet = 0x%p by process %d!\n", PktLen, Packet, current->pid); 148 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Read %d Bytes From Adapter packet = 0x%p by process %d!\n", PktLen, Packet, current->pid);
149 bcm_kfree_skb(Packet); 149 dev_kfree_skb(Packet);
150 } 150 }
151 151
152 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "<====\n"); 152 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "<====\n");
@@ -239,7 +239,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
239 (PUINT)temp_buff, Bufflen); 239 (PUINT)temp_buff, Bufflen);
240 if(Status != STATUS_SUCCESS) 240 if(Status != STATUS_SUCCESS)
241 { 241 {
242 bcm_kfree(temp_buff); 242 kfree(temp_buff);
243 return Status; 243 return Status;
244 } 244 }
245 if(copy_to_user(IoBuffer.OutputBuffer, 245 if(copy_to_user(IoBuffer.OutputBuffer,
@@ -247,7 +247,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
247 { 247 {
248 Status = -EFAULT; 248 Status = -EFAULT;
249 } 249 }
250 bcm_kfree(temp_buff); 250 kfree(temp_buff);
251 break; 251 break;
252 } 252 }
253 case IOCTL_BCM_REGISTER_WRITE_PRIVATE: 253 case IOCTL_BCM_REGISTER_WRITE_PRIVATE:
@@ -344,7 +344,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
344 (PUINT)temp_buff, IoBuffer.OutputLength); 344 (PUINT)temp_buff, IoBuffer.OutputLength);
345 if(Status != STATUS_SUCCESS) 345 if(Status != STATUS_SUCCESS)
346 { 346 {
347 bcm_kfree(temp_buff); 347 kfree(temp_buff);
348 return Status; 348 return Status;
349 } 349 }
350 if(copy_to_user(IoBuffer.OutputBuffer, 350 if(copy_to_user(IoBuffer.OutputBuffer,
@@ -352,7 +352,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
352 { 352 {
353 Status = -EFAULT; 353 Status = -EFAULT;
354 } 354 }
355 bcm_kfree(temp_buff); 355 kfree(temp_buff);
356 break; 356 break;
357 } 357 }
358 case IOCTL_BCM_REGISTER_WRITE: 358 case IOCTL_BCM_REGISTER_WRITE:
@@ -796,7 +796,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
796 IoBuffer.InputLength)) 796 IoBuffer.InputLength))
797 { 797 {
798 Status = -EFAULT; 798 Status = -EFAULT;
799 bcm_kfree(pvBuffer); 799 kfree(pvBuffer);
800 break; 800 break;
801 } 801 }
802 802
@@ -816,7 +816,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
816 Status = CopyBufferToControlPacket(Adapter, (PVOID)pvBuffer); 816 Status = CopyBufferToControlPacket(Adapter, (PVOID)pvBuffer);
817 cntrlEnd: 817 cntrlEnd:
818 up(&Adapter->LowPowerModeSync); 818 up(&Adapter->LowPowerModeSync);
819 bcm_kfree(pvBuffer); 819 kfree(pvBuffer);
820 break; 820 break;
821 } 821 }
822 case IOCTL_BCM_BUFFER_DOWNLOAD_START: 822 case IOCTL_BCM_BUFFER_DOWNLOAD_START:
@@ -924,7 +924,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
924 if(Status != STATUS_SUCCESS) 924 if(Status != STATUS_SUCCESS)
925 up(&Adapter->fw_download_sema); 925 up(&Adapter->fw_download_sema);
926 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, OSAL_DBG, DBG_LVL_ALL, "IOCTL: Firmware File Uploaded\n"); 926 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, OSAL_DBG, DBG_LVL_ALL, "IOCTL: Firmware File Uploaded\n");
927 bcm_kfree(psFwInfo); 927 kfree(psFwInfo);
928 break; 928 break;
929 } 929 }
930 case IOCTL_BCM_BUFFER_DOWNLOAD_STOP: 930 case IOCTL_BCM_BUFFER_DOWNLOAD_STOP:
@@ -1193,11 +1193,11 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1193 sizeof(S_MIBS_HOST_STATS_MIBS))) 1193 sizeof(S_MIBS_HOST_STATS_MIBS)))
1194 { 1194 {
1195 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy to user failed\n"); 1195 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Copy to user failed\n");
1196 bcm_kfree(temp_buff); 1196 kfree(temp_buff);
1197 return -EFAULT; 1197 return -EFAULT;
1198 } 1198 }
1199 1199
1200 bcm_kfree(temp_buff); 1200 kfree(temp_buff);
1201 break; 1201 break;
1202 } 1202 }
1203 1203
@@ -1246,7 +1246,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1246 /* Get WrmBuffer structure */ 1246 /* Get WrmBuffer structure */
1247 if(copy_from_user(pvBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength)) 1247 if(copy_from_user(pvBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
1248 { 1248 {
1249 bcm_kfree(pvBuffer); 1249 kfree(pvBuffer);
1250 Status = -EFAULT; 1250 Status = -EFAULT;
1251 break; 1251 break;
1252 } 1252 }
@@ -1256,7 +1256,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1256 if(((ULONG)pBulkBuffer->Register & 0x0F000000) != 0x0F000000 || 1256 if(((ULONG)pBulkBuffer->Register & 0x0F000000) != 0x0F000000 ||
1257 ((ULONG)pBulkBuffer->Register & 0x3)) 1257 ((ULONG)pBulkBuffer->Register & 0x3))
1258 { 1258 {
1259 bcm_kfree(pvBuffer); 1259 kfree(pvBuffer);
1260 BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0,"WRM Done On invalid Address : %x Access Denied.\n",(int)pBulkBuffer->Register); 1260 BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0,"WRM Done On invalid Address : %x Access Denied.\n",(int)pBulkBuffer->Register);
1261 Status = -EINVAL; 1261 Status = -EINVAL;
1262 break; 1262 break;
@@ -1271,7 +1271,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1271 (uiTempVar == EEPROM_REJECT_REG_4)) && 1271 (uiTempVar == EEPROM_REJECT_REG_4)) &&
1272 (cmd == IOCTL_BCM_REGISTER_WRITE)) 1272 (cmd == IOCTL_BCM_REGISTER_WRITE))
1273 { 1273 {
1274 bcm_kfree(pvBuffer); 1274 kfree(pvBuffer);
1275 BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0,"EEPROM Access Denied, not in VSG Mode\n"); 1275 BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0,"EEPROM Access Denied, not in VSG Mode\n");
1276 Status = -EFAULT; 1276 Status = -EFAULT;
1277 break; 1277 break;
@@ -1287,7 +1287,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1287 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "WRM Failed\n"); 1287 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "WRM Failed\n");
1288 } 1288 }
1289 1289
1290 bcm_kfree(pvBuffer); 1290 kfree(pvBuffer);
1291 break; 1291 break;
1292 } 1292 }
1293 1293
@@ -1486,7 +1486,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1486 stNVMReadWrite.uiNumBytes)) 1486 stNVMReadWrite.uiNumBytes))
1487 { 1487 {
1488 Status = -EFAULT; 1488 Status = -EFAULT;
1489 bcm_kfree(pReadData); 1489 kfree(pReadData);
1490 break; 1490 break;
1491 } 1491 }
1492 1492
@@ -1501,7 +1501,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1501 { 1501 {
1502 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n"); 1502 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n");
1503 up(&Adapter->NVMRdmWrmLock); 1503 up(&Adapter->NVMRdmWrmLock);
1504 bcm_kfree(pReadData); 1504 kfree(pReadData);
1505 return -EACCES; 1505 return -EACCES;
1506 } 1506 }
1507 1507
@@ -1512,13 +1512,13 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1512 1512
1513 if(Status != STATUS_SUCCESS) 1513 if(Status != STATUS_SUCCESS)
1514 { 1514 {
1515 bcm_kfree(pReadData); 1515 kfree(pReadData);
1516 return Status; 1516 return Status;
1517 } 1517 }
1518 if(copy_to_user(stNVMReadWrite.pBuffer, 1518 if(copy_to_user(stNVMReadWrite.pBuffer,
1519 pReadData, (UINT)stNVMReadWrite.uiNumBytes)) 1519 pReadData, (UINT)stNVMReadWrite.uiNumBytes))
1520 { 1520 {
1521 bcm_kfree(pReadData); 1521 kfree(pReadData);
1522 Status = -EFAULT; 1522 Status = -EFAULT;
1523 } 1523 }
1524 } 1524 }
@@ -1533,7 +1533,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1533 { 1533 {
1534 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n"); 1534 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n");
1535 up(&Adapter->NVMRdmWrmLock); 1535 up(&Adapter->NVMRdmWrmLock);
1536 bcm_kfree(pReadData); 1536 kfree(pReadData);
1537 return -EACCES; 1537 return -EACCES;
1538 } 1538 }
1539 1539
@@ -1561,7 +1561,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1561 { 1561 {
1562 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"DSD Sig is present neither in Flash nor User provided Input.."); 1562 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"DSD Sig is present neither in Flash nor User provided Input..");
1563 up(&Adapter->NVMRdmWrmLock); 1563 up(&Adapter->NVMRdmWrmLock);
1564 bcm_kfree(pReadData); 1564 kfree(pReadData);
1565 return Status; 1565 return Status;
1566 } 1566 }
1567 1567
@@ -1570,7 +1570,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1570 { 1570 {
1571 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"DSD Sig is present neither in Flash nor User provided Input.."); 1571 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"DSD Sig is present neither in Flash nor User provided Input..");
1572 up(&Adapter->NVMRdmWrmLock); 1572 up(&Adapter->NVMRdmWrmLock);
1573 bcm_kfree(pReadData); 1573 kfree(pReadData);
1574 return Status; 1574 return Status;
1575 } 1575 }
1576 } 1576 }
@@ -1587,7 +1587,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1587 1587
1588 if(Status != STATUS_SUCCESS) 1588 if(Status != STATUS_SUCCESS)
1589 { 1589 {
1590 bcm_kfree(pReadData); 1590 kfree(pReadData);
1591 return Status; 1591 return Status;
1592 } 1592 }
1593 } 1593 }
@@ -1595,7 +1595,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1595 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, " timetaken by Write/read :%ld msec\n",(tv1.tv_sec - tv0.tv_sec)*1000 +(tv1.tv_usec - tv0.tv_usec)/1000); 1595 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, " timetaken by Write/read :%ld msec\n",(tv1.tv_sec - tv0.tv_sec)*1000 +(tv1.tv_usec - tv0.tv_usec)/1000);
1596 1596
1597 1597
1598 bcm_kfree(pReadData); 1598 kfree(pReadData);
1599 Status = STATUS_SUCCESS; 1599 Status = STATUS_SUCCESS;
1600 } 1600 }
1601 break; 1601 break;
@@ -1666,7 +1666,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1666 { 1666 {
1667 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n"); 1667 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n");
1668 up(&Adapter->NVMRdmWrmLock); 1668 up(&Adapter->NVMRdmWrmLock);
1669 bcm_kfree(pReadBuff); 1669 kfree(pReadBuff);
1670 return -EACCES; 1670 return -EACCES;
1671 } 1671 }
1672 1672
@@ -1706,7 +1706,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1706 1706
1707 } 1707 }
1708 up(&Adapter->NVMRdmWrmLock); 1708 up(&Adapter->NVMRdmWrmLock);
1709 bcm_kfree(pReadBuff); 1709 kfree(pReadBuff);
1710 1710
1711 } 1711 }
1712 break ; 1712 break ;
@@ -1799,7 +1799,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1799 { 1799 {
1800 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n"); 1800 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n");
1801 up(&Adapter->NVMRdmWrmLock); 1801 up(&Adapter->NVMRdmWrmLock);
1802 bcm_kfree(pWriteBuff); 1802 kfree(pWriteBuff);
1803 return -EACCES; 1803 return -EACCES;
1804 } 1804 }
1805 1805
@@ -1838,7 +1838,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1838 } while(NOB > 0); 1838 } while(NOB > 0);
1839 BcmFlash2xWriteSig(Adapter,sFlash2xWrite.Section); 1839 BcmFlash2xWriteSig(Adapter,sFlash2xWrite.Section);
1840 up(&Adapter->NVMRdmWrmLock); 1840 up(&Adapter->NVMRdmWrmLock);
1841 bcm_kfree(pWriteBuff); 1841 kfree(pWriteBuff);
1842 } 1842 }
1843 break ; 1843 break ;
1844 case IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP : 1844 case IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP :
@@ -1874,7 +1874,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1874 { 1874 {
1875 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n"); 1875 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n");
1876 up(&Adapter->NVMRdmWrmLock); 1876 up(&Adapter->NVMRdmWrmLock);
1877 bcm_kfree(psFlash2xBitMap); 1877 kfree(psFlash2xBitMap);
1878 return -EACCES; 1878 return -EACCES;
1879 } 1879 }
1880 1880
@@ -1884,10 +1884,10 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1884 if(Status) 1884 if(Status)
1885 { 1885 {
1886 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "copying Flash2x bitMap failed"); 1886 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "copying Flash2x bitMap failed");
1887 bcm_kfree(psFlash2xBitMap); 1887 kfree(psFlash2xBitMap);
1888 return -EFAULT; 1888 return -EFAULT;
1889 } 1889 }
1890 bcm_kfree(psFlash2xBitMap); 1890 kfree(psFlash2xBitMap);
1891 } 1891 }
1892 break ; 1892 break ;
1893 case IOCTL_BCM_SET_ACTIVE_SECTION : 1893 case IOCTL_BCM_SET_ACTIVE_SECTION :
@@ -2214,7 +2214,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
2214 (Adapter->bPreparingForLowPowerMode ==TRUE)) 2214 (Adapter->bPreparingForLowPowerMode ==TRUE))
2215 { 2215 {
2216 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n"); 2216 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Device is in Idle/Shutdown Mode\n");
2217 bcm_kfree(pReadBuff); 2217 kfree(pReadBuff);
2218 up(&Adapter->NVMRdmWrmLock); 2218 up(&Adapter->NVMRdmWrmLock);
2219 return -EACCES; 2219 return -EACCES;
2220 } 2220 }
@@ -2254,7 +2254,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
2254 } 2254 }
2255 Adapter->bFlashRawRead = FALSE ; 2255 Adapter->bFlashRawRead = FALSE ;
2256 up(&Adapter->NVMRdmWrmLock); 2256 up(&Adapter->NVMRdmWrmLock);
2257 bcm_kfree(pReadBuff); 2257 kfree(pReadBuff);
2258 break ; 2258 break ;
2259 } 2259 }
2260 2260
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 6f388a374dd..dadfff00f83 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -985,7 +985,7 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter, /**<Pointer to the A
985 985
986 if(Adapter->PackInfo[uiSearchRuleIndex].pstSFIndication) 986 if(Adapter->PackInfo[uiSearchRuleIndex].pstSFIndication)
987 { 987 {
988 bcm_kfree(Adapter->PackInfo[uiSearchRuleIndex].pstSFIndication); 988 kfree(Adapter->PackInfo[uiSearchRuleIndex].pstSFIndication);
989 Adapter->PackInfo[uiSearchRuleIndex].pstSFIndication = NULL; 989 Adapter->PackInfo[uiSearchRuleIndex].pstSFIndication = NULL;
990 } 990 }
991 Adapter->PackInfo[uiSearchRuleIndex].pstSFIndication = pstAddIndication; 991 Adapter->PackInfo[uiSearchRuleIndex].pstSFIndication = pstAddIndication;
@@ -1844,7 +1844,7 @@ ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter,PVOID pvBuffer,UINT *p
1844 1844
1845 (*puBufferLength) = sizeof(stLocalSFAddIndication); 1845 (*puBufferLength) = sizeof(stLocalSFAddIndication);
1846 *(stLocalSFAddIndication *)pvBuffer = *pstAddIndication; 1846 *(stLocalSFAddIndication *)pvBuffer = *pstAddIndication;
1847 bcm_kfree(pstAddIndication); 1847 kfree(pstAddIndication);
1848 return 1; 1848 return 1;
1849} 1849}
1850 1850
@@ -1931,7 +1931,7 @@ static inline stLocalSFAddIndicationAlt
1931 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "============================================================"); 1931 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "============================================================");
1932 return pstAddIndicationDest; 1932 return pstAddIndicationDest;
1933failed_restore_sf_param: 1933failed_restore_sf_param:
1934 bcm_kfree(pstAddIndicationDest); 1934 kfree(pstAddIndicationDest);
1935 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "<=====" ); 1935 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "<=====" );
1936 return NULL; 1936 return NULL;
1937} 1937}
@@ -2049,7 +2049,7 @@ INT FreeAdapterDsxBuffer(PMINI_ADAPTER Adapter)
2049{ 2049{
2050 if(Adapter->caDsxReqResp) 2050 if(Adapter->caDsxReqResp)
2051 { 2051 {
2052 bcm_kfree(Adapter->caDsxReqResp); 2052 kfree(Adapter->caDsxReqResp);
2053 } 2053 }
2054 return 0; 2054 return 0;
2055 2055
@@ -2102,7 +2102,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adap
2102 2102
2103 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, " VCID = %x", ntohs(pstAddIndication->u16VCID)); 2103 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, " VCID = %x", ntohs(pstAddIndication->u16VCID));
2104 CopyBufferToControlPacket(Adapter,(PVOID)Adapter->caDsxReqResp); 2104 CopyBufferToControlPacket(Adapter,(PVOID)Adapter->caDsxReqResp);
2105 bcm_kfree(pstAddIndication); 2105 kfree(pstAddIndication);
2106 } 2106 }
2107 break; 2107 break;
2108 case DSA_RSP: 2108 case DSA_RSP:
@@ -2169,7 +2169,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adap
2169 Adapter->PackInfo[uiSearchRuleIndex].bActive=FALSE; 2169 Adapter->PackInfo[uiSearchRuleIndex].bActive=FALSE;
2170 Adapter->PackInfo[uiSearchRuleIndex].bValid=FALSE; 2170 Adapter->PackInfo[uiSearchRuleIndex].bValid=FALSE;
2171 Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value=0; 2171 Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value=0;
2172 bcm_kfree(pstAddIndication); 2172 kfree(pstAddIndication);
2173 } 2173 }
2174 2174
2175 else if(psfLocalSet->bValid && (pstAddIndication->u8CC == 0)) 2175 else if(psfLocalSet->bValid && (pstAddIndication->u8CC == 0))
@@ -2218,13 +2218,13 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adap
2218 Adapter->PackInfo[uiSearchRuleIndex].bActive=FALSE; 2218 Adapter->PackInfo[uiSearchRuleIndex].bActive=FALSE;
2219 Adapter->PackInfo[uiSearchRuleIndex].bValid=FALSE; 2219 Adapter->PackInfo[uiSearchRuleIndex].bValid=FALSE;
2220 Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value=0; 2220 Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value=0;
2221 bcm_kfree(pstAddIndication); 2221 kfree(pstAddIndication);
2222 } 2222 }
2223 } 2223 }
2224 else 2224 else
2225 { 2225 {
2226 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_PRINTK, 0, 0, "DSA ACK did not get valid SFID"); 2226 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_PRINTK, 0, 0, "DSA ACK did not get valid SFID");
2227 bcm_kfree(pstAddIndication); 2227 kfree(pstAddIndication);
2228 return FALSE; 2228 return FALSE;
2229 } 2229 }
2230 } 2230 }
@@ -2239,7 +2239,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adap
2239 ((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_RSP; 2239 ((stLocalSFChangeIndicationAlt*)&(Adapter->caDsxReqResp[LEADER_SIZE]))->u8Type = DSC_RSP;
2240 2240
2241 CopyBufferToControlPacket(Adapter,(PVOID)Adapter->caDsxReqResp); 2241 CopyBufferToControlPacket(Adapter,(PVOID)Adapter->caDsxReqResp);
2242 bcm_kfree(pstAddIndication); 2242 kfree(pstAddIndication);
2243 } 2243 }
2244 break; 2244 break;
2245 case DSC_RSP: 2245 case DSC_RSP:
@@ -2312,13 +2312,13 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adap
2312 else if(pstChangeIndication->u8CC == 6) 2312 else if(pstChangeIndication->u8CC == 6)
2313 { 2313 {
2314 deleteSFBySfid(Adapter,uiSearchRuleIndex); 2314 deleteSFBySfid(Adapter,uiSearchRuleIndex);
2315 bcm_kfree(pstAddIndication); 2315 kfree(pstAddIndication);
2316 } 2316 }
2317 } 2317 }
2318 else 2318 else
2319 { 2319 {
2320 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_PRINTK, 0, 0, "DSC ACK did not get valid SFID"); 2320 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_PRINTK, 0, 0, "DSC ACK did not get valid SFID");
2321 bcm_kfree(pstAddIndication); 2321 kfree(pstAddIndication);
2322 return FALSE; 2322 return FALSE;
2323 } 2323 }
2324 } 2324 }
@@ -2355,7 +2355,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adap
2355 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "DSD ACK Rcd, let App handle it\n"); 2355 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "DSD ACK Rcd, let App handle it\n");
2356 break; 2356 break;
2357 default: 2357 default:
2358 bcm_kfree(pstAddIndication); 2358 kfree(pstAddIndication);
2359 return FALSE ; 2359 return FALSE ;
2360 } 2360 }
2361 return TRUE; 2361 return TRUE;
diff --git a/drivers/staging/bcm/HandleControlPacket.c b/drivers/staging/bcm/HandleControlPacket.c
index 5dd88f98caa..8cfccaa3803 100644
--- a/drivers/staging/bcm/HandleControlPacket.c
+++ b/drivers/staging/bcm/HandleControlPacket.c
@@ -134,7 +134,7 @@ VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, /**<Pointer to the Adapter
134 } 134 }
135 up(&Adapter->RxAppControlQueuelock); 135 up(&Adapter->RxAppControlQueuelock);
136 wake_up(&Adapter->process_read_wait_queue); 136 wake_up(&Adapter->process_read_wait_queue);
137 bcm_kfree_skb(skb); 137 dev_kfree_skb(skb);
138 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "After wake_up_interruptible"); 138 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "After wake_up_interruptible");
139} 139}
140 140
@@ -231,7 +231,7 @@ INT flushAllAppQ(void)
231 { 231 {
232 PacketToDrop=pTarang->RxAppControlHead; 232 PacketToDrop=pTarang->RxAppControlHead;
233 DEQUEUEPACKET(pTarang->RxAppControlHead,pTarang->RxAppControlTail); 233 DEQUEUEPACKET(pTarang->RxAppControlHead,pTarang->RxAppControlTail);
234 bcm_kfree_skb(PacketToDrop); 234 dev_kfree_skb(PacketToDrop);
235 } 235 }
236 pTarang->AppCtrlQueueLen = 0; 236 pTarang->AppCtrlQueueLen = 0;
237 //dropped contrl packet statistics also should be reset. 237 //dropped contrl packet statistics also should be reset.
diff --git a/drivers/staging/bcm/InterfaceDld.c b/drivers/staging/bcm/InterfaceDld.c
index 62770e042e5..e640b75e7dc 100644
--- a/drivers/staging/bcm/InterfaceDld.c
+++ b/drivers/staging/bcm/InterfaceDld.c
@@ -48,7 +48,7 @@ int InterfaceFileDownload( PVOID arg,
48 on_chip_loc+=MAX_TRANSFER_CTRL_BYTE_USB; 48 on_chip_loc+=MAX_TRANSFER_CTRL_BYTE_USB;
49 }/* End of for(;;)*/ 49 }/* End of for(;;)*/
50 50
51 bcm_kfree(buff); 51 kfree(buff);
52 return errno; 52 return errno;
53} 53}
54 54
@@ -69,8 +69,8 @@ int InterfaceFileReadbackFromChip( PVOID arg,
69 buff_readback=(PCHAR)kmalloc(MAX_TRANSFER_CTRL_BYTE_USB , GFP_DMA); 69 buff_readback=(PCHAR)kmalloc(MAX_TRANSFER_CTRL_BYTE_USB , GFP_DMA);
70 if(!buff || !buff_readback) 70 if(!buff || !buff_readback)
71 { 71 {
72 bcm_kfree(buff); 72 kfree(buff);
73 bcm_kfree(buff_readback); 73 kfree(buff_readback);
74 74
75 return -ENOMEM; 75 return -ENOMEM;
76 } 76 }
@@ -137,8 +137,8 @@ int InterfaceFileReadbackFromChip( PVOID arg,
137 on_chip_loc+=MAX_TRANSFER_CTRL_BYTE_USB; 137 on_chip_loc+=MAX_TRANSFER_CTRL_BYTE_USB;
138 }/* End of while(1)*/ 138 }/* End of while(1)*/
139exit: 139exit:
140 bcm_kfree(buff); 140 kfree(buff);
141 bcm_kfree(buff_readback); 141 kfree(buff_readback);
142 return Status; 142 return Status;
143} 143}
144 144
@@ -164,7 +164,7 @@ static int bcm_download_config_file(PMINI_ADAPTER Adapter,
164 psFwInfo->pvMappedFirmwareAddress, psFwInfo->u32FirmwareLength); 164 psFwInfo->pvMappedFirmwareAddress, psFwInfo->u32FirmwareLength);
165 if(retval) 165 if(retval)
166 { 166 {
167 bcm_kfree (Adapter->pstargetparams); 167 kfree(Adapter->pstargetparams);
168 Adapter->pstargetparams = NULL; 168 Adapter->pstargetparams = NULL;
169 return -EFAULT; 169 return -EFAULT;
170 } 170 }
@@ -261,7 +261,7 @@ static int bcm_download_buffer(PMINI_ADAPTER Adapter,
261 u32FirmwareLength -= len; 261 u32FirmwareLength -= len;
262 mappedbuffer +=len; 262 mappedbuffer +=len;
263 } 263 }
264 bcm_kfree(buff); 264 kfree(buff);
265 return retval; 265 return retval;
266} 266}
267#endif 267#endif
@@ -313,7 +313,7 @@ static int bcm_buffer_readback(PMINI_ADAPTER Adapter,
313 GFP_KERNEL); 313 GFP_KERNEL);
314 if(NULL == readbackbuff) 314 if(NULL == readbackbuff)
315 { 315 {
316 bcm_kfree(buff); 316 kfree(buff);
317 return -ENOMEM; 317 return -ENOMEM;
318 } 318 }
319 while (u32FirmwareLength && !retval) 319 while (u32FirmwareLength && !retval)
@@ -343,8 +343,8 @@ static int bcm_buffer_readback(PMINI_ADAPTER Adapter,
343 u32FirmwareLength -= len; 343 u32FirmwareLength -= len;
344 mappedbuffer +=len; 344 mappedbuffer +=len;
345 }/* end of while (u32FirmwareLength && !retval) */ 345 }/* end of while (u32FirmwareLength && !retval) */
346 bcm_kfree(buff); 346 kfree(buff);
347 bcm_kfree(readbackbuff); 347 kfree(readbackbuff);
348 return retval; 348 return retval;
349} 349}
350#endif 350#endif
@@ -416,7 +416,7 @@ int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo)
416 } 416 }
417 } 417 }
418error: 418error:
419 bcm_kfree(buff); 419 kfree(buff);
420 return retval; 420 return retval;
421} 421}
422 422
@@ -479,7 +479,7 @@ static INT buffRdbkVerify(PMINI_ADAPTER Adapter,
479 u32FirmwareLength -= len; 479 u32FirmwareLength -= len;
480 mappedbuffer +=len; 480 mappedbuffer +=len;
481 }/* end of while (u32FirmwareLength && !retval) */ 481 }/* end of while (u32FirmwareLength && !retval) */
482 bcm_kfree(readbackbuff); 482 kfree(readbackbuff);
483 return retval; 483 return retval;
484} 484}
485 485
diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c
index f810bfd0b1a..014b06bfbc9 100644
--- a/drivers/staging/bcm/InterfaceInit.c
+++ b/drivers/staging/bcm/InterfaceInit.c
@@ -55,7 +55,7 @@ VOID InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter)
55 { 55 {
56 if (psIntfAdapter->asUsbRcb[i].urb != NULL) 56 if (psIntfAdapter->asUsbRcb[i].urb != NULL)
57 { 57 {
58 bcm_kfree(psIntfAdapter->asUsbRcb[i].urb->transfer_buffer); 58 kfree(psIntfAdapter->asUsbRcb[i].urb->transfer_buffer);
59 usb_free_urb(psIntfAdapter->asUsbRcb[i].urb); 59 usb_free_urb(psIntfAdapter->asUsbRcb[i].urb);
60 psIntfAdapter->asUsbRcb[i].urb = NULL; 60 psIntfAdapter->asUsbRcb[i].urb = NULL;
61 } 61 }
diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c
index 6fee9684f2e..128aa91f743 100644
--- a/drivers/staging/bcm/InterfaceRx.c
+++ b/drivers/staging/bcm/InterfaceRx.c
@@ -173,7 +173,7 @@ static void read_bulk_callback(struct urb *urb)
173 else 173 else
174 { 174 {
175 BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "i/f not up hance freeing SKB..."); 175 BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "i/f not up hance freeing SKB...");
176 bcm_kfree_skb(skb); 176 dev_kfree_skb(skb);
177 } 177 }
178 atomic_inc(&Adapter->GoodRxPktCount); 178 atomic_inc(&Adapter->GoodRxPktCount);
179 for(uiIndex = 0 ; uiIndex < MIBS_MAX_HIST_ENTRIES ; uiIndex++) 179 for(uiIndex = 0 ; uiIndex < MIBS_MAX_HIST_ENTRIES ; uiIndex++)
diff --git a/drivers/staging/bcm/Makefile b/drivers/staging/bcm/Makefile
index 6f6fcee8e4a..0050206b0fc 100644
--- a/drivers/staging/bcm/Makefile
+++ b/drivers/staging/bcm/Makefile
@@ -9,4 +9,4 @@ bcm_wimax-y := InterfaceDld.o InterfaceIdleMode.o InterfaceInit.o InterfaceRx.o
9 Arp.o CmHost.o IPv6Protocol.o Qos.o Transmit.o\ 9 Arp.o CmHost.o IPv6Protocol.o Qos.o Transmit.o\
10 Bcmnet.o DDRInit.o HandleControlPacket.o\ 10 Bcmnet.o DDRInit.o HandleControlPacket.o\
11 LeakyBucket.o Misc.o sort.o Bcmchar.o hostmibs.o PHSModule.o\ 11 LeakyBucket.o Misc.o sort.o Bcmchar.o hostmibs.o PHSModule.o\
12 Osal_Misc.o led_control.o nvm.o vendorspecificextn.o 12 led_control.o nvm.o vendorspecificextn.o
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index 351a8aee88f..a5ce9593dcf 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -132,24 +132,24 @@ VOID AdapterFree(PMINI_ADAPTER Adapter)
132 free_netdev(Adapter->dev); 132 free_netdev(Adapter->dev);
133 if(Adapter->pstargetparams != NULL) 133 if(Adapter->pstargetparams != NULL)
134 { 134 {
135 bcm_kfree(Adapter->pstargetparams); 135 kfree(Adapter->pstargetparams);
136 } 136 }
137 for (count =0;count < MAX_CNTRL_PKTS;count++) 137 for (count =0;count < MAX_CNTRL_PKTS;count++)
138 { 138 {
139 if(Adapter->txctlpacket[count]) 139 if(Adapter->txctlpacket[count])
140 bcm_kfree(Adapter->txctlpacket[count]); 140 kfree(Adapter->txctlpacket[count]);
141 } 141 }
142 FreeAdapterDsxBuffer(Adapter); 142 FreeAdapterDsxBuffer(Adapter);
143 143
144 if(Adapter->pvInterfaceAdapter) 144 if(Adapter->pvInterfaceAdapter)
145 bcm_kfree(Adapter->pvInterfaceAdapter); 145 kfree(Adapter->pvInterfaceAdapter);
146 146
147 //Free the PHS Interface 147 //Free the PHS Interface
148 PhsCleanup(&Adapter->stBCMPhsContext); 148 PhsCleanup(&Adapter->stBCMPhsContext);
149 149
150 BcmDeAllocFlashCSStructure(Adapter); 150 BcmDeAllocFlashCSStructure(Adapter);
151 151
152 bcm_kfree (Adapter); 152 kfree(Adapter);
153 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "<========\n"); 153 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "<========\n");
154} 154}
155 155
@@ -259,25 +259,6 @@ exit_download:
259 return errorno; 259 return errorno;
260} 260}
261 261
262
263void bcm_kfree_skb(struct sk_buff *skb)
264{
265 if(skb)
266 {
267 kfree_skb(skb);
268 }
269 skb = NULL ;
270}
271
272VOID bcm_kfree(VOID *ptr)
273{
274 if(ptr)
275 {
276 kfree(ptr);
277 }
278 ptr = NULL ;
279}
280
281/** 262/**
282@ingroup ctrl_pkt_functions 263@ingroup ctrl_pkt_functions
283This function copies the contents of given buffer 264This function copies the contents of given buffer
@@ -579,7 +560,7 @@ __inline VOID LinkMessage(PMINI_ADAPTER Adapter)
579 { 560 {
580 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "Calling CopyBufferToControlPacket"); 561 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "Calling CopyBufferToControlPacket");
581 CopyBufferToControlPacket(Adapter, pstLinkRequest); 562 CopyBufferToControlPacket(Adapter, pstLinkRequest);
582 bcm_kfree(pstLinkRequest); 563 kfree(pstLinkRequest);
583 } 564 }
584 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "LinkMessage <====="); 565 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "LinkMessage <=====");
585 return; 566 return;
@@ -1292,14 +1273,14 @@ int bcm_parse_target_params(PMINI_ADAPTER Adapter)
1292 if((Adapter->pstargetparams = 1273 if((Adapter->pstargetparams =
1293 kmalloc(sizeof(STARGETPARAMS), GFP_KERNEL)) == NULL) 1274 kmalloc(sizeof(STARGETPARAMS), GFP_KERNEL)) == NULL)
1294 { 1275 {
1295 bcm_kfree(buff); 1276 kfree(buff);
1296 return -ENOMEM; 1277 return -ENOMEM;
1297 } 1278 }
1298 flp=open_firmware_file(Adapter, CFG_FILE); 1279 flp=open_firmware_file(Adapter, CFG_FILE);
1299 if(!flp) { 1280 if(!flp) {
1300 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "NOT ABLE TO OPEN THE %s FILE \n", CFG_FILE); 1281 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "NOT ABLE TO OPEN THE %s FILE \n", CFG_FILE);
1301 bcm_kfree(buff); 1282 kfree(buff);
1302 bcm_kfree(Adapter->pstargetparams); 1283 kfree(Adapter->pstargetparams);
1303 Adapter->pstargetparams = NULL; 1284 Adapter->pstargetparams = NULL;
1304 return -ENOENT; 1285 return -ENOENT;
1305 } 1286 }
@@ -1310,8 +1291,8 @@ int bcm_parse_target_params(PMINI_ADAPTER Adapter)
1310 if(len != sizeof(STARGETPARAMS)) 1291 if(len != sizeof(STARGETPARAMS))
1311 { 1292 {
1312 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL,"Mismatch in Target Param Structure!\n"); 1293 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL,"Mismatch in Target Param Structure!\n");
1313 bcm_kfree(buff); 1294 kfree(buff);
1314 bcm_kfree(Adapter->pstargetparams); 1295 kfree(Adapter->pstargetparams);
1315 Adapter->pstargetparams = NULL; 1296 Adapter->pstargetparams = NULL;
1316 filp_close(flp, current->files); 1297 filp_close(flp, current->files);
1317 return -ENOENT; 1298 return -ENOENT;
@@ -1323,7 +1304,7 @@ int bcm_parse_target_params(PMINI_ADAPTER Adapter)
1323 * Values in Adapter->pstargetparams are in network byte order 1304 * Values in Adapter->pstargetparams are in network byte order
1324 */ 1305 */
1325 memcpy(Adapter->pstargetparams, buff, sizeof(STARGETPARAMS)); 1306 memcpy(Adapter->pstargetparams, buff, sizeof(STARGETPARAMS));
1326 bcm_kfree (buff); 1307 kfree (buff);
1327 beceem_parse_target_struct(Adapter); 1308 beceem_parse_target_struct(Adapter);
1328 return STATUS_SUCCESS; 1309 return STATUS_SUCCESS;
1329} 1310}
@@ -1478,7 +1459,7 @@ static unsigned char *ReadMacAddrEEPROM(PMINI_ADAPTER Adapter, ulong dwAddress)
1478 if(status != STATUS_SUCCESS) 1459 if(status != STATUS_SUCCESS)
1479 { 1460 {
1480 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "wrm Failed..\n"); 1461 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "wrm Failed..\n");
1481 bcm_kfree(pucmacaddr); 1462 kfree(pucmacaddr);
1482 pucmacaddr = NULL; 1463 pucmacaddr = NULL;
1483 goto OUT; 1464 goto OUT;
1484 } 1465 }
@@ -1488,7 +1469,7 @@ static unsigned char *ReadMacAddrEEPROM(PMINI_ADAPTER Adapter, ulong dwAddress)
1488 if(status != STATUS_SUCCESS) 1469 if(status != STATUS_SUCCESS)
1489 { 1470 {
1490 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "rdm Failed..\n"); 1471 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "rdm Failed..\n");
1491 bcm_kfree(pucmacaddr); 1472 kfree(pucmacaddr);
1492 pucmacaddr = NULL; 1473 pucmacaddr = NULL;
1493 goto OUT; 1474 goto OUT;
1494 } 1475 }
@@ -1522,7 +1503,7 @@ INT ReadMacAddressFromEEPROM(PMINI_ADAPTER Adapter)
1522 puMacAddr[4] == 0xFF && puMacAddr[5] == 0xFF)) 1503 puMacAddr[4] == 0xFF && puMacAddr[5] == 0xFF))
1523 { 1504 {
1524 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Invalid Mac Address\n"); 1505 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Invalid Mac Address\n");
1525 bcm_kfree(puMacAddr); 1506 kfree(puMacAddr);
1526 return STATUS_FAILURE; 1507 return STATUS_FAILURE;
1527 } 1508 }
1528 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "The Mac Address received is: \n"); 1509 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "The Mac Address received is: \n");
@@ -1532,7 +1513,7 @@ INT ReadMacAddressFromEEPROM(PMINI_ADAPTER Adapter)
1532 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"%02x ", Adapter->dev->dev_addr[i]); 1513 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"%02x ", Adapter->dev->dev_addr[i]);
1533 } 1514 }
1534 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"\n"); 1515 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"\n");
1535 bcm_kfree(puMacAddr); 1516 kfree(puMacAddr);
1536 } 1517 }
1537 return STATUS_SUCCESS; 1518 return STATUS_SUCCESS;
1538} 1519}
@@ -1980,7 +1961,7 @@ void flush_queue(PMINI_ADAPTER Adapter, UINT iQIndex)
1980 Adapter->PackInfo[iQIndex].uiDroppedCountBytes += PacketToDrop->len; 1961 Adapter->PackInfo[iQIndex].uiDroppedCountBytes += PacketToDrop->len;
1981 Adapter->PackInfo[iQIndex].uiDroppedCountPackets++; 1962 Adapter->PackInfo[iQIndex].uiDroppedCountPackets++;
1982 1963
1983 bcm_kfree_skb(PacketToDrop); 1964 dev_kfree_skb(PacketToDrop);
1984 atomic_dec(&Adapter->TotalPacketCount); 1965 atomic_dec(&Adapter->TotalPacketCount);
1985 atomic_inc(&Adapter->TxDroppedPacketCount); 1966 atomic_inc(&Adapter->TxDroppedPacketCount);
1986 1967
diff --git a/drivers/staging/bcm/Osal_Misc.c b/drivers/staging/bcm/Osal_Misc.c
deleted file mode 100644
index feefd20a529..00000000000
--- a/drivers/staging/bcm/Osal_Misc.c
+++ /dev/null
@@ -1,27 +0,0 @@
1 /*++
2
3 Copyright (c) Beceem Communications Inc.
4
5 Module Name:
6 WIN_Misc.c
7
8 Abstract:
9 Implements the Miscelanneous OS Construts
10 Linked Lists
11 Dispatcher Objects(Events,Semaphores,Spin Locks and the like)
12 Files
13
14 Revision History:
15 Who When What
16 -------- -------- ----------------------------------------------
17 Name Date Created/reviewed/modified
18 Rajeev 24/1/08 Created
19 Notes:
20
21 --*/
22#include "headers.h"
23
24bool OsalMemCompare(void *dest, void *src, UINT len)
25{
26 return (memcmp(src, dest, len));
27}
diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index 8a38cf43e79..e0456b291d6 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -120,15 +120,15 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
120 if(newPacket == NULL) 120 if(newPacket == NULL)
121 return STATUS_FAILURE; 121 return STATUS_FAILURE;
122 122
123 bcm_kfree_skb(Packet); 123 dev_kfree_skb(Packet);
124 *pPacket = Packet = newPacket; 124 *pPacket = Packet = newPacket;
125 pucPHSPktHdrInBuf = Packet->data + BytesToRemove; 125 pucPHSPktHdrInBuf = Packet->data + BytesToRemove;
126 } 126 }
127 127
128 numBytesCompressed = unPhsOldHdrSize - (unPHSNewPktHeaderLen+PHSI_LEN); 128 numBytesCompressed = unPhsOldHdrSize - (unPHSNewPktHeaderLen+PHSI_LEN);
129 129
130 OsalMemMove(pucPHSPktHdrInBuf + numBytesCompressed, pucPHSPktHdrOutBuf, unPHSNewPktHeaderLen + PHSI_LEN); 130 memcpy(pucPHSPktHdrInBuf + numBytesCompressed, pucPHSPktHdrOutBuf, unPHSNewPktHeaderLen + PHSI_LEN);
131 OsalMemMove(Packet->data + numBytesCompressed, Packet->data, BytesToRemove); 131 memcpy(Packet->data + numBytesCompressed, Packet->data, BytesToRemove);
132 skb_pull(Packet, numBytesCompressed); 132 skb_pull(Packet, numBytesCompressed);
133 133
134 return STATUS_SUCCESS; 134 return STATUS_SUCCESS;
@@ -223,7 +223,7 @@ int PHSRecieve(PMINI_ADAPTER Adapter,
223 } 223 }
224 } 224 }
225 225
226 OsalMemMove(packet->data, Adapter->ucaPHSPktRestoreBuf, nStandardPktHdrLen); 226 memcpy(packet->data, Adapter->ucaPHSPktRestoreBuf, nStandardPktHdrLen);
227 } 227 }
228 228
229 return STATUS_SUCCESS; 229 return STATUS_SUCCESS;
@@ -270,15 +270,9 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
270 return -EINVAL; 270 return -EINVAL;
271 271
272 pPhsdeviceExtension->pstServiceFlowPhsRulesTable = 272 pPhsdeviceExtension->pstServiceFlowPhsRulesTable =
273 (S_SERVICEFLOW_TABLE*)OsalMemAlloc(sizeof(S_SERVICEFLOW_TABLE), 273 kzalloc(sizeof(S_SERVICEFLOW_TABLE), GFP_KERNEL);
274 PHS_MEM_TAG);
275 274
276 if(pPhsdeviceExtension->pstServiceFlowPhsRulesTable) 275 if(!pPhsdeviceExtension->pstServiceFlowPhsRulesTable)
277 {
278 OsalZeroMemory(pPhsdeviceExtension->pstServiceFlowPhsRulesTable,
279 sizeof(S_SERVICEFLOW_TABLE));
280 }
281 else
282 { 276 {
283 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nAllocation ServiceFlowPhsRulesTable failed"); 277 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nAllocation ServiceFlowPhsRulesTable failed");
284 return -ENOMEM; 278 return -ENOMEM;
@@ -288,14 +282,8 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
288 for(i=0;i<MAX_SERVICEFLOWS;i++) 282 for(i=0;i<MAX_SERVICEFLOWS;i++)
289 { 283 {
290 S_SERVICEFLOW_ENTRY sServiceFlow = pstServiceFlowTable->stSFList[i]; 284 S_SERVICEFLOW_ENTRY sServiceFlow = pstServiceFlowTable->stSFList[i];
291 sServiceFlow.pstClassifierTable = (S_CLASSIFIER_TABLE*)OsalMemAlloc( 285 sServiceFlow.pstClassifierTable = kzalloc(sizeof(S_CLASSIFIER_TABLE), GFP_KERNEL);
292 sizeof(S_CLASSIFIER_TABLE), PHS_MEM_TAG); 286 if(!sServiceFlow.pstClassifierTable)
293 if(sServiceFlow.pstClassifierTable)
294 {
295 OsalZeroMemory(sServiceFlow.pstClassifierTable,sizeof(S_CLASSIFIER_TABLE));
296 pstServiceFlowTable->stSFList[i].pstClassifierTable = sServiceFlow.pstClassifierTable;
297 }
298 else
299 { 287 {
300 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nAllocation failed"); 288 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nAllocation failed");
301 free_phs_serviceflow_rules(pPhsdeviceExtension-> 289 free_phs_serviceflow_rules(pPhsdeviceExtension->
@@ -305,9 +293,7 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
305 } 293 }
306 } 294 }
307 295
308 296 pPhsdeviceExtension->CompressedTxBuffer = kmalloc(PHS_BUFFER_SIZE, GFP_KERNEL);
309 pPhsdeviceExtension->CompressedTxBuffer =
310 OsalMemAlloc(PHS_BUFFER_SIZE,PHS_MEM_TAG);
311 297
312 if(pPhsdeviceExtension->CompressedTxBuffer == NULL) 298 if(pPhsdeviceExtension->CompressedTxBuffer == NULL)
313 { 299 {
@@ -317,12 +303,11 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter)
317 return -ENOMEM; 303 return -ENOMEM;
318 } 304 }
319 305
320 pPhsdeviceExtension->UnCompressedRxBuffer = 306 pPhsdeviceExtension->UnCompressedRxBuffer = kmalloc(PHS_BUFFER_SIZE, GFP_KERNEL);
321 OsalMemAlloc(PHS_BUFFER_SIZE,PHS_MEM_TAG);
322 if(pPhsdeviceExtension->UnCompressedRxBuffer == NULL) 307 if(pPhsdeviceExtension->UnCompressedRxBuffer == NULL)
323 { 308 {
324 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nAllocation failed"); 309 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nAllocation failed");
325 OsalMemFree(pPhsdeviceExtension->CompressedTxBuffer,PHS_BUFFER_SIZE); 310 kfree(pPhsdeviceExtension->CompressedTxBuffer);
326 free_phs_serviceflow_rules(pPhsdeviceExtension->pstServiceFlowPhsRulesTable); 311 free_phs_serviceflow_rules(pPhsdeviceExtension->pstServiceFlowPhsRulesTable);
327 pPhsdeviceExtension->pstServiceFlowPhsRulesTable = NULL; 312 pPhsdeviceExtension->pstServiceFlowPhsRulesTable = NULL;
328 return -ENOMEM; 313 return -ENOMEM;
@@ -343,16 +328,11 @@ int PhsCleanup(IN PPHS_DEVICE_EXTENSION pPHSDeviceExt)
343 pPHSDeviceExt->pstServiceFlowPhsRulesTable = NULL; 328 pPHSDeviceExt->pstServiceFlowPhsRulesTable = NULL;
344 } 329 }
345 330
346 if(pPHSDeviceExt->CompressedTxBuffer) 331 kfree(pPHSDeviceExt->CompressedTxBuffer);
347 { 332 pPHSDeviceExt->CompressedTxBuffer = NULL;
348 OsalMemFree(pPHSDeviceExt->CompressedTxBuffer,PHS_BUFFER_SIZE); 333
349 pPHSDeviceExt->CompressedTxBuffer = NULL; 334 kfree(pPHSDeviceExt->UnCompressedRxBuffer);
350 } 335 pPHSDeviceExt->UnCompressedRxBuffer = NULL;
351 if(pPHSDeviceExt->UnCompressedRxBuffer)
352 {
353 OsalMemFree(pPHSDeviceExt->UnCompressedRxBuffer,PHS_BUFFER_SIZE);
354 pPHSDeviceExt->UnCompressedRxBuffer = NULL;
355 }
356 336
357 return 0; 337 return 0;
358} 338}
@@ -478,20 +458,12 @@ ULONG PhsDeletePHSRule(IN void* pvContext,IN B_UINT16 uiVcid,IN B_UINT8 u8PHSI)
478 { 458 {
479 if(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].bUsed && pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule) 459 if(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].bUsed && pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule)
480 { 460 {
481 if(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex] 461 if(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule->u8PHSI == u8PHSI) {
482 .pstPhsRule->u8PHSI == u8PHSI) 462 if(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt)
483 { 463 pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt--;
484 if(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule 464 if(0 == pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt)
485 ->u8RefCnt) 465 kfree(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule);
486 pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule 466 memset(&pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex], 0,
487 ->u8RefCnt--;
488 if(0 == pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex]
489 .pstPhsRule->u8RefCnt)
490 OsalMemFree(pstClassifierRulesTable
491 ->stActivePhsRulesList[nClsidIndex].pstPhsRule,
492 sizeof(S_PHS_RULE));
493 OsalZeroMemory(&pstClassifierRulesTable
494 ->stActivePhsRulesList[nClsidIndex],
495 sizeof(S_CLASSIFIER_ENTRY)); 467 sizeof(S_CLASSIFIER_ENTRY));
496 } 468 }
497 } 469 }
@@ -548,10 +520,10 @@ ULONG PhsDeleteClassifierRule(IN void* pvContext,IN B_UINT16 uiVcid ,IN B_UINT16
548 if(pstClassifierEntry->pstPhsRule->u8RefCnt) 520 if(pstClassifierEntry->pstPhsRule->u8RefCnt)
549 pstClassifierEntry->pstPhsRule->u8RefCnt--; 521 pstClassifierEntry->pstPhsRule->u8RefCnt--;
550 if(0==pstClassifierEntry->pstPhsRule->u8RefCnt) 522 if(0==pstClassifierEntry->pstPhsRule->u8RefCnt)
551 OsalMemFree(pstClassifierEntry->pstPhsRule,sizeof(S_PHS_RULE)); 523 kfree(pstClassifierEntry->pstPhsRule);
552 524
553 } 525 }
554 OsalZeroMemory(pstClassifierEntry,sizeof(S_CLASSIFIER_ENTRY)); 526 memset(pstClassifierEntry, 0, sizeof(S_CLASSIFIER_ENTRY));
555 } 527 }
556 528
557 nClsidIndex = GetClassifierEntry(pstServiceFlowEntry->pstClassifierTable, 529 nClsidIndex = GetClassifierEntry(pstServiceFlowEntry->pstClassifierTable,
@@ -559,10 +531,8 @@ ULONG PhsDeleteClassifierRule(IN void* pvContext,IN B_UINT16 uiVcid ,IN B_UINT16
559 531
560 if((nClsidIndex != PHS_INVALID_TABLE_INDEX) && (!pstClassifierEntry->bUnclassifiedPHSRule)) 532 if((nClsidIndex != PHS_INVALID_TABLE_INDEX) && (!pstClassifierEntry->bUnclassifiedPHSRule))
561 { 533 {
562 if(pstClassifierEntry->pstPhsRule) 534 kfree(pstClassifierEntry->pstPhsRule);
563 //Delete the classifier entry 535 memset(pstClassifierEntry, 0, sizeof(S_CLASSIFIER_ENTRY));
564 OsalMemFree(pstClassifierEntry->pstPhsRule,sizeof(S_PHS_RULE));
565 OsalZeroMemory(pstClassifierEntry,sizeof(S_CLASSIFIER_ENTRY));
566 } 536 }
567 } 537 }
568 return lStatus; 538 return lStatus;
@@ -619,14 +589,11 @@ ULONG PhsDeleteSFRules(IN void* pvContext,IN B_UINT16 uiVcid)
619 .pstPhsRule->u8RefCnt--; 589 .pstPhsRule->u8RefCnt--;
620 if(0==pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex] 590 if(0==pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex]
621 .pstPhsRule->u8RefCnt) 591 .pstPhsRule->u8RefCnt)
622 OsalMemFree(pstClassifierRulesTable 592 kfree(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule);
623 ->stActivePhsRulesList[nClsidIndex].pstPhsRule,
624 sizeof(S_PHS_RULE));
625 pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex] 593 pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex]
626 .pstPhsRule = NULL; 594 .pstPhsRule = NULL;
627 } 595 }
628 OsalZeroMemory(&pstClassifierRulesTable 596 memset(&pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex], 0, sizeof(S_CLASSIFIER_ENTRY));
629 ->stActivePhsRulesList[nClsidIndex],sizeof(S_CLASSIFIER_ENTRY));
630 if(pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex].pstPhsRule) 597 if(pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex].pstPhsRule)
631 { 598 {
632 if(pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex] 599 if(pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex]
@@ -635,15 +602,12 @@ ULONG PhsDeleteSFRules(IN void* pvContext,IN B_UINT16 uiVcid)
635 .pstPhsRule->u8RefCnt--; 602 .pstPhsRule->u8RefCnt--;
636 if(0 == pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex] 603 if(0 == pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex]
637 .pstPhsRule->u8RefCnt) 604 .pstPhsRule->u8RefCnt)
638 OsalMemFree(pstClassifierRulesTable 605 kfree(pstClassifierRulesTable
639 ->stOldPhsRulesList[nClsidIndex].pstPhsRule, 606 ->stOldPhsRulesList[nClsidIndex].pstPhsRule);
640 sizeof(S_PHS_RULE));
641 pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex] 607 pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex]
642 .pstPhsRule = NULL; 608 .pstPhsRule = NULL;
643 } 609 }
644 OsalZeroMemory(&pstClassifierRulesTable 610 memset(&pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex], 0, sizeof(S_CLASSIFIER_ENTRY));
645 ->stOldPhsRulesList[nClsidIndex],
646 sizeof(S_CLASSIFIER_ENTRY));
647 } 611 }
648 } 612 }
649 pstServiceFlowEntry->bUsed = FALSE; 613 pstServiceFlowEntry->bUsed = FALSE;
@@ -876,8 +840,7 @@ void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTable)
876 ->u8RefCnt--; 840 ->u8RefCnt--;
877 if(0==pstClassifierRulesTable->stActivePhsRulesList[j].pstPhsRule 841 if(0==pstClassifierRulesTable->stActivePhsRulesList[j].pstPhsRule
878 ->u8RefCnt) 842 ->u8RefCnt)
879 OsalMemFree(pstClassifierRulesTable->stActivePhsRulesList[j]. 843 kfree(pstClassifierRulesTable->stActivePhsRulesList[j].pstPhsRule);
880 pstPhsRule, sizeof(S_PHS_RULE));
881 pstClassifierRulesTable->stActivePhsRulesList[j].pstPhsRule = NULL; 844 pstClassifierRulesTable->stActivePhsRulesList[j].pstPhsRule = NULL;
882 } 845 }
883 if(pstClassifierRulesTable->stOldPhsRulesList[j].pstPhsRule) 846 if(pstClassifierRulesTable->stOldPhsRulesList[j].pstPhsRule)
@@ -888,19 +851,18 @@ void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTable)
888 ->u8RefCnt--; 851 ->u8RefCnt--;
889 if(0==pstClassifierRulesTable->stOldPhsRulesList[j].pstPhsRule 852 if(0==pstClassifierRulesTable->stOldPhsRulesList[j].pstPhsRule
890 ->u8RefCnt) 853 ->u8RefCnt)
891 OsalMemFree(pstClassifierRulesTable->stOldPhsRulesList[j] 854 kfree(pstClassifierRulesTable->stOldPhsRulesList[j].pstPhsRule);
892 .pstPhsRule,sizeof(S_PHS_RULE));
893 pstClassifierRulesTable->stOldPhsRulesList[j].pstPhsRule = NULL; 855 pstClassifierRulesTable->stOldPhsRulesList[j].pstPhsRule = NULL;
894 } 856 }
895 } 857 }
896 OsalMemFree(pstClassifierRulesTable,sizeof(S_CLASSIFIER_TABLE)); 858 kfree(pstClassifierRulesTable);
897 stServiceFlowEntry.pstClassifierTable = pstClassifierRulesTable = NULL; 859 stServiceFlowEntry.pstClassifierTable = pstClassifierRulesTable = NULL;
898 } 860 }
899 } 861 }
900 } 862 }
901 863
902 OsalMemFree(psServiceFlowRulesTable,sizeof(S_SERVICEFLOW_TABLE)); 864 kfree(psServiceFlowRulesTable);
903 psServiceFlowRulesTable = NULL; 865 psServiceFlowRulesTable = NULL;
904} 866}
905 867
906 868
@@ -1102,7 +1064,7 @@ UINT CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid,
1102 if(psPhsRule->u8PHSFLength) 1064 if(psPhsRule->u8PHSFLength)
1103 { 1065 {
1104 //update PHSF 1066 //update PHSF
1105 OsalMemMove(pstClassifierEntry->pstPhsRule->u8PHSF, 1067 memcpy(pstClassifierEntry->pstPhsRule->u8PHSF,
1106 psPhsRule->u8PHSF , MAX_PHS_LENGTHS); 1068 psPhsRule->u8PHSF , MAX_PHS_LENGTHS);
1107 } 1069 }
1108 if(psPhsRule->u8PHSFLength) 1070 if(psPhsRule->u8PHSFLength)
@@ -1114,7 +1076,7 @@ UINT CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid,
1114 if(psPhsRule->u8PHSMLength) 1076 if(psPhsRule->u8PHSMLength)
1115 { 1077 {
1116 //update PHSM 1078 //update PHSM
1117 OsalMemMove(pstClassifierEntry->pstPhsRule->u8PHSM, 1079 memcpy(pstClassifierEntry->pstPhsRule->u8PHSM,
1118 psPhsRule->u8PHSM, MAX_PHS_LENGTHS); 1080 psPhsRule->u8PHSM, MAX_PHS_LENGTHS);
1119 } 1081 }
1120 if(psPhsRule->u8PHSMLength) 1082 if(psPhsRule->u8PHSMLength)
@@ -1234,8 +1196,7 @@ UINT CreateClassifierPHSRule(IN B_UINT16 uiClsId,
1234 { 1196 {
1235 if(psClassifierRules->pstPhsRule == NULL) 1197 if(psClassifierRules->pstPhsRule == NULL)
1236 { 1198 {
1237 psClassifierRules->pstPhsRule = (S_PHS_RULE*)OsalMemAlloc 1199 psClassifierRules->pstPhsRule = kmalloc(sizeof(S_PHS_RULE),GFP_KERNEL);
1238 (sizeof(S_PHS_RULE),PHS_MEM_TAG);
1239 1200
1240 if(NULL == psClassifierRules->pstPhsRule) 1201 if(NULL == psClassifierRules->pstPhsRule)
1241 return ERR_PHSRULE_MEMALLOC_FAIL; 1202 return ERR_PHSRULE_MEMALLOC_FAIL;
@@ -1247,7 +1208,7 @@ UINT CreateClassifierPHSRule(IN B_UINT16 uiClsId,
1247 psClassifierRules->bUnclassifiedPHSRule = psPhsRule->bUnclassifiedPHSRule; 1208 psClassifierRules->bUnclassifiedPHSRule = psPhsRule->bUnclassifiedPHSRule;
1248 1209
1249 /* Update The PHS rule */ 1210 /* Update The PHS rule */
1250 OsalMemMove(psClassifierRules->pstPhsRule, 1211 memcpy(psClassifierRules->pstPhsRule,
1251 psPhsRule, sizeof(S_PHS_RULE)); 1212 psPhsRule, sizeof(S_PHS_RULE));
1252 } 1213 }
1253 else 1214 else
@@ -1289,13 +1250,13 @@ UINT UpdateClassifierPHSRule(IN B_UINT16 uiClsId,
1289 //Step 2.a PHS Rule Does Not Exist .Create New PHS Rule for uiClsId 1250 //Step 2.a PHS Rule Does Not Exist .Create New PHS Rule for uiClsId
1290 if(FALSE == bPHSRuleOrphaned) 1251 if(FALSE == bPHSRuleOrphaned)
1291 { 1252 {
1292 pstClassifierEntry->pstPhsRule = (S_PHS_RULE*)OsalMemAlloc(sizeof(S_PHS_RULE),PHS_MEM_TAG); 1253 pstClassifierEntry->pstPhsRule = kmalloc(sizeof(S_PHS_RULE), GFP_KERNEL);
1293 if(NULL == pstClassifierEntry->pstPhsRule) 1254 if(NULL == pstClassifierEntry->pstPhsRule)
1294 { 1255 {
1295 return ERR_PHSRULE_MEMALLOC_FAIL; 1256 return ERR_PHSRULE_MEMALLOC_FAIL;
1296 } 1257 }
1297 } 1258 }
1298 OsalMemMove(pstClassifierEntry->pstPhsRule, psPhsRule, sizeof(S_PHS_RULE)); 1259 memcpy(pstClassifierEntry->pstPhsRule, psPhsRule, sizeof(S_PHS_RULE));
1299 1260
1300 } 1261 }
1301 else 1262 else
@@ -1304,14 +1265,8 @@ UINT UpdateClassifierPHSRule(IN B_UINT16 uiClsId,
1304 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nTying Classifier to Existing PHS Rule"); 1265 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\nTying Classifier to Existing PHS Rule");
1305 if(bPHSRuleOrphaned) 1266 if(bPHSRuleOrphaned)
1306 { 1267 {
1307 if(pstClassifierEntry->pstPhsRule) 1268 kfree(pstClassifierEntry->pstPhsRule);
1308 {
1309 //Just Free the PHS Rule as Ref Count is Zero
1310 OsalMemFree(pstClassifierEntry->pstPhsRule,sizeof(S_PHS_RULE));
1311 pstClassifierEntry->pstPhsRule = NULL; 1269 pstClassifierEntry->pstPhsRule = NULL;
1312
1313 }
1314
1315 } 1270 }
1316 pstClassifierEntry->pstPhsRule = pstAddPhsRule; 1271 pstClassifierEntry->pstPhsRule = pstAddPhsRule;
1317 1272
diff --git a/drivers/staging/bcm/Prototypes.h b/drivers/staging/bcm/Prototypes.h
index 82738be3ed4..286ea46cd99 100644
--- a/drivers/staging/bcm/Prototypes.h
+++ b/drivers/staging/bcm/Prototypes.h
@@ -11,10 +11,6 @@ VOID StatisticsResponse(PMINI_ADAPTER Adapter,PVOID pvBuffer);
11 11
12VOID IdleModeResponse(PMINI_ADAPTER Adapter,PUINT puiBuffer); 12VOID IdleModeResponse(PMINI_ADAPTER Adapter,PUINT puiBuffer);
13 13
14void bcm_kfree_skb(struct sk_buff *skb);
15VOID bcm_kfree(VOID *ptr);
16
17
18VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, /**<Pointer to the Adapter structure*/ 14VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, /**<Pointer to the Adapter structure*/
19 struct sk_buff *skb); /**<Pointer to the socket buffer*/ 15 struct sk_buff *skb); /**<Pointer to the socket buffer*/
20 16
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index a86a38c33f2..6e406462904 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -407,7 +407,7 @@ VOID PruneQueue(PMINI_ADAPTER Adapter,/**<Pointer to the driver control structur
407 /// update dropped bytes and packets counts 407 /// update dropped bytes and packets counts
408 Adapter->PackInfo[iIndex].uiDroppedCountBytes += PacketToDrop->len; 408 Adapter->PackInfo[iIndex].uiDroppedCountBytes += PacketToDrop->len;
409 Adapter->PackInfo[iIndex].uiDroppedCountPackets++; 409 Adapter->PackInfo[iIndex].uiDroppedCountPackets++;
410 bcm_kfree_skb(PacketToDrop); 410 dev_kfree_skb(PacketToDrop);
411 411
412 } 412 }
413 413
@@ -455,7 +455,7 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter)
455 Adapter->PackInfo[iQIndex].LastTxQueue); 455 Adapter->PackInfo[iQIndex].LastTxQueue);
456 456
457 /* Free the skb */ 457 /* Free the skb */
458 bcm_kfree_skb(PacketToDrop); 458 dev_kfree_skb(PacketToDrop);
459 459
460 /// update current bytes and packets count 460 /// update current bytes and packets count
461 Adapter->PackInfo[iQIndex].uiCurrentBytesOnHost -= uiTotalPacketLength; 461 Adapter->PackInfo[iQIndex].uiCurrentBytesOnHost -= uiTotalPacketLength;
diff --git a/drivers/staging/bcm/Transmit.c b/drivers/staging/bcm/Transmit.c
index 9848a6a95fb..9932d71a6fe 100644
--- a/drivers/staging/bcm/Transmit.c
+++ b/drivers/staging/bcm/Transmit.c
@@ -117,7 +117,7 @@ INT bcm_transmit(struct sk_buff *skb, /**< skb */
117 BCM_DEBUG_PRINT (Adapter, DBG_TYPE_TX, TX_OSAL_DBG, DBG_LVL_ALL, 117 BCM_DEBUG_PRINT (Adapter, DBG_TYPE_TX, TX_OSAL_DBG, DBG_LVL_ALL,
118 "Invalid queue index, dropping pkt\n"); 118 "Invalid queue index, dropping pkt\n");
119 119
120 bcm_kfree_skb(skb); 120 dev_kfree_skb(skb);
121 } 121 }
122 return STATUS_SUCCESS; 122 return STATUS_SUCCESS;
123 } 123 }
@@ -125,7 +125,7 @@ INT bcm_transmit(struct sk_buff *skb, /**< skb */
125 if(Adapter->PackInfo[qindex].uiCurrentPacketsOnHost >= SF_MAX_ALLOWED_PACKETS_TO_BACKUP) 125 if(Adapter->PackInfo[qindex].uiCurrentPacketsOnHost >= SF_MAX_ALLOWED_PACKETS_TO_BACKUP)
126 { 126 {
127 atomic_inc(&Adapter->TxDroppedPacketCount); 127 atomic_inc(&Adapter->TxDroppedPacketCount);
128 bcm_kfree_skb(skb); 128 dev_kfree_skb(skb);
129 return STATUS_SUCCESS; 129 return STATUS_SUCCESS;
130 } 130 }
131 131
@@ -159,7 +159,7 @@ INT bcm_transmit(struct sk_buff *skb, /**< skb */
159 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_OSAL_DBG, DBG_LVL_ALL, "<===="); 159 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_OSAL_DBG, DBG_LVL_ALL, "<====");
160 } 160 }
161 else 161 else
162 bcm_kfree_skb(skb); 162 dev_kfree_skb(skb);
163 163
164 return STATUS_SUCCESS; 164 return STATUS_SUCCESS;
165} 165}
@@ -333,7 +333,7 @@ errExit:
333 } 333 }
334 334
335 335
336 bcm_kfree_skb(Packet); 336 dev_kfree_skb(Packet);
337 return status; 337 return status;
338} 338}
339 339
diff --git a/drivers/staging/bcm/headers.h b/drivers/staging/bcm/headers.h
index b90d8a3e879..d4a200329ba 100644
--- a/drivers/staging/bcm/headers.h
+++ b/drivers/staging/bcm/headers.h
@@ -58,7 +58,6 @@
58#include "Debug.h" 58#include "Debug.h"
59#include "HostMibs.h" 59#include "HostMibs.h"
60#include "IPv6ProtocolHdr.h" 60#include "IPv6ProtocolHdr.h"
61#include "osal_misc.h"
62#include "PHSModule.h" 61#include "PHSModule.h"
63#include "Protocol.h" 62#include "Protocol.h"
64#include "Prototypes.h" 63#include "Prototypes.h"
diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c
index e9da513b3c2..0d75ff7add7 100644
--- a/drivers/staging/bcm/hostmibs.c
+++ b/drivers/staging/bcm/hostmibs.c
@@ -54,7 +54,7 @@ INT ProcessGetHostMibs(PMINI_ADAPTER Adapter,
54 { 54 {
55 if(Adapter->PackInfo[nSfIndex].bValid) 55 if(Adapter->PackInfo[nSfIndex].bValid)
56 { 56 {
57 OsalMemMove((PVOID)&pstHostMibs->astSFtable[nSfIndex],(PVOID)&Adapter->PackInfo[nSfIndex],sizeof(S_MIBS_SERVICEFLOW_TABLE)); 57 memcpy((PVOID)&pstHostMibs->astSFtable[nSfIndex],(PVOID)&Adapter->PackInfo[nSfIndex],sizeof(S_MIBS_SERVICEFLOW_TABLE));
58 } 58 }
59 else 59 else
60 { 60 {
@@ -83,7 +83,7 @@ INT ProcessGetHostMibs(PMINI_ADAPTER Adapter,
83 83
84 pstHostMibs->astPhsRulesTable[nPhsTableIndex].ulSFID = Adapter->PackInfo[nSfIndex].ulSFID; 84 pstHostMibs->astPhsRulesTable[nPhsTableIndex].ulSFID = Adapter->PackInfo[nSfIndex].ulSFID;
85 85
86 OsalMemMove(&pstHostMibs->astPhsRulesTable[nPhsTableIndex].u8PHSI, 86 memcpy(&pstHostMibs->astPhsRulesTable[nPhsTableIndex].u8PHSI,
87 &pstPhsRule->u8PHSI, 87 &pstPhsRule->u8PHSI,
88 sizeof(S_PHS_RULE)); 88 sizeof(S_PHS_RULE));
89 nPhsTableIndex++; 89 nPhsTableIndex++;
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index f2b6939f517..79c7bd74804 100644
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -293,7 +293,7 @@ static INT ValidateDSDParamsChecksum(
293 293
294 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread:ValidateDSDParamsChecksum: 0x%lx 0x%X",ulParamOffset, usParamLen); 294 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread:ValidateDSDParamsChecksum: 0x%lx 0x%X",ulParamOffset, usParamLen);
295 295
296 puBuffer = OsalMemAlloc(usParamLen,"!MEM"); 296 puBuffer = kmalloc(usParamLen, GFP_KERNEL);
297 if(!puBuffer) 297 if(!puBuffer)
298 { 298 {
299 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: ValidateDSDParamsChecksum Allocation failed"); 299 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: ValidateDSDParamsChecksum Allocation failed");
@@ -341,10 +341,7 @@ static INT ValidateDSDParamsChecksum(
341 } 341 }
342 342
343exit: 343exit:
344 if(puBuffer) 344 kfree(puBuffer);
345 {
346 OsalMemFree(puBuffer, usParamLen);
347 }
348 return Status; 345 return Status;
349} 346}
350 347
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 95716f596e6..4a020533474 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -228,7 +228,7 @@ INT ReadBeceemEEPROM( PMINI_ADAPTER Adapter,
228 ReadBeceemEEPROMBulk(Adapter, uiTempOffset + MAX_RW_SIZE, (PUINT)&uiData[4], 4); 228 ReadBeceemEEPROMBulk(Adapter, uiTempOffset + MAX_RW_SIZE, (PUINT)&uiData[4], 4);
229 } 229 }
230 230
231 OsalMemMove( (PUCHAR) pBuffer, ( ((PUCHAR)&uiData[0]) + uiByteOffset ), 4); 231 memcpy( (PUCHAR) pBuffer, ( ((PUCHAR)&uiData[0]) + uiByteOffset ), 4);
232 232
233 return STATUS_SUCCESS; 233 return STATUS_SUCCESS;
234} /* ReadBeceemEEPROM() */ 234} /* ReadBeceemEEPROM() */
@@ -476,7 +476,7 @@ INT BeceemEEPROMBulkRead(
476 ReadBeceemEEPROMBulk(Adapter,uiTempOffset,(PUINT)&uiData[0],4); 476 ReadBeceemEEPROMBulk(Adapter,uiTempOffset,(PUINT)&uiData[0],4);
477 if(uiBytesRemaining >= (MAX_RW_SIZE - uiExtraBytes)) 477 if(uiBytesRemaining >= (MAX_RW_SIZE - uiExtraBytes))
478 { 478 {
479 OsalMemMove(pBuffer,(((PUCHAR)&uiData[0])+uiExtraBytes),MAX_RW_SIZE - uiExtraBytes); 479 memcpy(pBuffer,(((PUCHAR)&uiData[0])+uiExtraBytes),MAX_RW_SIZE - uiExtraBytes);
480 480
481 uiBytesRemaining -= (MAX_RW_SIZE - uiExtraBytes); 481 uiBytesRemaining -= (MAX_RW_SIZE - uiExtraBytes);
482 uiIndex += (MAX_RW_SIZE - uiExtraBytes); 482 uiIndex += (MAX_RW_SIZE - uiExtraBytes);
@@ -484,7 +484,7 @@ INT BeceemEEPROMBulkRead(
484 } 484 }
485 else 485 else
486 { 486 {
487 OsalMemMove(pBuffer,(((PUCHAR)&uiData[0])+uiExtraBytes),uiBytesRemaining); 487 memcpy(pBuffer,(((PUCHAR)&uiData[0])+uiExtraBytes),uiBytesRemaining);
488 uiIndex += uiBytesRemaining; 488 uiIndex += uiBytesRemaining;
489 uiOffset += uiBytesRemaining; 489 uiOffset += uiBytesRemaining;
490 uiBytesRemaining = 0; 490 uiBytesRemaining = 0;
@@ -508,7 +508,7 @@ INT BeceemEEPROMBulkRead(
508 * We read 4 Dwords of data */ 508 * We read 4 Dwords of data */
509 if(0 == ReadBeceemEEPROMBulk(Adapter,uiOffset,&uiData[0],4)) 509 if(0 == ReadBeceemEEPROMBulk(Adapter,uiOffset,&uiData[0],4))
510 { 510 {
511 OsalMemMove(pcBuff+uiIndex,&uiData[0],MAX_RW_SIZE); 511 memcpy(pcBuff+uiIndex,&uiData[0],MAX_RW_SIZE);
512 uiOffset += MAX_RW_SIZE; 512 uiOffset += MAX_RW_SIZE;
513 uiBytesRemaining -= MAX_RW_SIZE; 513 uiBytesRemaining -= MAX_RW_SIZE;
514 uiIndex += MAX_RW_SIZE; 514 uiIndex += MAX_RW_SIZE;
@@ -523,7 +523,7 @@ INT BeceemEEPROMBulkRead(
523 { 523 {
524 if(0 == ReadBeceemEEPROM(Adapter,uiOffset,&uiData[0])) 524 if(0 == ReadBeceemEEPROM(Adapter,uiOffset,&uiData[0]))
525 { 525 {
526 OsalMemMove(pcBuff+uiIndex,&uiData[0],4); 526 memcpy(pcBuff+uiIndex,&uiData[0],4);
527 uiOffset += 4; 527 uiOffset += 4;
528 uiBytesRemaining -= 4; 528 uiBytesRemaining -= 4;
529 uiIndex +=4; 529 uiIndex +=4;
@@ -540,7 +540,7 @@ INT BeceemEEPROMBulkRead(
540 pCharBuff += uiIndex; 540 pCharBuff += uiIndex;
541 if(0 == ReadBeceemEEPROM(Adapter,uiOffset,&uiData[0])) 541 if(0 == ReadBeceemEEPROM(Adapter,uiOffset,&uiData[0]))
542 { 542 {
543 OsalMemMove(pCharBuff,&uiData[0],uiBytesRemaining);//copy only bytes requested. 543 memcpy(pCharBuff,&uiData[0],uiBytesRemaining);//copy only bytes requested.
544 uiBytesRemaining = 0; 544 uiBytesRemaining = 0;
545 } 545 }
546 else 546 else
@@ -973,7 +973,7 @@ static INT flashWrite(
973// need not write 0xFFFFFFFF because write requires an erase and erase will 973// need not write 0xFFFFFFFF because write requires an erase and erase will
974// make whole sector 0xFFFFFFFF. 974// make whole sector 0xFFFFFFFF.
975// 975//
976 if (!OsalMemCompare(pData, uiErasePattern, MAX_RW_SIZE)) 976 if (!memcmp(pData, uiErasePattern, MAX_RW_SIZE))
977 { 977 {
978 return 0; 978 return 0;
979 } 979 }
@@ -1138,7 +1138,7 @@ static INT flashWriteStatus(
1138// need not write 0xFFFFFFFF because write requires an erase and erase will 1138// need not write 0xFFFFFFFF because write requires an erase and erase will
1139// make whole sector 0xFFFFFFFF. 1139// make whole sector 0xFFFFFFFF.
1140// 1140//
1141 if (!OsalMemCompare(pData,uiErasePattern,MAX_RW_SIZE)) 1141 if (!memcmp(pData,uiErasePattern,MAX_RW_SIZE))
1142 { 1142 {
1143 return 0; 1143 return 0;
1144 } 1144 }
@@ -1377,12 +1377,9 @@ INT BeceemFlashBulkWrite(
1377 uiCurrSectOffsetAddr = uiOffset & (Adapter->uiSectorSize - 1); 1377 uiCurrSectOffsetAddr = uiOffset & (Adapter->uiSectorSize - 1);
1378 uiSectBoundary = uiSectAlignAddr + Adapter->uiSectorSize; 1378 uiSectBoundary = uiSectAlignAddr + Adapter->uiSectorSize;
1379 1379
1380 //pTempBuff = OsalMemAlloc(MAX_SECTOR_SIZE,'!MVN'); 1380 pTempBuff = kmalloc(Adapter->uiSectorSize, GFP_KERNEL);
1381 pTempBuff = OsalMemAlloc(Adapter->uiSectorSize ,"!MVN");
1382 if(NULL == pTempBuff) 1381 if(NULL == pTempBuff)
1383 {
1384 goto BeceemFlashBulkWrite_EXIT; 1382 goto BeceemFlashBulkWrite_EXIT;
1385 }
1386// 1383//
1387// check if the data to be written is overlapped accross sectors 1384// check if the data to be written is overlapped accross sectors
1388// 1385//
@@ -1448,13 +1445,13 @@ INT BeceemFlashBulkWrite(
1448 if(uiNumSectTobeRead > 1) 1445 if(uiNumSectTobeRead > 1)
1449 { 1446 {
1450 1447
1451 OsalMemMove(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr)); 1448 memcpy(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr));
1452 pcBuffer += ((uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr))); 1449 pcBuffer += ((uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr)));
1453 uiNumBytes -= (uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr)); 1450 uiNumBytes -= (uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr));
1454 } 1451 }
1455 else 1452 else
1456 { 1453 {
1457 OsalMemMove(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiNumBytes); 1454 memcpy(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiNumBytes);
1458 } 1455 }
1459 1456
1460 if(IsFlash2x(Adapter)) 1457 if(IsFlash2x(Adapter))
@@ -1503,7 +1500,7 @@ INT BeceemFlashBulkWrite(
1503 } 1500 }
1504 else 1501 else
1505 { 1502 {
1506 if(OsalMemCompare(ucReadBk,&pTempBuff[uiIndex],MAX_RW_SIZE)) 1503 if(memcmp(ucReadBk,&pTempBuff[uiIndex],MAX_RW_SIZE))
1507 { 1504 {
1508 if(STATUS_SUCCESS != (*Adapter->fpFlashWriteWithStatusCheck)(Adapter,uiPartOffset+uiIndex,&pTempBuff[uiIndex])) 1505 if(STATUS_SUCCESS != (*Adapter->fpFlashWriteWithStatusCheck)(Adapter,uiPartOffset+uiIndex,&pTempBuff[uiIndex]))
1509 { 1506 {
@@ -1541,10 +1538,8 @@ BeceemFlashBulkWrite_EXIT:
1541 { 1538 {
1542 BcmRestoreBlockProtectStatus(Adapter,ulStatus); 1539 BcmRestoreBlockProtectStatus(Adapter,ulStatus);
1543 } 1540 }
1544 if(pTempBuff) 1541
1545 { 1542 kfree(pTempBuff);
1546 OsalMemFree(pTempBuff,Adapter->uiSectorSize);
1547 }
1548 1543
1549 Adapter->SelectedChip = RESET_CHIP_SELECT; 1544 Adapter->SelectedChip = RESET_CHIP_SELECT;
1550 return Status; 1545 return Status;
@@ -1599,14 +1594,10 @@ static INT BeceemFlashBulkWriteStatus(
1599 uiCurrSectOffsetAddr = uiOffset & (Adapter->uiSectorSize - 1); 1594 uiCurrSectOffsetAddr = uiOffset & (Adapter->uiSectorSize - 1);
1600 uiSectBoundary = uiSectAlignAddr + Adapter->uiSectorSize; 1595 uiSectBoundary = uiSectAlignAddr + Adapter->uiSectorSize;
1601 1596
1602 1597 pTempBuff = kmalloc(Adapter->uiSectorSize, GFP_KERNEL);
1603
1604// pTempBuff = OsalMemAlloc(MAX_SECTOR_SIZE,'!MVN');
1605 pTempBuff = OsalMemAlloc(Adapter->uiSectorSize,"!MVN");
1606 if(NULL == pTempBuff) 1598 if(NULL == pTempBuff)
1607 {
1608 goto BeceemFlashBulkWriteStatus_EXIT; 1599 goto BeceemFlashBulkWriteStatus_EXIT;
1609 } 1600
1610// 1601//
1611// check if the data to be written is overlapped accross sectors 1602// check if the data to be written is overlapped accross sectors
1612// 1603//
@@ -1662,13 +1653,13 @@ static INT BeceemFlashBulkWriteStatus(
1662 if(uiNumSectTobeRead > 1) 1653 if(uiNumSectTobeRead > 1)
1663 { 1654 {
1664 1655
1665 OsalMemMove(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr)); 1656 memcpy(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr));
1666 pcBuffer += ((uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr))); 1657 pcBuffer += ((uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr)));
1667 uiNumBytes -= (uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr)); 1658 uiNumBytes -= (uiSectBoundary-(uiSectAlignAddr+uiCurrSectOffsetAddr));
1668 } 1659 }
1669 else 1660 else
1670 { 1661 {
1671 OsalMemMove(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiNumBytes); 1662 memcpy(&pTempBuff[uiCurrSectOffsetAddr],pcBuffer,uiNumBytes);
1672 } 1663 }
1673 1664
1674 if(IsFlash2x(Adapter)) 1665 if(IsFlash2x(Adapter))
@@ -1716,7 +1707,7 @@ static INT BeceemFlashBulkWriteStatus(
1716 1707
1717 if(STATUS_SUCCESS == BeceemFlashBulkRead(Adapter,(PUINT)ucReadBk,uiOffsetFromSectStart+uiIndex,MAX_RW_SIZE)) 1708 if(STATUS_SUCCESS == BeceemFlashBulkRead(Adapter,(PUINT)ucReadBk,uiOffsetFromSectStart+uiIndex,MAX_RW_SIZE))
1718 { 1709 {
1719 if(OsalMemCompare(ucReadBk,&pTempBuff[uiIndex],MAX_RW_SIZE)) 1710 if(memcmp(ucReadBk,&pTempBuff[uiIndex],MAX_RW_SIZE))
1720 { 1711 {
1721 Status = STATUS_FAILURE; 1712 Status = STATUS_FAILURE;
1722 goto BeceemFlashBulkWriteStatus_EXIT; 1713 goto BeceemFlashBulkWriteStatus_EXIT;
@@ -1747,10 +1738,8 @@ BeceemFlashBulkWriteStatus_EXIT:
1747 { 1738 {
1748 BcmRestoreBlockProtectStatus(Adapter,ulStatus); 1739 BcmRestoreBlockProtectStatus(Adapter,ulStatus);
1749 } 1740 }
1750 if(pTempBuff) 1741
1751 { 1742 kfree(pTempBuff);
1752 OsalMemFree(pTempBuff,Adapter->uiSectorSize);
1753 }
1754 Adapter->SelectedChip = RESET_CHIP_SELECT; 1743 Adapter->SelectedChip = RESET_CHIP_SELECT;
1755 return Status; 1744 return Status;
1756 1745
@@ -1771,7 +1760,7 @@ BeceemFlashBulkWriteStatus_EXIT:
1771 1760
1772INT PropagateCalParamsFromEEPROMToMemory(PMINI_ADAPTER Adapter) 1761INT PropagateCalParamsFromEEPROMToMemory(PMINI_ADAPTER Adapter)
1773{ 1762{
1774 PCHAR pBuff = OsalMemAlloc(BUFFER_4K,"3MVN"); 1763 PCHAR pBuff = kmalloc(BUFFER_4K, GFP_KERNEL);
1775 UINT uiEepromSize = 0; 1764 UINT uiEepromSize = 0;
1776 UINT uiIndex = 0; 1765 UINT uiIndex = 0;
1777 UINT uiBytesToCopy = 0; 1766 UINT uiBytesToCopy = 0;
@@ -1787,14 +1776,14 @@ INT PropagateCalParamsFromEEPROMToMemory(PMINI_ADAPTER Adapter)
1787 if(0 != BeceemEEPROMBulkRead(Adapter,&uiEepromSize,EEPROM_SIZE_OFFSET,4)) 1776 if(0 != BeceemEEPROMBulkRead(Adapter,&uiEepromSize,EEPROM_SIZE_OFFSET,4))
1788 { 1777 {
1789 1778
1790 OsalMemFree(pBuff,BUFFER_4K); 1779 kfree(pBuff);
1791 return -1; 1780 return -1;
1792 } 1781 }
1793 1782
1794 uiEepromSize >>= 16; 1783 uiEepromSize >>= 16;
1795 if(uiEepromSize > 1024*1024) 1784 if(uiEepromSize > 1024*1024)
1796 { 1785 {
1797 OsalMemFree(pBuff,BUFFER_4K); 1786 kfree(pBuff);
1798 return -1; 1787 return -1;
1799 } 1788 }
1800 1789
@@ -1820,7 +1809,7 @@ INT PropagateCalParamsFromEEPROMToMemory(PMINI_ADAPTER Adapter)
1820 wrmalt(Adapter, EEPROM_CAL_DATA_INTERNAL_LOC-4,&value, sizeof(value)); 1809 wrmalt(Adapter, EEPROM_CAL_DATA_INTERNAL_LOC-4,&value, sizeof(value));
1821 value = 0xbeadbead; 1810 value = 0xbeadbead;
1822 wrmalt(Adapter, EEPROM_CAL_DATA_INTERNAL_LOC-8,&value, sizeof(value)); 1811 wrmalt(Adapter, EEPROM_CAL_DATA_INTERNAL_LOC-8,&value, sizeof(value));
1823 OsalMemFree(pBuff,MAX_RW_SIZE); 1812 kfree(pBuff);
1824 1813
1825 return Status; 1814 return Status;
1826 1815
@@ -1873,7 +1862,7 @@ INT PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter)
1873 return -1; 1862 return -1;
1874 } 1863 }
1875 1864
1876 pBuff = OsalMemAlloc(uiEepromSize, 0); 1865 pBuff = kmalloc(uiEepromSize, GFP_KERNEL);
1877 1866
1878 if ( pBuff == NULL ) 1867 if ( pBuff == NULL )
1879 { 1868 {
@@ -1882,7 +1871,7 @@ INT PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter)
1882 1871
1883 if(0 != BeceemNVMRead(Adapter,(PUINT)pBuff,uiCalStartAddr, uiEepromSize)) 1872 if(0 != BeceemNVMRead(Adapter,(PUINT)pBuff,uiCalStartAddr, uiEepromSize))
1884 { 1873 {
1885 OsalMemFree(pBuff, 0); 1874 kfree(pBuff);
1886 return -1; 1875 return -1;
1887 } 1876 }
1888 1877
@@ -1905,7 +1894,7 @@ INT PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter)
1905 uiBytesToCopy = MIN(BUFFER_4K,uiEepromSize); 1894 uiBytesToCopy = MIN(BUFFER_4K,uiEepromSize);
1906 } 1895 }
1907 1896
1908 OsalMemFree(pBuff, 0); 1897 kfree(pBuff);
1909 return Status; 1898 return Status;
1910 1899
1911} 1900}
@@ -1947,14 +1936,14 @@ static INT BeceemEEPROMReadBackandVerify(
1947 {// for the requests more than or equal to MAX_RW_SIZE bytes, use bulk read function to make the access faster. 1936 {// for the requests more than or equal to MAX_RW_SIZE bytes, use bulk read function to make the access faster.
1948 BeceemEEPROMBulkRead(Adapter,&auiData[0],uiOffset,MAX_RW_SIZE); 1937 BeceemEEPROMBulkRead(Adapter,&auiData[0],uiOffset,MAX_RW_SIZE);
1949 1938
1950 if(OsalMemCompare(&pBuffer[uiIndex],&auiData[0],MAX_RW_SIZE)) 1939 if(memcmp(&pBuffer[uiIndex],&auiData[0],MAX_RW_SIZE))
1951 { 1940 {
1952 // re-write 1941 // re-write
1953 BeceemEEPROMBulkWrite(Adapter,(PUCHAR)(pBuffer+uiIndex),uiOffset,MAX_RW_SIZE,FALSE); 1942 BeceemEEPROMBulkWrite(Adapter,(PUCHAR)(pBuffer+uiIndex),uiOffset,MAX_RW_SIZE,FALSE);
1954 mdelay(3); 1943 mdelay(3);
1955 BeceemEEPROMBulkRead(Adapter,&auiData[0],uiOffset,MAX_RW_SIZE); 1944 BeceemEEPROMBulkRead(Adapter,&auiData[0],uiOffset,MAX_RW_SIZE);
1956 1945
1957 if(OsalMemCompare(&pBuffer[uiIndex],&auiData[0],MAX_RW_SIZE)) 1946 if(memcmp(&pBuffer[uiIndex],&auiData[0],MAX_RW_SIZE))
1958 { 1947 {
1959 return -1; 1948 return -1;
1960 } 1949 }
@@ -1986,7 +1975,7 @@ static INT BeceemEEPROMReadBackandVerify(
1986 else 1975 else
1987 { // Handle the reads less than 4 bytes... 1976 { // Handle the reads less than 4 bytes...
1988 uiData = 0; 1977 uiData = 0;
1989 OsalMemMove(&uiData,((PUCHAR)pBuffer)+(uiIndex*sizeof(UINT)),uiNumBytes); 1978 memcpy(&uiData,((PUCHAR)pBuffer)+(uiIndex*sizeof(UINT)),uiNumBytes);
1990 BeceemEEPROMBulkRead(Adapter,&uiRdbk,uiOffset,4); 1979 BeceemEEPROMBulkRead(Adapter,&uiRdbk,uiOffset,4);
1991 1980
1992 if(memcmp(&uiData, &uiRdbk, uiNumBytes)) 1981 if(memcmp(&uiData, &uiRdbk, uiNumBytes))
@@ -2186,7 +2175,7 @@ INT BeceemEEPROMBulkWrite(
2186 2175
2187 if(uiBytesToCopy >= (16 -uiExtraBytes)) 2176 if(uiBytesToCopy >= (16 -uiExtraBytes))
2188 { 2177 {
2189 OsalMemMove((((PUCHAR)&uiData[0])+uiExtraBytes),pBuffer,MAX_RW_SIZE- uiExtraBytes); 2178 memcpy((((PUCHAR)&uiData[0])+uiExtraBytes),pBuffer,MAX_RW_SIZE- uiExtraBytes);
2190 2179
2191 if ( STATUS_FAILURE == BeceemEEPROMWritePage( Adapter, uiData, uiTempOffset ) ) 2180 if ( STATUS_FAILURE == BeceemEEPROMWritePage( Adapter, uiData, uiTempOffset ) )
2192 return STATUS_FAILURE; 2181 return STATUS_FAILURE;
@@ -2197,7 +2186,7 @@ INT BeceemEEPROMBulkWrite(
2197 } 2186 }
2198 else 2187 else
2199 { 2188 {
2200 OsalMemMove((((PUCHAR)&uiData[0])+uiExtraBytes),pBuffer,uiBytesToCopy); 2189 memcpy((((PUCHAR)&uiData[0])+uiExtraBytes),pBuffer,uiBytesToCopy);
2201 2190
2202 if ( STATUS_FAILURE == BeceemEEPROMWritePage( Adapter, uiData, uiTempOffset ) ) 2191 if ( STATUS_FAILURE == BeceemEEPROMWritePage( Adapter, uiData, uiTempOffset ) )
2203 return STATUS_FAILURE; 2192 return STATUS_FAILURE;
@@ -2233,7 +2222,7 @@ INT BeceemEEPROMBulkWrite(
2233 // To program non 16byte aligned data, read 16byte and then update. 2222 // To program non 16byte aligned data, read 16byte and then update.
2234 // 2223 //
2235 BeceemEEPROMBulkRead(Adapter,&uiData[0],uiOffset,16); 2224 BeceemEEPROMBulkRead(Adapter,&uiData[0],uiOffset,16);
2236 OsalMemMove(&uiData[0],pBuffer+uiIndex,uiBytesToCopy); 2225 memcpy(&uiData[0],pBuffer+uiIndex,uiBytesToCopy);
2237 2226
2238 2227
2239 if ( STATUS_FAILURE == BeceemEEPROMWritePage( Adapter, uiData, uiOffset ) ) 2228 if ( STATUS_FAILURE == BeceemEEPROMWritePage( Adapter, uiData, uiOffset ) )
@@ -2763,7 +2752,7 @@ INT BcmAllocFlashCSStructure(PMINI_ADAPTER psAdapter)
2763 if(psAdapter->psFlash2xCSInfo == NULL) 2752 if(psAdapter->psFlash2xCSInfo == NULL)
2764 { 2753 {
2765 BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_PRINTK, 0, 0,"Can't Allocate memory for Flash 2.x"); 2754 BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_PRINTK, 0, 0,"Can't Allocate memory for Flash 2.x");
2766 bcm_kfree(psAdapter->psFlashCSInfo); 2755 kfree(psAdapter->psFlashCSInfo);
2767 return -ENOMEM; 2756 return -ENOMEM;
2768 } 2757 }
2769 2758
@@ -2771,8 +2760,8 @@ INT BcmAllocFlashCSStructure(PMINI_ADAPTER psAdapter)
2771 if(psAdapter->psFlash2xVendorInfo == NULL) 2760 if(psAdapter->psFlash2xVendorInfo == NULL)
2772 { 2761 {
2773 BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_PRINTK, 0, 0,"Can't Allocate Vendor Info Memory for Flash 2.x"); 2762 BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_PRINTK, 0, 0,"Can't Allocate Vendor Info Memory for Flash 2.x");
2774 bcm_kfree(psAdapter->psFlashCSInfo); 2763 kfree(psAdapter->psFlashCSInfo);
2775 bcm_kfree(psAdapter->psFlash2xCSInfo); 2764 kfree(psAdapter->psFlash2xCSInfo);
2776 return -ENOMEM; 2765 return -ENOMEM;
2777 } 2766 }
2778 2767
@@ -2786,9 +2775,9 @@ INT BcmDeAllocFlashCSStructure(PMINI_ADAPTER psAdapter)
2786 BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_PRINTK, 0, 0," Adapter structure point is NULL"); 2775 BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_PRINTK, 0, 0," Adapter structure point is NULL");
2787 return -EINVAL; 2776 return -EINVAL;
2788 } 2777 }
2789 bcm_kfree(psAdapter->psFlashCSInfo); 2778 kfree(psAdapter->psFlashCSInfo);
2790 bcm_kfree(psAdapter->psFlash2xCSInfo); 2779 kfree(psAdapter->psFlash2xCSInfo);
2791 bcm_kfree(psAdapter->psFlash2xVendorInfo); 2780 kfree(psAdapter->psFlash2xVendorInfo);
2792 return STATUS_SUCCESS ; 2781 return STATUS_SUCCESS ;
2793} 2782}
2794 2783
@@ -4570,7 +4559,7 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
4570 4559
4571 } 4560 }
4572 4561
4573 bcm_kfree(Buff); 4562 kfree(Buff);
4574 4563
4575 return Status; 4564 return Status;
4576} 4565}
@@ -4936,7 +4925,7 @@ INT BcmCopySection(PMINI_ADAPTER Adapter,
4936 BytesToBeCopied = numOfBytes; 4925 BytesToBeCopied = numOfBytes;
4937 } 4926 }
4938 }while(numOfBytes > 0) ; 4927 }while(numOfBytes > 0) ;
4939 bcm_kfree(pBuff); 4928 kfree(pBuff);
4940 Adapter->bHeaderChangeAllowed = FALSE ; 4929 Adapter->bHeaderChangeAllowed = FALSE ;
4941 return Status; 4930 return Status;
4942} 4931}
@@ -5006,7 +4995,7 @@ INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiOffset)
5006 //Replace Buffer content with Header 4995 //Replace Buffer content with Header
5007 memcpy(pBuff +offsetToProtect,pTempBuff,HeaderSizeToProtect); 4996 memcpy(pBuff +offsetToProtect,pTempBuff,HeaderSizeToProtect);
5008 4997
5009 bcm_kfree(pTempBuff); 4998 kfree(pTempBuff);
5010 } 4999 }
5011 if(bHasHeader && Adapter->bSigCorrupted) 5000 if(bHasHeader && Adapter->bSigCorrupted)
5012 { 5001 {
@@ -5525,11 +5514,11 @@ INT CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
5525 else 5514 else
5526 { 5515 {
5527 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"BCM Signature is not present in header"); 5516 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"BCM Signature is not present in header");
5528 bcm_kfree(pBuff); 5517 kfree(pBuff);
5529 return STATUS_FAILURE; 5518 return STATUS_FAILURE;
5530 } 5519 }
5531 5520
5532 bcm_kfree(pBuff); 5521 kfree(pBuff);
5533 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Corrupted the signature"); 5522 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Corrupted the signature");
5534 return STATUS_SUCCESS ; 5523 return STATUS_SUCCESS ;
5535} 5524}
@@ -5575,14 +5564,14 @@ INT CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
5575 else 5564 else
5576 { 5565 {
5577 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"BCM Signature is not present in header"); 5566 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"BCM Signature is not present in header");
5578 bcm_kfree(pBuff); 5567 kfree(pBuff);
5579 return STATUS_FAILURE; 5568 return STATUS_FAILURE;
5580 } 5569 }
5581 5570
5582 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Corrupted the signature"); 5571 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Corrupted the signature");
5583 BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,pBuff,MAX_RW_SIZE); 5572 BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,pBuff,MAX_RW_SIZE);
5584 5573
5585 bcm_kfree(pBuff); 5574 kfree(pBuff);
5586 return STATUS_SUCCESS ; 5575 return STATUS_SUCCESS ;
5587} 5576}
5588 5577
diff --git a/drivers/staging/bcm/osal_misc.h b/drivers/staging/bcm/osal_misc.h
deleted file mode 100644
index ff4adde17cd..00000000000
--- a/drivers/staging/bcm/osal_misc.h
+++ /dev/null
@@ -1,49 +0,0 @@
1 /*++
2
3 Copyright (c) Beceem Communications Inc.
4
5 Module Name:
6 OSAL_Misc.h
7
8 Abstract:
9 Provides the OS Abstracted macros to access:
10 Linked Lists
11 Dispatcher Objects(Events,Semaphores,Spin Locks and the like)
12 Files
13
14
15 Revision History:
16 Who When What
17 -------- -------- ----------------------------------------------
18 Name Date Created/reviewed/modified
19 Rajeev 24/1/08 Created
20 Notes:
21
22 --*/
23#ifndef _OSAL_MISC_H_
24#define _OSAL_MISC_H_
25//OSAL Macros
26//OSAL Primitives
27typedef PUCHAR POSAL_NW_PACKET ; //Nw packets
28
29
30#define OsalMemAlloc(n,t) kmalloc(n,GFP_KERNEL)
31
32#define OsalMemFree(x,n) bcm_kfree(x)
33
34#define OsalMemMove(dest, src, len) \
35{ \
36 memcpy(dest,src, len); \
37}
38
39#define OsalZeroMemory(pDest, Len) \
40{ \
41 memset(pDest,0,Len); \
42}
43
44//#define OsalMemSet(pSrc,Char,Len) memset(pSrc,Char,Len)
45
46bool OsalMemCompare(void *dest, void *src, UINT len);
47
48#endif
49
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-19 23:30:29 -0400