Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338271
b: refs/heads/master
c: 6ed8419
h: refs/heads/master
i:
  338269: 73e3dea
  338267: ddb556e
  338263: 26d52a3
  338255: 96d884a
  338239: bae8966
v: v3
  • Loading branch information
YAMANE Toshiaki authored and Greg Kroah-Hartman committed Nov 27, 2012
1 parent 4fab0a7 commit 95e6f31
Show file tree
Hide file tree
Showing 2 changed files with 6 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: f553a75843139f9cb0a44f063f90be097bf35741
refs/heads/master: 6ed84198fe05be243c67510961e574c3a9abe4d7
12 changes: 5 additions & 7 deletions trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,11 +218,11 @@ int ieee80211_wx_set_rate(struct ieee80211_device *ieee,
u32 target_rate = wrqu->bitrate.value;

//added by lizhaoming for auto mode
if (target_rate == -1) {
if (target_rate == -1)
ieee->rate = 110;
} else {
else
ieee->rate = target_rate/100000;
}

//FIXME: we might want to limit rate also in management protocols.
return 0;
}
Expand Down Expand Up @@ -250,12 +250,10 @@ int ieee80211_wx_set_mode(struct ieee80211_device *ieee, struct iw_request_info
if (wrqu->mode == ieee->iw_mode)
goto out;

if (wrqu->mode == IW_MODE_MONITOR) {

if (wrqu->mode == IW_MODE_MONITOR)
ieee->dev->type = ARPHRD_IEEE80211;
} else {
else
ieee->dev->type = ARPHRD_ETHER;
}

if (!ieee->proto_started) {
ieee->iw_mode = wrqu->mode;
Expand Down

0 comments on commit 95e6f31

Please sign in to comment.