Staging: rtl8187se: remove kernel version compatibility wrappers

[mv-sheeva.git] / drivers / staging / rtl8187se / ieee80211 / ieee80211_wx.c

diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c
index d1295e56fd425bb2bdcb39484db9c25c82b66312..35a35a707c21ac85ff1741e94bb36004a3976df8 100644 (file)
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c
@@ -61,11 +61,7 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee,
        iwe.cmd = SIOCGIWAP;
        iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
        memcpy(iwe.u.ap_addr.sa_data, network->bssid, ETH_ALEN);
-#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9)
        start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_ADDR_LEN);
-#else
-       start = iwe_stream_add_event(start, stop, &iwe, IW_EV_ADDR_LEN);
-#endif
 
        /* Remaining entries will be displayed in the order we provide them */
 
@@ -77,28 +73,16 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee,
        if (network->ssid_len == 0) {
        //YJ,modified,080903,end
                iwe.u.data.length = sizeof("<hidden>");
-#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9)
                start = iwe_stream_add_point(info, start, stop, &iwe, "<hidden>");
-#else
-               start = iwe_stream_add_point(start, stop, &iwe, "<hidden>");
-#endif
        } else {
                iwe.u.data.length = min(network->ssid_len, (u8)32);
-#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9)
                start = iwe_stream_add_point(info, start, stop, &iwe, network->ssid);
-#else
-               start = iwe_stream_add_point(start, stop, &iwe, network->ssid);
-#endif
        }
        //printk("ESSID: %s\n",network->ssid);
        /* Add the protocol name */
        iwe.cmd = SIOCGIWNAME;
        snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11%s", ieee80211_modes[network->mode]);
-#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9)
        start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_CHAR_LEN);
-#else
-       start = iwe_stream_add_event(start, stop, &iwe, IW_EV_CHAR_LEN);
-#endif
 
         /* Add mode */
         iwe.cmd = SIOCGIWMODE;
@@ -109,11 +93,7 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee,
                else
                        iwe.u.mode = IW_MODE_ADHOC;
 
-#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9)
                start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_UINT_LEN);
-#else
-               start = iwe_stream_add_event(start, stop, &iwe, IW_EV_UINT_LEN);
-#endif
        }
 
         /* Add frequency/channel */
@@ -123,11 +103,7 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee,
        iwe.u.freq.m = network->channel;
        iwe.u.freq.e = 0;
        iwe.u.freq.i = 0;
-#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9)
        start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_FREQ_LEN);
-#else
-       start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN);
-#endif
 
        /* Add encryption capability */
        iwe.cmd = SIOCGIWENCODE;
@@ -136,11 +112,7 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee,
        else
                iwe.u.data.flags = IW_ENCODE_DISABLED;
        iwe.u.data.length = 0;
-#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9)
        start = iwe_stream_add_point(info, start, stop, &iwe, network->ssid);
-#else
-       start = iwe_stream_add_point(start, stop, &iwe, network->ssid);
-#endif
 
        /* Add basic and extended rates */
        max_rate = 0;
@@ -169,20 +141,12 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee,
        iwe.cmd = SIOCGIWRATE;
        iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
        iwe.u.bitrate.value = max_rate * 500000;
-#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9)
        start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_PARAM_LEN);
-#else
-       start = iwe_stream_add_event(start, stop, &iwe, IW_EV_PARAM_LEN);
-#endif
 
        iwe.cmd = IWEVCUSTOM;
        iwe.u.data.length = p - custom;
        if (iwe.u.data.length)
-#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9)
                start = iwe_stream_add_point(info, start, stop, &iwe, custom);
-#else
-               start = iwe_stream_add_point(start, stop, &iwe, custom);
-#endif
 
        /* Add quality statistics */
        /* TODO: Fix these values... */
@@ -201,22 +165,14 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee,
        if (!(network->stats.mask & IEEE80211_STATMASK_SIGNAL))
                iwe.u.qual.updated |= IW_QUAL_QUAL_INVALID;
        iwe.u.qual.updated = 7;
-#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9)
        start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_QUAL_LEN);
-#else
-       start = iwe_stream_add_event(start, stop, &iwe, IW_EV_QUAL_LEN);
-#endif
 
        iwe.cmd = IWEVCUSTOM;
        p = custom;
 
        iwe.u.data.length = p - custom;
        if (iwe.u.data.length)
-#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9)
                start = iwe_stream_add_point(info, start, stop, &iwe, custom);
-#else
-               start = iwe_stream_add_point(start, stop, &iwe, custom);
-#endif
 
 #if 0
        if (ieee->wpa_enabled && network->wpa_ie_len){
@@ -231,11 +187,7 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee,
                memset(&iwe, 0, sizeof(iwe));
                iwe.cmd = IWEVCUSTOM;
                iwe.u.data.length = strlen(buf);
-#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9)
                start = iwe_stream_add_point(info, start, stop, &iwe, buf);
-#else
-               start = iwe_stream_add_point(start, stop, &iwe, buf);
-#endif
        }
 
        if (ieee->wpa_enabled && network->rsn_ie_len){
@@ -256,11 +208,7 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee,
                 memcpy(buf, network->wpa_ie, network->wpa_ie_len);
                 iwe.cmd = IWEVGENIE;
                 iwe.u.data.length = network->wpa_ie_len;
-#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9)
                 start = iwe_stream_add_point(info, start, stop, &iwe, buf);
-#else
-                start = iwe_stream_add_point(start, stop, &iwe, buf);
-#endif
         }
 
         memset(&iwe, 0, sizeof(iwe));
@@ -278,11 +226,7 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee,
                 memcpy(buf, network->rsn_ie, network->rsn_ie_len);
                 iwe.cmd = IWEVGENIE;
                 iwe.u.data.length = network->rsn_ie_len;
-#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9)
                start = iwe_stream_add_point(info, start, stop, &iwe, buf);
-#else
-               start = iwe_stream_add_point(start, stop, &iwe, buf);
-#endif
        }
 
 #endif
@@ -295,11 +239,7 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee,
                      " Last beacon: %lums ago", (jiffies - network->last_scanned) / (HZ / 100));
        iwe.u.data.length = p - custom;
        if (iwe.u.data.length)
-#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9)
                start = iwe_stream_add_point(info, start, stop, &iwe, custom);
-#else
-               start = iwe_stream_add_point(start, stop, &iwe, custom);
-#endif
 
        return start;
 }