Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304446
b: refs/heads/master
c: 62ef30b
h: refs/heads/master
v: v3
  • Loading branch information
Jesper Juhl authored and Greg Kroah-Hartman committed Apr 24, 2012
1 parent 45b3055 commit 4829d18
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c25626871c082432ae265594d4b336ccbeec4120
refs/heads/master: 62ef30b5781d836aa756fb5fa6de4f660fd6f9a2
20 changes: 9 additions & 11 deletions trunk/drivers/staging/vt6656/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,18 +90,17 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
spin_lock_irq(&pDevice->lock);

if (memcmp(pMgmt->abyCurrBSSID, &abyNullAddr[0], 6) == 0)
BSSvClearBSSList((void *)pDevice, FALSE);
BSSvClearBSSList(pDevice, FALSE);
else
BSSvClearBSSList((void *)pDevice, pDevice->bLinkPass);
BSSvClearBSSList(pDevice, pDevice->bLinkPass);

DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_BSS_SCAN..begin\n");

if (pItemSSID->len != 0)
bScheduleCommand((void *)pDevice,
WLAN_CMD_BSSID_SCAN,
bScheduleCommand(pDevice, WLAN_CMD_BSSID_SCAN,
abyScanSSID);
else
bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, NULL);
bScheduleCommand(pDevice, WLAN_CMD_BSSID_SCAN, NULL);

spin_unlock_irq(&pDevice->lock);
break;
Expand Down Expand Up @@ -190,10 +189,9 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
netif_stop_queue(pDevice->dev);
spin_lock_irq(&pDevice->lock);
pMgmt->eCurrState = WMAC_STATE_IDLE;
bScheduleCommand((void *) pDevice,
WLAN_CMD_BSSID_SCAN,
bScheduleCommand(pDevice, WLAN_CMD_BSSID_SCAN,
pMgmt->abyDesireSSID);
bScheduleCommand((void *) pDevice, WLAN_CMD_SSID, NULL);
bScheduleCommand(pDevice, WLAN_CMD_SSID, NULL);
spin_unlock_irq(&pDevice->lock);
break;

Expand Down Expand Up @@ -299,7 +297,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
result = -EINVAL;
break;
}
pList = (PSBSSIDList)kmalloc(sizeof(SBSSIDList) + (sList.uItem * sizeof(SBSSIDItem)), (int)GFP_ATOMIC);
pList = kmalloc(sizeof(SBSSIDList) + (sList.uItem * sizeof(SBSSIDItem)), GFP_ATOMIC);
if (pList == NULL) {
result = -ENOMEM;
break;
Expand Down Expand Up @@ -534,7 +532,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)

netif_stop_queue(pDevice->dev);
spin_lock_irq(&pDevice->lock);
bScheduleCommand((void *)pDevice, WLAN_CMD_RUN_AP, NULL);
bScheduleCommand(pDevice, WLAN_CMD_RUN_AP, NULL);
spin_unlock_irq(&pDevice->lock);
break;

Expand Down Expand Up @@ -565,7 +563,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
result = -ENOMEM;
break;
}
pNodeList = (PSNodeList)kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), (int)GFP_ATOMIC);
pNodeList = (PSNodeList)kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), GFP_ATOMIC);
if (pNodeList == NULL) {
result = -ENOMEM;
break;
Expand Down

0 comments on commit 4829d18

Please sign in to comment.