rtl8192du: Remove CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER

This variable is always selected. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
lwfinger · Jul 11, 2014 · d286447 · d286447
1 parent c5e045d
commit d286447
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 20 deletions.
diff --git a/core/rtw_ap.c b/core/rtw_ap.c
@@ -1870,9 +1870,6 @@ u8 ap_free_sta(struct rtw_adapter *padapter, struct sta_info *psta,
 	if (1) {
 		#ifdef COMPAT_KERNEL_RELEASE
 		rtw_cfg80211_indicate_sta_disassoc(padapter, psta->hwaddr, reason);
-		#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) && !defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER)
-		rtw_cfg80211_indicate_sta_disassoc(padapter, psta->hwaddr,
-						   reason);
 		#endif
 	} else {
 		rtw_indicate_sta_disassoc_event(padapter, psta);

diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c
@@ -1768,7 +1768,7 @@ void rtw_stassoc_event_callback(struct rtw_adapter *adapter, u8 *pbuf)
 		if (psta) {
 #ifdef COMPAT_KERNEL_RELEASE
 
-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37)) || defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER)
+#else
 			u8 *passoc_req = NULL;
 			u32 assoc_req_len;
 
@@ -1794,7 +1794,7 @@ void rtw_stassoc_event_callback(struct rtw_adapter *adapter, u8 *pbuf)
 
 				kfree(passoc_req);
 			}
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) || defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) */
+#endif
 
 			ap_sta_info_defer_update(adapter, psta);
 		}
@@ -1866,11 +1866,10 @@ void rtw_stadel_event_callback(struct rtw_adapter *adapter, u8 *pbuf)
 	if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
 #ifdef COMPAT_KERNEL_RELEASE
 
-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37)) || defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER)
+#else
 		rtw_cfg80211_indicate_sta_disassoc(adapter, pstadel->macaddr,
 						   *(u16 *)pstadel->rsvd);
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) || defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) */
-
+#endif
 		return;
 	}
 

diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c
@@ -1852,10 +1852,7 @@ unsigned int OnAssocReq(struct rtw_adapter *adapt,
 #ifdef COMPAT_KERNEL_RELEASE
 			rtw_cfg80211_indicate_sta_assoc(adapt, pframe,
 							pkt_len);
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) && !defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER)
-			rtw_cfg80211_indicate_sta_assoc(adapt, pframe,
-							pkt_len);
-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) && !defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) */
+#else
 			spin_lock_bh(&pstat->lock);
 			kfree(pstat->passoc_req);
 			pstat->passoc_req = NULL;
@@ -1867,9 +1864,8 @@ unsigned int OnAssocReq(struct rtw_adapter *adapt,
 				pstat->assoc_req_len = pkt_len;
 			}
 			spin_unlock_bh(&pstat->lock);
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) && !defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) */
-		} else
-		{
+#endif
+		} else {
 			rtw_indicate_sta_assoc_event(adapt, pstat);
 		}
 

diff --git a/include/autoconf.h b/include/autoconf.h
@@ -21,7 +21,6 @@
 #define DRV_NAME "r8192du"
 #define DRIVERVERSION	"v4.2.1_7122.20130408"
 
-#define CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER
 #define CONFIG_SET_SCAN_DENY_TIMER
 
 /*

diff --git a/include/ioctl_cfg80211.h b/include/ioctl_cfg80211.h
@@ -16,10 +16,6 @@
 #ifndef __IOCTL_CFG80211_H__
 #define __IOCTL_CFG80211_H__
 
-#if defined(RTW_USE_CFG80211_STA_EVENT)
-	#undef CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER
-#endif
-
 struct rtw_wdev_invit_info {
 	u8 token;
 	u8 flags;