Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353889
b: refs/heads/master
c: 8ddbbac
h: refs/heads/master
i:
  353887: a8b8fd5
v: v3
  • Loading branch information
YAMANE Toshiaki authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent dbb3be4 commit adbf418
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 17 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: 0a6d61ec7180094a0cd6ead156a05fafa1805104
refs/heads/master: 8ddbbac7f0132f05aa0277c59a19e542a0e46727
25 changes: 9 additions & 16 deletions trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c
Original file line number Diff line number Diff line change
Expand Up @@ -217,22 +217,18 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
down(&ieee->wx_sem);
spin_lock_irqsave(&ieee->lock, flags);

if(!ieee->bHwRadioOff)
{
if (!ieee->bHwRadioOff) {
list_for_each_entry(network, &ieee->network_list, list) {
i++;

if((stop-ev)<200)
{
if ((stop-ev)<200) {
err = -E2BIG;
break;
}
if (ieee->scan_age == 0 ||
time_after(network->last_scanned + ieee->scan_age, jiffies))
{
time_after(network->last_scanned + ieee->scan_age, jiffies)) {
ev = rtl818x_translate_scan(ieee, ev, stop, network, info);
}
else
} else
IEEE80211_DEBUG_SCAN(
"Not showing network '%s ("
"%pM)' due to age (%lums).\n",
Expand Down Expand Up @@ -430,7 +426,7 @@ int ieee80211_wx_get_encode(struct ieee80211_device *ieee,

IEEE80211_DEBUG_WX("GET_ENCODE\n");

if(ieee->iw_mode == IW_MODE_MONITOR)
if (ieee->iw_mode == IW_MODE_MONITOR)
return -1;

key = erq->flags & IW_ENCODE_INDEX;
Expand Down Expand Up @@ -715,15 +711,13 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len)
{
u8 *buf = NULL;

if (len>MAX_WPA_IE_LEN || (len && ie == NULL))
{
if (len>MAX_WPA_IE_LEN || (len && ie == NULL)) {
printk("return error out, len:%zu\n", len);
return -EINVAL;
}

if (len)
{
if (len != ie[1]+2){
if (len) {
if (len != ie[1]+2) {
printk("len:%zu, ie:%d\n", len, ie[1]);
return -EINVAL;
}
Expand All @@ -733,8 +727,7 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len)
kfree(ieee->wpa_ie);
ieee->wpa_ie = buf;
ieee->wpa_ie_len = len;
}
else{
} else {
kfree(ieee->wpa_ie);
ieee->wpa_ie = NULL;
ieee->wpa_ie_len = 0;
Expand Down

0 comments on commit adbf418

Please sign in to comment.