1
0
mirror of https://github.com/aircrack-ng/rtl8812au.git synced 2024-11-25 14:44:09 +00:00

Fix both ISO90 warning and get_channel function

This commit is contained in:
Christian B 2019-02-10 03:05:40 +01:00 committed by GitHub
parent 6658361034
commit c87010367d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3852,8 +3852,8 @@ void rtw_cfg80211_indicate_sta_assoc(_adapter *padapter, u8 *pmgmt_frame, uint f
#if defined(RTW_USE_CFG80211_STA_EVENT) || defined(COMPAT_KERNEL_RELEASE) #if defined(RTW_USE_CFG80211_STA_EVENT) || defined(COMPAT_KERNEL_RELEASE)
{ {
struct station_info sinfo; struct station_info sinfo;
_rtw_memset(&sinfo, 0, sizeof(struct station_info));
u8 ie_offset; u8 ie_offset;
_rtw_memset(&sinfo, 0, sizeof(struct station_info));
if (get_frame_sub_type(pmgmt_frame) == WIFI_ASSOCREQ) if (get_frame_sub_type(pmgmt_frame) == WIFI_ASSOCREQ)
ie_offset = _ASOCREQ_IE_OFFSET_; ie_offset = _ASOCREQ_IE_OFFSET_;
else /* WIFI_REASSOCREQ */ else /* WIFI_REASSOCREQ */
@ -4859,6 +4859,16 @@ static int cfg80211_rtw_get_channel(struct wiphy *wiphy, struct wireless_dev *wd
//DBG_871X("%s dvobj null\n", __func__); //DBG_871X("%s dvobj null\n", __func__);
} }
switch(pHalData->current_channel_bw){ switch(pHalData->current_channel_bw){
case CHANNEL_WIDTH_5:
//DBG_871X("%s width 5\n", __func__);
width = NL80211_CHAN_WIDTH_5;
center_freq = control_freq;
break;
case CHANNEL_WIDTH_10:
//DBG_871X("%s width 5\n", __func__);
width = NL80211_CHAN_WIDTH_10;
center_freq = control_freq;
break;
case CHANNEL_WIDTH_20: case CHANNEL_WIDTH_20:
//DBG_871X("%s width 20\n", __func__); //DBG_871X("%s width 20\n", __func__);
width = NL80211_CHAN_WIDTH_20; width = NL80211_CHAN_WIDTH_20;