Merge pull request #54 from evilphish/v5.1.5

Merge changes
This commit is contained in:
Christian B 2017-11-19 23:56:14 +01:00 committed by GitHub
commit aa590f367d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -750,10 +750,10 @@ void rtw_cfg80211_indicate_connect(_adapter *padapter)
} }
check_bss: check_bss:
if (!rtw_cfg80211_check_bss(padapter)){ if (!rtw_cfg80211_check_bss(padapter))
RTW_PRINT(FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter)); RTW_PRINT(FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter));
}else if (rtw_to_roam(padapter) > 0) { if (rtw_to_roam(padapter) > 0) {
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) || defined(COMPAT_KERNEL_RELEASE) #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) || defined(COMPAT_KERNEL_RELEASE)
struct wiphy *wiphy = pwdev->wiphy; struct wiphy *wiphy = pwdev->wiphy;
struct ieee80211_channel *notify_channel; struct ieee80211_channel *notify_channel;
@ -4367,9 +4367,9 @@ static int cfg80211_rtw_get_channel(struct wiphy *wiphy, struct wireless_dev *wd
_adapter *padapter= wiphy_to_adapter(wiphy); _adapter *padapter= wiphy_to_adapter(wiphy);
int channel; int channel;
int control_freq; int control_freq;
int center_freq; int center_freq=0;
int center_freq2=0; int center_freq2=0;
int width; int width=0;
int band; int band;
int bandWidth; int bandWidth;
int offset; int offset;