projects / packages / rtl8812au.git / blame
| Commit | Line | Data |
|---|---|---|
| f402f269 JR |
1 | --- rtl8812au_linux-master/os_dep/linux/ioctl_cfg80211.c.orig 2015-09-27 12:11:20.000000000 +0200 |
| 2 | +++ rtl8812au_linux-master/os_dep/linux/ioctl_cfg80211.c 2015-09-27 13:53:42.644724720 +0200 | |
| 3 | @@ -3741,7 +3737,11 @@ | |
| 4 | }; | |
| 5 | #endif | |
| 6 | ||
| 7 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) | |
| 8 | +static int rtw_cfg80211_add_monitor_if(_adapter *padapter, char *name, unsigned char name_assign_type, struct net_device **ndev) | |
| 9 | +#else | |
| 10 | static int rtw_cfg80211_add_monitor_if(_adapter *padapter, char *name, struct net_device **ndev) | |
| 11 | +#endif | |
| 12 | { | |
| 13 | int ret = 0; | |
| 14 | struct net_device* mon_ndev = NULL; | |
| 15 | @@ -3772,6 +3772,9 @@ | |
| 16 | mon_ndev->type = ARPHRD_IEEE80211_RADIOTAP; | |
| 17 | strncpy(mon_ndev->name, name, IFNAMSIZ); | |
| 18 | mon_ndev->name[IFNAMSIZ - 1] = 0; | |
| 19 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) | |
| 20 | + mon_ndev->name_assign_type = name_assign_type; | |
| 21 | +#endif | |
| 22 | mon_ndev->destructor = rtw_ndev_destructor; | |
| 23 | ||
| 24 | #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29)) | |
| 25 | @@ -3836,6 +3839,9 @@ | |
| 26 | #else | |
| 27 | char *name, | |
| 28 | #endif | |
| 29 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) | |
| 30 | + unsigned char name_assign_type, | |
| 31 | +#endif | |
| 32 | enum nl80211_iftype type, u32 *flags, struct vif_params *params) | |
| 33 | { | |
| 34 | int ret = 0; | |
| 35 | @@ -3853,7 +3859,11 @@ | |
| 36 | ret = -ENODEV; | |
| 37 | break; | |
| 38 | case NL80211_IFTYPE_MONITOR: | |
| 39 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) | |
| 40 | + ret = rtw_cfg80211_add_monitor_if(padapter, (char *)name, name_assign_type, &ndev); | |
| 41 | +#else | |
| 42 | ret = rtw_cfg80211_add_monitor_if(padapter, (char *)name, &ndev); | |
| 43 | +#endif | |
| 44 | break; | |
| 45 | ||
| 46 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) | |
| 47 | @@ -4130,12 +4140,15 @@ | |
| 48 | } | |
| 49 | ||
| 50 | static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev, | |
| 51 | -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) | |
| 52 | - const u8 *mac) | |
| 53 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)) | |
| 54 | + u8 *mac) { | |
| 55 | +#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0)) | |
| 56 | + const u8 *mac) { | |
| 57 | #else | |
| 58 | - u8 *mac) | |
| 59 | -#endif | |
| 60 | + struct station_del_parameters *params) | |
| 61 | { | |
| 62 | + const u8 *mac = params->mac; | |
| 63 | +#endif | |
| 64 | int ret=0; | |
| 65 | _irqL irqL; | |
| 66 | _list *phead, *plist; |