Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363531
b: refs/heads/master
c: 281c746
h: refs/heads/master
i:
  363529: 0ddb8f8
  363527: ea73f94
v: v3
  • Loading branch information
Joe Perches authored and Greg Kroah-Hartman committed Mar 19, 2013
1 parent 39d836c commit 8668d3d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 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: 5f256874a5b462e53479d3270bc747966f57d679
refs/heads/master: 281c7462f18c6de0c33440b88d2bddbc5abddb09
16 changes: 8 additions & 8 deletions trunk/drivers/staging/vt6655/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
static int msglevel = MSG_LEVEL_INFO;

#ifdef WPA_SM_Transtatus
SWPAResult wpa_Result;
SWPAResult wpa_Result;
#endif

int private_ioctl(PSDevice pDevice, struct ifreq *rq)
Expand Down Expand Up @@ -104,9 +104,9 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
BSSvClearBSSList((void *)pDevice, pDevice->bLinkPass);

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

Expand Down Expand Up @@ -202,8 +202,8 @@ 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, pMgmt->abyDesireSSID);
bScheduleCommand((void *) pDevice, WLAN_CMD_SSID, NULL);
bScheduleCommand((void *)pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID);
bScheduleCommand((void *)pDevice, WLAN_CMD_SSID, NULL);
spin_unlock_irq(&pDevice->lock);
break;

Expand Down Expand Up @@ -267,7 +267,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
memcpy(sLinkStatus.abySSID, pItemSSID->abySSID, pItemSSID->len);
memcpy(sLinkStatus.abyBSSID, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
sLinkStatus.uLinkRate = pMgmt->sNodeDBTable[0].wTxDataRate;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Link Success!\n");
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " Link Success!\n");
} else {
sLinkStatus.bLink = false;
sLinkStatus.uLinkRate = 0;
Expand Down Expand Up @@ -311,7 +311,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
}
pList->uItem = sList.uItem;
pBSS = &(pMgmt->sBSSList[0]);
for (ii = 0, jj = 0; jj < MAX_BSS_NUM ; jj++) {
for (ii = 0, jj = 0; jj < MAX_BSS_NUM; jj++) {
pBSS = &(pMgmt->sBSSList[jj]);
if (pBSS->bActive) {
pList->sBSSIDList[ii].uChannel = pBSS->uChannel;
Expand Down Expand Up @@ -540,7 +540,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
}

DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Support Rate= %*ph\n",
4, pMgmt->abyIBSSSuppRates + 2);
4, pMgmt->abyIBSSSuppRates + 2);

netif_stop_queue(pDevice->dev);
spin_lock_irq(&pDevice->lock);
Expand Down
12 changes: 6 additions & 6 deletions trunk/drivers/staging/vt6655/ioctl.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
int private_ioctl(PSDevice pDevice, struct ifreq *rq);

/*
void vConfigWEPKey (
PSDevice pDevice,
unsigned long dwKeyIndex,
unsigned char *pbyKey,
unsigned long uKeyLength
);
void vConfigWEPKey(
PSDevice pDevice,
unsigned long dwKeyIndex,
unsigned char *pbyKey,
unsigned long uKeyLength
);
*/

#endif // __IOCTL_H__
Expand Down

0 comments on commit 8668d3d

Please sign in to comment.