diff options
| author | Mike McCormack <mikem@ring3k.org> | 2011-07-11 08:56:20 +0900 |
|---|---|---|
| committer | Larry Finger <Larry.Finger@lwfinger.net> | 2011-08-23 20:02:27 -0500 |
| commit | cb76215448947ddcc133c4b1c2ff2d4a77e851e0 (patch) | |
| tree | fd624f3b0be586b9a1e182b0e5fa68f40db34132 /drivers/staging/rtl8192e/rtllib_softmac_wx.c | |
| parent | 1ec3e2f255c597c4bff693d0b045a49b12c5bb90 (diff) | |
rtl8192e: Remove extra ifdefs
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Diffstat (limited to 'drivers/staging/rtl8192e/rtllib_softmac_wx.c')
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_softmac_wx.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c index 7cda2908bae..863b2851657 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -311,13 +311,8 @@ int rtllib_wx_set_mode(struct rtllib_device *ieee, struct iw_request_info *a, goto out; if (wrqu->mode == IW_MODE_MONITOR) { -#if defined(RTLLIB_RADIOTAP) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10)) - ieee->dev->type = ARPHRD_IEEE80211_RADIOTAP; -#else ieee->dev->type = ARPHRD_IEEE80211; -#endif rtllib_EnableNetMonitorMode(ieee->dev,false); - } else { ieee->dev->type = ARPHRD_ETHER; if (ieee->iw_mode == IW_MODE_MONITOR) @@ -461,11 +456,7 @@ int rtllib_wx_set_essid(struct rtllib_device *ieee, proto_started = ieee->proto_started; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)) - len = ((wrqu->essid.length-1) < IW_ESSID_MAX_SIZE) ? (wrqu->essid.length-1) : IW_ESSID_MAX_SIZE; -#else len = (wrqu->essid.length < IW_ESSID_MAX_SIZE) ? wrqu->essid.length : IW_ESSID_MAX_SIZE; -#endif if (len > IW_ESSID_MAX_SIZE){ ret= -E2BIG; |