Autres/rtl8812AU_8821AU_linux_debian9-10
1
0
Fork 0
mirror of https://github.com/abperiasamy/rtl8812AU_8821AU_linux.git synced 2025-10-19 17:11:09 +02:00
Code Issues Releases Wiki Activity

Fix cfg80211_rx_mgmt missing argument on 3.12.0 --> 3.19.0 kernels

Browse Source
This commit is contained in:
Harshavardhana
2015-05-08 11:12:34 -07:00
parent 12217798c3
commit 6f6d28214e
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/ioctl_cfg80211.h
View File

@@ -1,7 +1,7 @@
/****************************************************************************** /******************************************************************************
* *
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as * under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation. * published by the Free Software Foundation.
@@ -18,7 +18,7 @@
* *
******************************************************************************/ ******************************************************************************/
#ifndef __IOCTL_CFG80211_H__ #ifndef __IOCTL_CFG80211_H__
#define __IOCTL_CFG80211_H__ #define __IOCTL_CFG80211_H__
#if defined(RTW_USE_CFG80211_STA_EVENT) #if defined(RTW_USE_CFG80211_STA_EVENT)
@@ -30,7 +30,7 @@ struct rtw_wdev_invit_info {
u8 flags; u8 flags;
u8 status; u8 status;
u8 req_op_ch; u8 req_op_ch;
u8 rsp_op_ch; u8 rsp_op_ch;
}; };
#define rtw_wdev_invit_info_init(invit_info) \ #define rtw_wdev_invit_info_init(invit_info) \
@@ -43,9 +43,9 @@ struct rtw_wdev_invit_info {
} while (0) } while (0)
struct rtw_wdev_priv struct rtw_wdev_priv
{ {
struct wireless_dev *rtw_wdev; struct wireless_dev *rtw_wdev;
_adapter *padapter; _adapter *padapter;
struct cfg80211_scan_request *scan_request; struct cfg80211_scan_request *scan_request;
@@ -66,9 +66,9 @@ struct rtw_wdev_priv
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
ATOMIC_T ro_ch_to; ATOMIC_T ro_ch_to;
ATOMIC_T switch_ch_to; ATOMIC_T switch_ch_to;
#endif #endif
}; };
#define wdev_to_priv(w) ((struct rtw_wdev_priv *)(wdev_priv(w))) #define wdev_to_priv(w) ((struct rtw_wdev_priv *)(wdev_priv(w)))
@@ -109,9 +109,9 @@ bool rtw_cfg80211_pwr_mgmt(_adapter *adapter);
#define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->pnetdev, freq, sig_dbm, buf, len, gfp) #define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->pnetdev, freq, sig_dbm, buf, len, gfp)
#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0)) #elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0))
#define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->rtw_wdev, freq, sig_dbm, buf, len, gfp) #define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->rtw_wdev, freq, sig_dbm, buf, len, gfp)
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0))
#define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->rtw_wdev, freq, sig_dbm, buf, len, 0, gfp)
#else #else
// 3.12 added a flags argument which is just set to zero
// 3.19 above mentioned flag is no longer neccesary.
#define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->rtw_wdev, freq, sig_dbm, buf, len, gfp) #define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->rtw_wdev, freq, sig_dbm, buf, len, gfp)
#endif #endif
@@ -139,4 +139,3 @@ bool rtw_cfg80211_pwr_mgmt(_adapter *adapter);
#endif #endif
#endif //__IOCTL_CFG80211_H__ #endif //__IOCTL_CFG80211_H__