Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317781
b: refs/heads/master
c: 4063d06
h: refs/heads/master
i:
  317779: d7060d5
v: v3
  • Loading branch information
Jesper Juhl authored and Greg Kroah-Hartman committed Jul 9, 2012
1 parent 4693450 commit 5e79965
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 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: b74185108668ef966e663878adbad65e03bfcb43
refs/heads/master: 4063d060431b11da3ac2e255e0d8b3c62a0b5f9f
13 changes: 6 additions & 7 deletions trunk/drivers/staging/vt6656/iwctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ int iwctl_siwscan(struct net_device *dev, struct iw_request_info *info,
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
struct iw_scan_req *req = (struct iw_scan_req *)extra;
BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
PWLAN_IE_SSID pItemSSID=NULL;
PWLAN_IE_SSID pItemSSID = NULL;

if (!(pDevice->flags & DEVICE_FLAGS_OPENED))
return -EINVAL;
Expand Down Expand Up @@ -203,7 +203,7 @@ int iwctl_giwscan(struct net_device *dev, struct iw_request_info *info,
iwe.cmd = SIOCGIWAP;
iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
memcpy(iwe.u.ap_addr.sa_data, pBSS->abyBSSID, WLAN_BSSID_LEN);
current_ev = iwe_stream_add_event(info,current_ev,end_buf, &iwe, IW_EV_ADDR_LEN);
current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_ADDR_LEN);
// ADD ssid
memset(&iwe, 0, sizeof(iwe));
iwe.cmd = SIOCGIWESSID;
Expand Down Expand Up @@ -244,7 +244,7 @@ int iwctl_giwscan(struct net_device *dev, struct iw_request_info *info,
iwe.u.qual.level = ldBm;
iwe.u.qual.noise = 0;

if (-ldBm<50)
if (-ldBm < 50)
iwe.u.qual.qual = 100;
else if (-ldBm > 90)
iwe.u.qual.qual = 0;
Expand Down Expand Up @@ -1099,9 +1099,9 @@ int iwctl_siwencode(struct net_device *dev, struct iw_request_info *info,
// Send the key to the card
if (wrq->length > 0) {

if (wrq->length == WLAN_WEP232_KEYLEN) {
if (wrq->length == WLAN_WEP232_KEYLEN) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set 232 bit wep key\n");
} else if (wrq->length == WLAN_WEP104_KEYLEN) {
} else if (wrq->length == WLAN_WEP104_KEYLEN) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set 104 bit wep key\n");
} else if (wrq->length == WLAN_WEP40_KEYLEN) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set 40 bit wep key, index= %d\n", (int)dwKeyIndex);
Expand Down Expand Up @@ -1624,8 +1624,7 @@ int iwctl_siwmlme(struct net_device *dev, struct iw_request_info *info,
case IW_MLME_DISASSOC:
if (pDevice->bLinkPass == TRUE) {
PRINT_K("iwctl_siwmlme--->send DISASSOCIATE\n");
bScheduleCommand((void *)pDevice,
WLAN_CMD_DISASSOCIATE,
bScheduleCommand((void *)pDevice, WLAN_CMD_DISASSOCIATE,
NULL);
}
break;
Expand Down

0 comments on commit 5e79965

Please sign in to comment.