Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338270
b: refs/heads/master
c: f553a75
h: refs/heads/master
v: v3
  • Loading branch information
YAMANE Toshiaki authored and Greg Kroah-Hartman committed Nov 27, 2012
1 parent 73e3dea commit 4fab0a7
Show file tree
Hide file tree
Showing 2 changed files with 9 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: 0a0cd35385835f632cf3fee5a46bcef66da98014
refs/heads/master: f553a75843139f9cb0a44f063f90be097bf35741
15 changes: 8 additions & 7 deletions trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,10 @@ int ieee80211_wx_set_wap(struct ieee80211_device *ieee,
return ret;
}

int ieee80211_wx_get_essid(struct ieee80211_device *ieee, struct iw_request_info *a,union iwreq_data *wrqu,char *b)
int ieee80211_wx_get_essid(struct ieee80211_device *ieee, struct iw_request_info *a,
union iwreq_data *wrqu, char *b)
{
int len,ret = 0;
int len, ret = 0;
unsigned long flags;

if (ieee->iw_mode == IW_MODE_MONITOR)
Expand All @@ -199,7 +200,7 @@ int ieee80211_wx_set_wap(struct ieee80211_device *ieee,
}
len = ieee->current_network.ssid_len;
wrqu->essid.length = len;
strncpy(b,ieee->current_network.ssid,len);
strncpy(b, ieee->current_network.ssid, len);
wrqu->essid.flags = 1;

out:
Expand Down Expand Up @@ -338,7 +339,7 @@ int ieee80211_wx_set_essid(struct ieee80211_device *ieee,
union iwreq_data *wrqu, char *extra)
{

int ret=0,len;
int ret=0, len;
short proto_started;
unsigned long flags;

Expand Down Expand Up @@ -454,9 +455,9 @@ int ieee80211_wx_get_name(struct ieee80211_device *ieee,

if ((ieee->state == IEEE80211_LINKED) ||
(ieee->state == IEEE80211_LINKED_SCANNING))
strlcat(wrqu->name," link", IFNAMSIZ);
strlcat(wrqu->name, " link", IFNAMSIZ);
else if (ieee->state != IEEE80211_NOLINK)
strlcat(wrqu->name," .....", IFNAMSIZ);
strlcat(wrqu->name, " .....", IFNAMSIZ);


return 0;
Expand Down Expand Up @@ -508,7 +509,7 @@ int ieee80211_wx_set_power(struct ieee80211_device *ieee,
if (wrqu->power.flags & IW_POWER_TIMEOUT) {

ieee->ps_timeout = wrqu->power.value / 1000;
printk("Timeout %d\n",ieee->ps_timeout);
printk("Timeout %d\n", ieee->ps_timeout);
}

if (wrqu->power.flags & IW_POWER_PERIOD) {
Expand Down

0 comments on commit 4fab0a7

Please sign in to comment.