| author | Rongjun Chen <rongjun.chen@amlogic.com> | 2017-04-14 09:15:12 (GMT) |
|---|---|---|
| committer | Rongjun Chen <rongjun.chen@amlogic.com> | 2017-04-14 09:15:12 (GMT) |
| commit | ab83abd8f068b463a60b65dacc78e97462aceb38 (patch) | |
| tree | 33b09ea21f94177c99e5c761a25383406b95c313 | |
| parent | 4fde8107ef3059a38133fa40853335eb790e30ae (diff) | |
| download | 8189ftv-ab83abd8f068b463a60b65dacc78e97462aceb38.zip 8189ftv-ab83abd8f068b463a60b65dacc78e97462aceb38.tar.gz 8189ftv-ab83abd8f068b463a60b65dacc78e97462aceb38.tar.bz2 | |
wifi: fix kernel4.9 carsh issue
Change-Id: I9081eb565c35dbca9b246434d9c93e3e539d4559
| -rwxr-xr-x | rtl8189FS/os_dep/linux/ioctl_cfg80211.c | 8 | ||||
| -rwxr-xr-x | rtl8189FS/os_dep/linux/ioctl_cfg80211.h | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/rtl8189FS/os_dep/linux/ioctl_cfg80211.c b/rtl8189FS/os_dep/linux/ioctl_cfg80211.c index 613ccdb..86b44e5 100755 --- a/rtl8189FS/os_dep/linux/ioctl_cfg80211.c +++ b/rtl8189FS/os_dep/linux/ioctl_cfg80211.c @@ -2040,7 +2040,9 @@ void rtw_cfg80211_indicate_scan_done(_adapter *adapter, bool aborted) {
struct rtw_wdev_priv *pwdev_priv = adapter_wdev_data(adapter);
_irqL irqL;
-
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0))
+ struct cfg80211_scan_info info;
+#endif
_enter_critical_bh(&pwdev_priv->scan_req_lock, &irqL);
if (pwdev_priv->scan_request != NULL) {
#ifdef CONFIG_DEBUG_CFG80211
@@ -2055,8 +2057,8 @@ void rtw_cfg80211_indicate_scan_done(_adapter *adapter, bool aborted) else
{
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0))
- pwdev_priv->info->aborted = aborted;
- cfg80211_scan_done(pwdev_priv->scan_request, pwdev_priv->info);
+ info.aborted = aborted;
+ cfg80211_scan_done(pwdev_priv->scan_request, &info);
#else
cfg80211_scan_done(pwdev_priv->scan_request, aborted);
#endif
diff --git a/rtl8189FS/os_dep/linux/ioctl_cfg80211.h b/rtl8189FS/os_dep/linux/ioctl_cfg80211.h index 36c9544..9b483c6 100755 --- a/rtl8189FS/os_dep/linux/ioctl_cfg80211.h +++ b/rtl8189FS/os_dep/linux/ioctl_cfg80211.h @@ -84,9 +84,6 @@ struct rtw_wdev_priv _adapter *padapter;
struct cfg80211_scan_request *scan_request;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0))
- struct cfg80211_scan_info *info;
-#endif
_lock scan_req_lock;
struct net_device *pmon_ndev;//for monitor interface
|