Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304447
b: refs/heads/master
c: 3eb2342
h: refs/heads/master
i:
  304445: 45b3055
  304443: 7d677da
  304439: 2aba443
  304431: 0d84127
  304415: d9291dc
  304383: 2ae1124
v: v3
  • Loading branch information
Jesper Juhl authored and Greg Kroah-Hartman committed Apr 24, 2012
1 parent 4829d18 commit f489f02
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 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: 62ef30b5781d836aa756fb5fa6de4f660fd6f9a2
refs/heads/master: 3eb23422b2370fd22531cf0de40b57699c17f08e
4 changes: 3 additions & 1 deletion trunk/drivers/staging/vt6656/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
}
}
break;

case WLAN_CMD_BSS_JOIN:
if (copy_from_user(&sJoinCmd, pReq->data, sizeof(SCmdBSSJoin))) {
result = -EFAULT;
Expand Down Expand Up @@ -311,7 +312,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
pList->sBSSIDList[ii].wBeaconInterval = pBSS->wBeaconInterval;
pList->sBSSIDList[ii].wCapInfo = pBSS->wCapInfo;
RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm);
pList->sBSSIDList[ii].uRSSI = (unsigned int) ldBm;
pList->sBSSIDList[ii].uRSSI = (unsigned int)ldBm;
/* pList->sBSSIDList[ii].uRSSI = pBSS->uRSSI; */
memcpy(pList->sBSSIDList[ii].abyBSSID, pBSS->abyBSSID, WLAN_BSSID_LEN);
pItemSSID = (PWLAN_IE_SSID)pBSS->abySSID;
Expand Down Expand Up @@ -354,6 +355,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
break;
}
break;

case WLAN_CMD_STOP_MAC:
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_STOP_MAC\n");
/* Todo xxxxxx */
Expand Down

0 comments on commit f489f02

Please sign in to comment.