From 95e6f31e4abba469c23b136ccd9cacda707306b6 Mon Sep 17 00:00:00 2001 From: YAMANE Toshiaki Date: Tue, 27 Nov 2012 21:09:31 +0900 Subject: [PATCH] --- yaml --- r: 338271 b: refs/heads/master c: 6ed84198fe05be243c67510961e574c3a9abe4d7 h: refs/heads/master i: 338269: 73e3deaf52ec6bbb0b14c4a8801f9f3e5df67fcf 338267: ddb556e4e3748afa37956a3034579e242c87e362 338263: 26d52a397d3925ab2103b3377584bda8e5fc237f 338255: 96d884ada3f6ad1518f6ab24b0fc881ff1fa843d 338239: bae8966eb3b1438d037c37224a60418ab487a5f5 v: v3 --- [refs] | 2 +- .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 63282a1012eb..5a57a32dd195 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f553a75843139f9cb0a44f063f90be097bf35741 +refs/heads/master: 6ed84198fe05be243c67510961e574c3a9abe4d7 diff --git a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c index f06ed3530422..177ff587ce6d 100644 --- a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c +++ b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c @@ -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; } @@ -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;