From f489f02233f8b8be877a0d247180b12ec99ba862 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sat, 21 Apr 2012 22:04:45 +0200 Subject: [PATCH] --- yaml --- r: 304447 b: refs/heads/master c: 3eb23422b2370fd22531cf0de40b57699c17f08e h: refs/heads/master i: 304445: 45b30552334c78a62ec298cfb355fd7cad2ff923 304443: 7d677da205e874bd17572798400c330cf985e914 304439: 2aba44383af27a91268f4295f4e4ebffed0b7ce8 304431: 0d841274fdc0f030233b2511eed7b7e324e4cbf3 304415: d9291dc7577cba36a99b9336d6059fc5ef550d9c 304383: 2ae11248698ca087cdf412c146315f528229a829 v: v3 --- [refs] | 2 +- trunk/drivers/staging/vt6656/ioctl.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b7b7d390d510..e39cb623d3d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62ef30b5781d836aa756fb5fa6de4f660fd6f9a2 +refs/heads/master: 3eb23422b2370fd22531cf0de40b57699c17f08e diff --git a/trunk/drivers/staging/vt6656/ioctl.c b/trunk/drivers/staging/vt6656/ioctl.c index d8b9f1dd6c25..cc7357d330b6 100644 --- a/trunk/drivers/staging/vt6656/ioctl.c +++ b/trunk/drivers/staging/vt6656/ioctl.c @@ -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; @@ -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; @@ -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 */