]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: rtl8821ae: rc.c: Remove version specific code
authorSachin Kamat <sachin.kamat@linaro.org>
Tue, 27 May 2014 10:32:42 +0000 (16:02 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 May 2014 18:58:26 +0000 (11:58 -0700)
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8821ae/rc.c

index a5a09baa99c504ddf498757632e8f645dd06912d..0b4f32185082a7c78962e9d5db07a4a7fdc1db44 100644 (file)
@@ -210,16 +210,8 @@ static void rtl_tx_status(void *ppriv,
                                                       tid)) {
                                        sta_entry->tids[tid].agg.agg_state =
                                                RTL_AGG_PROGRESS;
-                                       /*<delete in kernel start>*/
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
-                                       /*<delete in kernel end>*/
                                        ieee80211_start_tx_ba_session(sta, tid,
                                                                      5000);
-                                       /*<delete in kernel start>*/
-#else
-                                       ieee80211_start_tx_ba_session(sta, tid);
-#endif
-                                       /*<delete in kernel end>*/
                                }
                        }
                }
@@ -232,15 +224,6 @@ static void rtl_rate_init(void *ppriv,
                          struct ieee80211_sta *sta, void *priv_sta)
 {
 }
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-static void rtl_rate_update(void *ppriv,
-                           struct ieee80211_supported_band *sband,
-                           struct ieee80211_sta *sta, void *priv_sta,
-                           u32 changed,
-                           enum nl80211_channel_type oper_chan_type)
-{
-}
-#else
 static void rtl_rate_update(void *ppriv,
                            struct ieee80211_supported_band *sband,
                            struct cfg80211_chan_def *chandef,
@@ -248,7 +231,6 @@ static void rtl_rate_update(void *ppriv,
                            u32 changed)
 {
 }
-#endif
 static void *rtl_rate_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);