diff options
author | Andres More <more.andres@gmail.com> | 2010-05-06 19:34:29 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 17:18:23 -0400 |
commit | 0cbd8d9854284d3ff38d04aaa3ae726fb1c4a958 (patch) | |
tree | f30d02ef8bb18f92909f0ff7feba92f06bd67e73 /drivers/staging/vt6656/ioctl.c | |
parent | 3afc7cc38c75d645855d680f0fad7d342f8e7fb2 (diff) |
staging: vt6656: code cleanup, removed HANDLE definition in ttype.h
Checkpatch warnings about using externs in .c files were not resolved,
neither some long lines on deeply nested code.
Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6656/ioctl.c')
-rw-r--r-- | drivers/staging/vt6656/ioctl.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/drivers/staging/vt6656/ioctl.c b/drivers/staging/vt6656/ioctl.c index 08d5429db26..69d1d735f71 100644 --- a/drivers/staging/vt6656/ioctl.c +++ b/drivers/staging/vt6656/ioctl.c | |||
@@ -100,16 +100,21 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { | |||
100 | memcpy(abyScanSSID, pItemSSID, pItemSSID->len + WLAN_IEHDR_LEN); | 100 | memcpy(abyScanSSID, pItemSSID, pItemSSID->len + WLAN_IEHDR_LEN); |
101 | } | 101 | } |
102 | spin_lock_irq(&pDevice->lock); | 102 | spin_lock_irq(&pDevice->lock); |
103 | if (memcmp(pMgmt->abyCurrBSSID, &abyNullAddr[0], 6) == 0) | ||
104 | BSSvClearBSSList((HANDLE)pDevice, FALSE); | ||
105 | else | ||
106 | BSSvClearBSSList((HANDLE)pDevice, pDevice->bLinkPass); | ||
107 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_BSS_SCAN..begin \n"); | ||
108 | 103 | ||
109 | if (pItemSSID->len != 0) | 104 | if (memcmp(pMgmt->abyCurrBSSID, &abyNullAddr[0], 6) == 0) |
110 | bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, abyScanSSID); | 105 | BSSvClearBSSList((void *) pDevice, FALSE); |
111 | else | 106 | else |
112 | bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, NULL); | 107 | BSSvClearBSSList((void *) pDevice, pDevice->bLinkPass); |
108 | |||
109 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_BSS_SCAN..begin\n"); | ||
110 | |||
111 | if (pItemSSID->len != 0) | ||
112 | bScheduleCommand((void *) pDevice, | ||
113 | WLAN_CMD_BSSID_SCAN, | ||
114 | abyScanSSID); | ||
115 | else | ||
116 | bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, NULL); | ||
117 | |||
113 | spin_unlock_irq(&pDevice->lock); | 118 | spin_unlock_irq(&pDevice->lock); |
114 | break; | 119 | break; |
115 | 120 | ||
@@ -207,8 +212,10 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { | |||
207 | netif_stop_queue(pDevice->dev); | 212 | netif_stop_queue(pDevice->dev); |
208 | spin_lock_irq(&pDevice->lock); | 213 | spin_lock_irq(&pDevice->lock); |
209 | pMgmt->eCurrState = WMAC_STATE_IDLE; | 214 | pMgmt->eCurrState = WMAC_STATE_IDLE; |
210 | bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID); | 215 | bScheduleCommand((void *) pDevice, |
211 | bScheduleCommand((HANDLE) pDevice, WLAN_CMD_SSID, NULL); | 216 | WLAN_CMD_BSSID_SCAN, |
217 | pMgmt->abyDesireSSID); | ||
218 | bScheduleCommand((void *) pDevice, WLAN_CMD_SSID, NULL); | ||
212 | spin_unlock_irq(&pDevice->lock); | 219 | spin_unlock_irq(&pDevice->lock); |
213 | break; | 220 | break; |
214 | 221 | ||
@@ -576,7 +583,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { | |||
576 | 583 | ||
577 | netif_stop_queue(pDevice->dev); | 584 | netif_stop_queue(pDevice->dev); |
578 | spin_lock_irq(&pDevice->lock); | 585 | spin_lock_irq(&pDevice->lock); |
579 | bScheduleCommand((HANDLE)pDevice, WLAN_CMD_RUN_AP, NULL); | 586 | bScheduleCommand((void *) pDevice, WLAN_CMD_RUN_AP, NULL); |
580 | spin_unlock_irq(&pDevice->lock); | 587 | spin_unlock_irq(&pDevice->lock); |
581 | break; | 588 | break; |
582 | 589 | ||