haraldwolff/rtl8822bu
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Adapt struct cfg80211_ops to Linux kernel [818a986e4ebacea2020622e48c8bc04b7f500d89].

Browse source 
See 818a986e4e
This commit is contained in:
Fomalhaut Weisszwerg 2017-11-05 22:08:50 +09:00
parent b2d79d1610
commit 53fe19cee2
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
os_dep/linux/ioctl_cfg80211.c
View file

@ -1738,9 +1738,13 @@ enum nl80211_iftype {
NL80211_IFTYPE_MAX = NUM_NL80211_IFTYPES - 1 NL80211_IFTYPE_MAX = NUM_NL80211_IFTYPES - 1
}; };
#endif #endif
static int cfg80211_rtw_change_iface(struct wiphy *wiphy, static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
struct net_device *ndev, struct net_device *ndev,
enum nl80211_iftype type, u32 *flags, enum nl80211_iftype type,
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
u32 *flags,
#endif
struct vif_params *params) { struct vif_params *params) {
enum nl80211_iftype old_type; enum nl80211_iftype old_type;
NDIS_802_11_NETWORK_INFRASTRUCTURE networkType; NDIS_802_11_NETWORK_INFRASTRUCTURE networkType;
@ -3688,7 +3692,11 @@ cfg80211_rtw_add_virtual_intf(
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0))
unsigned char name_assign_type, unsigned char name_assign_type,
#endif #endif
enum nl80211_iftype type, u32 *flags, struct vif_params *params) { enum nl80211_iftype type,
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
u32 *flags,
#endif
struct vif_params *params) {
int ret = 0; int ret = 0;
struct net_device *ndev = NULL; struct net_device *ndev = NULL;
_adapter *padapter = wiphy_to_adapter(wiphy); _adapter *padapter = wiphy_to_adapter(wiphy);
@ -6156,6 +6164,9 @@ static void rtw_cfg80211_preinit_wiphy(_adapter *adapter, struct wiphy *wiphy) {
#endif #endif
} }
/* Member `(*change_virtual_intf)()` and `(*add_virtual_intf)()` were changed by Linux kernel [818a986e4ebacea2020622e48c8bc04b7f500d89].
* See https://github.com/torvalds/linux/commit/818a986e4ebacea2020622e48c8bc04b7f500d89
*/
static struct cfg80211_ops rtw_cfg80211_ops = { static struct cfg80211_ops rtw_cfg80211_ops = {
.change_virtual_intf = cfg80211_rtw_change_iface, .change_virtual_intf = cfg80211_rtw_change_iface,
.add_key = cfg80211_rtw_add_key, .add_key = cfg80211_rtw_add_key,