|
@@ -1,6 +1,6 @@
|
|
|
--- a/os_dep/linux/ioctl_cfg80211.c
|
|
|
+++ b/os_dep/linux/ioctl_cfg80211.c
|
|
|
-@@ -5177,6 +5177,14 @@ exit:
|
|
|
+@@ -5177,6 +5177,15 @@ exit:
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -11,19 +11,12 @@
|
|
|
+{
|
|
|
+
|
|
|
+}
|
|
|
-+#else
|
|
|
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
|
|
|
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
|
|
|
- struct wireless_dev *wdev,
|
|
|
-@@ -5205,6 +5213,7 @@ static void cfg80211_rtw_mgmt_frame_regi
|
|
|
- exit:
|
|
|
- return;
|
|
|
- }
|
|
|
+#endif
|
|
|
-
|
|
|
++
|
|
|
#if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
|
|
|
static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
|
|
|
-@@ -6019,7 +6028,10 @@ static struct cfg80211_ops rtw_cfg80211_
|
|
|
+ struct net_device *ndev,
|
|
|
+@@ -5990,7 +5999,10 @@ static struct cfg80211_ops rtw_cfg80211_
|
|
|
.cancel_remain_on_channel = cfg80211_rtw_cancel_remain_on_channel,
|
|
|
#endif
|
|
|
|
|
@@ -33,5 +26,5 @@
|
|
|
+ .update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
|
|
|
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
|
|
|
.mgmt_tx = cfg80211_rtw_mgmt_tx,
|
|
|
- .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
|
|
|
#elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,34) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,35))
|
|
|
+ .action = cfg80211_rtw_mgmt_tx,
|