Add support for kernels >= 4.8

This patch fix compilation failure caused by modification of
cfg80211_scan_done() prototype.

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
This commit is contained in:
Masashi Honma 2016-09-25 18:56:40 +09:00 committed by astsam
parent 647020663d
commit 46ea178897

View File

@ -1862,6 +1862,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, 8, 0))
struct cfg80211_scan_info info;
#endif // (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0))
_enter_critical_bh(&pwdev_priv->scan_req_lock, &irqL);
if (pwdev_priv->scan_request != NULL) {
@ -1873,7 +1876,15 @@ void rtw_cfg80211_indicate_scan_done(_adapter *adapter, bool aborted)
if (pwdev_priv->scan_request->wiphy != pwdev_priv->rtw_wdev->wiphy)
RTW_INFO("error wiphy compare\n");
else
{
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0))
memset(&info, 0, sizeof(info));
info.aborted = aborted;
cfg80211_scan_done(pwdev_priv->scan_request, &info);
#else // (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0))
cfg80211_scan_done(pwdev_priv->scan_request, aborted);
#endif // (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0))
}
pwdev_priv->scan_request = NULL;
} else {