From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 10 Apr 2013 18:09:54 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: firefly_0821_release~3680^2~478^2~21^2^2~117
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=655d8e2328a6ef6b6b514609a4c1e33508d3a1da;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next

Conflicts:
	drivers/net/wireless/ath/carl9170/debug.c
	drivers/net/wireless/ath/carl9170/main.c
	net/mac80211/ieee80211_i.h
---

655d8e2328a6ef6b6b514609a4c1e33508d3a1da
diff --cc drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index bd8251c1c749,306c55019e77..2774dd13c786
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@@ -1067,23 -1067,19 +1067,23 @@@ static bool ath9k_rx_prepare(struct ath
  
  	last_rssi = priv->rx.last_rssi;
  
 -	if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
 -		rxbuf->rxstatus.rs_rssi = ATH_EP_RND(last_rssi,
 -						     ATH_RSSI_EP_MULTIPLIER);
 +	if (ieee80211_is_beacon(hdr->frame_control) &&
 +	    !is_zero_ether_addr(common->curbssid) &&
 +	    ether_addr_equal(hdr->addr3, common->curbssid)) {
 +		s8 rssi = rxbuf->rxstatus.rs_rssi;
  
 -	if (rxbuf->rxstatus.rs_rssi < 0)
 -		rxbuf->rxstatus.rs_rssi = 0;
 +		if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
 +			rssi = ATH_EP_RND(last_rssi, ATH_RSSI_EP_MULTIPLIER);
  
 -	if (ieee80211_is_beacon(fc))
 -		priv->ah->stats.avgbrssi = rxbuf->rxstatus.rs_rssi;
 +		if (rssi < 0)
 +			rssi = 0;
 +
 +		priv->ah->stats.avgbrssi = rssi;
 +	}
  
  	rx_status->mactime = be64_to_cpu(rxbuf->rxstatus.rs_tstamp);
- 	rx_status->band = hw->conf.channel->band;
- 	rx_status->freq = hw->conf.channel->center_freq;
+ 	rx_status->band = hw->conf.chandef.chan->band;
+ 	rx_status->freq = hw->conf.chandef.chan->center_freq;
  	rx_status->signal =  rxbuf->rxstatus.rs_rssi + ATH_DEFAULT_NOISE_FLOOR;
  	rx_status->antenna = rxbuf->rxstatus.rs_antenna;
  	rx_status->flag |= RX_FLAG_MACTIME_END;
diff --cc drivers/net/wireless/ath/carl9170/debug.c
index 40109be81f7c,7741fe8e0816..3d70cd277fd7
--- a/drivers/net/wireless/ath/carl9170/debug.c
+++ b/drivers/net/wireless/ath/carl9170/debug.c
@@@ -654,8 -654,9 +654,8 @@@ static ssize_t carl9170_debugfs_bug_wri
  		goto out;
  
  	case 'P':
- 		err = carl9170_set_channel(ar, ar->hw->conf.channel,
- 					   ar->hw->conf.channel_type);
+ 		err = carl9170_set_channel(ar, ar->hw->conf.chandef.chan,
 -			cfg80211_get_chandef_type(&ar->hw->conf.chandef),
 -			CARL9170_RFI_COLD);
++			cfg80211_get_chandef_type(&ar->hw->conf.chandef));
  		if (err < 0)
  			count = err;
  
diff --cc drivers/net/wireless/ath/carl9170/main.c
index 699c557bc2c7,4e268b1360d8..e9010a481dfd
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@@ -938,8 -941,8 +941,8 @@@ static int carl9170_op_config(struct ie
  		if (err)
  			goto out;
  
- 		err = carl9170_set_channel(ar, hw->conf.channel,
- 					   hw->conf.channel_type);
+ 		err = carl9170_set_channel(ar, hw->conf.chandef.chan,
 -					   channel_type, CARL9170_RFI_NONE);
++					   channel_type);
  		if (err)
  			goto out;
  
diff --cc drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
index 86e312a4f629,1d20287b1120..e6eca4d66f6c
--- a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
@@@ -926,11 -902,13 +929,14 @@@ static int iwl_mvm_mac_ctxt_cmd_go(stru
  	iwl_mvm_mac_ctxt_cmd_common(mvm, vif, &cmd, action);
  
  	/* Fill the data specific for GO mode */
 -	iwl_mvm_mac_ctxt_cmd_fill_ap(mvm, vif, &cmd.go.ap);
 +	iwl_mvm_mac_ctxt_cmd_fill_ap(mvm, vif, &cmd.go.ap,
 +				     action == FW_CTXT_ACTION_ADD);
  
- 	cmd.go.ctwin = cpu_to_le32(vif->bss_conf.p2p_ctwindow);
- 	cmd.go.opp_ps_enabled = cpu_to_le32(!!vif->bss_conf.p2p_oppps);
+ 	cmd.go.ctwin = cpu_to_le32(noa->oppps_ctwindow &
+ 					IEEE80211_P2P_OPPPS_CTWINDOW_MASK);
+ 	cmd.go.opp_ps_enabled =
+ 			cpu_to_le32(!!(noa->oppps_ctwindow &
+ 					IEEE80211_P2P_OPPPS_ENABLE_BIT));
  
  	return iwl_mvm_mac_ctxt_send_cmd(mvm, &cmd);
  }
diff --cc drivers/net/wireless/rtlwifi/base.c
index cac1fa912e8c,0e7866d1d0e2..af59dd5718e1
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@@ -955,56 -924,6 +955,56 @@@ void rtl_get_tcb_desc(struct ieee80211_
  }
  EXPORT_SYMBOL(rtl_get_tcb_desc);
  
 +static bool addbareq_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
 +{
 +	struct rtl_priv *rtlpriv = rtl_priv(hw);
 +	struct ieee80211_sta *sta = NULL;
 +	struct ieee80211_hdr *hdr = rtl_get_hdr(skb);
 +	struct rtl_sta_info *sta_entry = NULL;
 +	struct ieee80211_mgmt *mgmt = (void *)skb->data;
 +	u16 capab = 0, tid = 0;
 +	struct rtl_tid_data *tid_data;
 +	struct sk_buff *skb_delba = NULL;
 +	struct ieee80211_rx_status rx_status = { 0 };
 +
 +	rcu_read_lock();
 +	sta = rtl_find_sta(hw, hdr->addr3);
 +	if (sta == NULL) {
 +		RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_EMERG,
 +			 "sta is NULL\n");
 +		rcu_read_unlock();
 +		return true;
 +	}
 +
 +	sta_entry = (struct rtl_sta_info *)sta->drv_priv;
 +	if (!sta_entry) {
 +		rcu_read_unlock();
 +		return true;
 +	}
 +	capab = le16_to_cpu(mgmt->u.action.u.addba_req.capab);
 +	tid = (capab & IEEE80211_ADDBA_PARAM_TID_MASK) >> 2;
 +	tid_data = &sta_entry->tids[tid];
 +	if (tid_data->agg.rx_agg_state == RTL_RX_AGG_START) {
 +		skb_delba = rtl_make_del_ba(hw, hdr->addr2, hdr->addr3, tid);
 +		if (skb_delba) {
- 			rx_status.freq = hw->conf.channel->center_freq;
- 			rx_status.band = hw->conf.channel->band;
++			rx_status.freq = hw->conf.chandef.chan->center_freq;
++			rx_status.band = hw->conf.chandef.chan->band;
 +			rx_status.flag |= RX_FLAG_DECRYPTED;
 +			rx_status.flag |= RX_FLAG_MACTIME_END;
 +			rx_status.rate_idx = 0;
 +			rx_status.signal = 50 + 10;
 +			memcpy(IEEE80211_SKB_RXCB(skb_delba), &rx_status,
 +			       sizeof(rx_status));
 +			RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG,
 +				      "fake del\n", skb_delba->data,
 +				      skb_delba->len);
 +			ieee80211_rx_irqsafe(hw, skb_delba);
 +		}
 +	}
 +	rcu_read_unlock();
 +	return false;
 +}
 +
  bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
  {
  	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
@@@ -1591,13 -1362,12 +1591,13 @@@ int rtl_send_smps_action(struct ieee802
  		struct rtl_sta_info *sta_entry =
  			(struct rtl_sta_info *) sta->drv_priv;
  		sta_entry->mimo_ps = smps;
 -		rtlpriv->cfg->ops->update_rate_tbl(hw, sta, 0);
  
  		info->control.rates[0].idx = 0;
- 		info->band = hw->conf.channel->band;
+ 		info->band = hw->conf.chandef.chan->band;
  		rtlpriv->intf_ops->adapter_tx(hw, sta, skb, &tcb_desc);
  	}
 +	return 1;
 +
  err_free:
  	return 0;
  }
diff --cc drivers/net/wireless/rtlwifi/core.c
index 2201b5cee08f,64a41ecf86cf..ee84844be008
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@@ -370,19 -320,9 +370,19 @@@ static int rtl_op_config(struct ieee802
  	}
  
  	if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
- 		struct ieee80211_channel *channel = hw->conf.channel;
+ 		struct ieee80211_channel *channel = hw->conf.chandef.chan;
  		u8 wide_chan = (u8) channel->hw_value;
  
 +		if (mac->act_scanning)
 +			mac->n_channels++;
 +
 +		if (rtlpriv->dm.supp_phymode_switch &&
 +		    mac->link_state < MAC80211_LINKED &&
 +		    !mac->act_scanning) {
 +			if (rtlpriv->cfg->ops->chk_switch_dmdp)
 +				rtlpriv->cfg->ops->chk_switch_dmdp(hw);
 +		}
 +
  		/*
  		 *because we should back channel to
  		 *current_network.chan in in scanning,
diff --cc drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
index d075237add51,000000000000..a8871d66d56a
mode 100644,000000..100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
@@@ -1,817 -1,0 +1,817 @@@
 +/******************************************************************************
 + *
 + * Copyright(c) 2009-2013  Realtek Corporation.
 + *
 + * This program is free software; you can redistribute it and/or modify it
 + * under the terms of version 2 of the GNU General Public License as
 + * published by the Free Software Foundation.
 + *
 + * This program is distributed in the hope that it will be useful, but WITHOUT
 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 + * more details.
 + *
 + * You should have received a copy of the GNU General Public License along with
 + * this program; if not, write to the Free Software Foundation, Inc.,
 + * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
 + *
 + * The full GNU General Public License is included in this distribution in the
 + * file called LICENSE.
 + *
 + * Contact Information:
 + * wlanfae <wlanfae@realtek.com>
 + * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
 + * Hsinchu 300, Taiwan.
 + *
 + * Larry Finger <Larry.Finger@lwfinger.net>
 + *
 + *****************************************************************************/
 +
 +#include "../wifi.h"
 +#include "../pci.h"
 +#include "../base.h"
 +#include "../stats.h"
 +#include "reg.h"
 +#include "def.h"
 +#include "phy.h"
 +#include "trx.h"
 +#include "led.h"
 +#include "dm.h"
 +
 +static u8 _rtl88ee_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
 +{
 +	__le16 fc = rtl_get_fc(skb);
 +
 +	if (unlikely(ieee80211_is_beacon(fc)))
 +		return QSLT_BEACON;
 +	if (ieee80211_is_mgmt(fc) || ieee80211_is_ctl(fc))
 +		return QSLT_MGNT;
 +
 +	return skb->priority;
 +}
 +
 +static void _rtl88ee_query_rxphystatus(struct ieee80211_hw *hw,
 +			struct rtl_stats *pstatus, u8 *pdesc,
 +			struct rx_fwinfo_88e *p_drvinfo,
 +			bool bpacket_match_bssid,
 +			bool bpacket_toself, bool packet_beacon)
 +{
 +	struct rtl_priv *rtlpriv = rtl_priv(hw);
 +	struct rtl_ps_ctl *ppsc = rtl_psc(rtlpriv);
 +	struct phy_sts_cck_8192s_t *cck_buf;
 +	struct phy_status_rpt *phystrpt = (struct phy_status_rpt *)p_drvinfo;
 +	struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
 +	char rx_pwr_all = 0, rx_pwr[4];
 +	u8 rf_rx_num = 0, evm, pwdb_all;
 +	u8 i, max_spatial_stream;
 +	u32 rssi, total_rssi = 0;
 +	bool is_cck = pstatus->is_cck;
 +	u8 lan_idx, vga_idx;
 +
 +	/* Record it for next packet processing */
 +	pstatus->packet_matchbssid = bpacket_match_bssid;
 +	pstatus->packet_toself = bpacket_toself;
 +	pstatus->packet_beacon = packet_beacon;
 +	pstatus->rx_mimo_sig_qual[0] = -1;
 +	pstatus->rx_mimo_sig_qual[1] = -1;
 +
 +	if (is_cck) {
 +		u8 cck_hipwr;
 +		u8 cck_agc_rpt;
 +		/* CCK Driver info Structure is not the same as OFDM packet. */
 +		cck_buf = (struct phy_sts_cck_8192s_t *)p_drvinfo;
 +		cck_agc_rpt = cck_buf->cck_agc_rpt;
 +
 +		/* (1)Hardware does not provide RSSI for CCK
 +		 * (2)PWDB, Average PWDB cacluated by
 +		 * hardware (for rate adaptive)
 +		 */
 +		if (ppsc->rfpwr_state == ERFON)
 +			cck_hipwr = rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2,
 +						  BIT(9));
 +		else
 +			cck_hipwr = false;
 +
 +		lan_idx = ((cck_agc_rpt & 0xE0) >> 5);
 +		vga_idx = (cck_agc_rpt & 0x1f);
 +		switch (lan_idx) {
 +		case 7:
 +			if (vga_idx <= 27)
 +				rx_pwr_all = -100 + 2 * (27 - vga_idx);
 +			else
 +				rx_pwr_all = -100;
 +			break;
 +		case 6:
 +			rx_pwr_all = -48 + 2 * (2 - vga_idx); /*VGA_idx = 2~0*/
 +			break;
 +		case 5:
 +			rx_pwr_all = -42 + 2 * (7 - vga_idx); /*VGA_idx = 7~5*/
 +			break;
 +		case 4:
 +			rx_pwr_all = -36 + 2 * (7 - vga_idx); /*VGA_idx = 7~4*/
 +			break;
 +		case 3:
 +			rx_pwr_all = -24 + 2 * (7 - vga_idx); /*VGA_idx = 7~0*/
 +			break;
 +		case 2:
 +			if (cck_hipwr)
 +				rx_pwr_all = -12 + 2 * (5 - vga_idx);
 +			else
 +				rx_pwr_all = -6 + 2 * (5 - vga_idx);
 +			break;
 +		case 1:
 +			rx_pwr_all = 8 - 2 * vga_idx;
 +			break;
 +		case 0:
 +			rx_pwr_all = 14 - 2 * vga_idx;
 +			break;
 +		default:
 +			break;
 +		}
 +		rx_pwr_all += 6;
 +		pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
 +		/* CCK gain is smaller than OFDM/MCS gain,
 +		 * so we add gain diff by experiences,
 +		 * the val is 6
 +		 */
 +		pwdb_all += 6;
 +		if (pwdb_all > 100)
 +			pwdb_all = 100;
 +		/* modify the offset to make the same
 +		 * gain index with OFDM.
 +		 */
 +		if (pwdb_all > 34 && pwdb_all <= 42)
 +			pwdb_all -= 2;
 +		else if (pwdb_all > 26 && pwdb_all <= 34)
 +			pwdb_all -= 6;
 +		else if (pwdb_all > 14 && pwdb_all <= 26)
 +			pwdb_all -= 8;
 +		else if (pwdb_all > 4 && pwdb_all <= 14)
 +			pwdb_all -= 4;
 +		if (cck_hipwr == false) {
 +			if (pwdb_all >= 80)
 +				pwdb_all = ((pwdb_all - 80)<<1) +
 +					   ((pwdb_all - 80)>>1) + 80;
 +			else if ((pwdb_all <= 78) && (pwdb_all >= 20))
 +				pwdb_all += 3;
 +			if (pwdb_all > 100)
 +				pwdb_all = 100;
 +		}
 +
 +		pstatus->rx_pwdb_all = pwdb_all;
 +		pstatus->recvsignalpower = rx_pwr_all;
 +
 +		/* (3) Get Signal Quality (EVM) */
 +		if (bpacket_match_bssid) {
 +			u8 sq;
 +
 +			if (pstatus->rx_pwdb_all > 40) {
 +				sq = 100;
 +			} else {
 +				sq = cck_buf->sq_rpt;
 +				if (sq > 64)
 +					sq = 0;
 +				else if (sq < 20)
 +					sq = 100;
 +				else
 +					sq = ((64 - sq) * 100) / 44;
 +			}
 +
 +			pstatus->signalquality = sq;
 +			pstatus->rx_mimo_sig_qual[0] = sq;
 +			pstatus->rx_mimo_sig_qual[1] = -1;
 +		}
 +	} else {
 +		rtlpriv->dm.rfpath_rxenable[0] =
 +		    rtlpriv->dm.rfpath_rxenable[1] = true;
 +
 +		/* (1)Get RSSI for HT rate */
 +		for (i = RF90_PATH_A; i < RF6052_MAX_PATH; i++) {
 +			/* we will judge RF RX path now. */
 +			if (rtlpriv->dm.rfpath_rxenable[i])
 +				rf_rx_num++;
 +
 +			rx_pwr[i] = ((p_drvinfo->gain_trsw[i] & 0x3f) * 2)-110;
 +
 +			/* Translate DBM to percentage. */
 +			rssi = rtl_query_rxpwrpercentage(rx_pwr[i]);
 +			total_rssi += rssi;
 +
 +			/* Get Rx snr value in DB */
 +			rtlpriv->stats.rx_snr_db[i] = p_drvinfo->rxsnr[i] / 2;
 +
 +			/* Record Signal Strength for next packet */
 +			if (bpacket_match_bssid)
 +				pstatus->rx_mimo_signalstrength[i] = (u8) rssi;
 +		}
 +
 +		/* (2)PWDB, Average PWDB cacluated by
 +		 * hardware (for rate adaptive)
 +		 */
 +		rx_pwr_all = ((p_drvinfo->pwdb_all >> 1) & 0x7f) - 110;
 +
 +		pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
 +		pstatus->rx_pwdb_all = pwdb_all;
 +		pstatus->rxpower = rx_pwr_all;
 +		pstatus->recvsignalpower = rx_pwr_all;
 +
 +		/* (3)EVM of HT rate */
 +		if (pstatus->is_ht && pstatus->rate >= DESC92C_RATEMCS8 &&
 +		    pstatus->rate <= DESC92C_RATEMCS15)
 +			max_spatial_stream = 2;
 +		else
 +			max_spatial_stream = 1;
 +
 +		for (i = 0; i < max_spatial_stream; i++) {
 +			evm = rtl_evm_db_to_percentage(p_drvinfo->rxevm[i]);
 +
 +			if (bpacket_match_bssid) {
 +				/* Fill value in RFD, Get the first
 +				 * spatial stream only
 +				 */
 +				if (i == 0)
 +					pstatus->signalquality = evm & 0xff;
 +				pstatus->rx_mimo_sig_qual[i] = evm & 0xff;
 +			}
 +		}
 +	}
 +
 +	/* UI BSS List signal strength(in percentage),
 +	 * make it good looking, from 0~100.
 +	 */
 +	if (is_cck)
 +		pstatus->signalstrength = (u8)(rtl_signal_scale_mapping(hw,
 +					  pwdb_all));
 +	else if (rf_rx_num != 0)
 +		pstatus->signalstrength = (u8)(rtl_signal_scale_mapping(hw,
 +					  total_rssi /= rf_rx_num));
 +	/*HW antenna diversity*/
 +	rtldm->fat_table.antsel_rx_keep_0 = phystrpt->ant_sel;
 +	rtldm->fat_table.antsel_rx_keep_1 = phystrpt->ant_sel_b;
 +	rtldm->fat_table.antsel_rx_keep_2 = phystrpt->antsel_rx_keep_2;
 +}
 +
 +static void _rtl88ee_smart_antenna(struct ieee80211_hw *hw,
 +	struct rtl_stats *pstatus)
 +{
 +	struct rtl_dm *rtldm = rtl_dm(rtl_priv(hw));
 +	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
 +	u8 ant_mux;
 +	struct fast_ant_training *pfat = &(rtldm->fat_table);
 +
 +	if (rtlefuse->antenna_div_type == CG_TRX_SMART_ANTDIV) {
 +		if (pfat->fat_state == FAT_TRAINING_STATE) {
 +			if (pstatus->packet_toself) {
 +				ant_mux = (pfat->antsel_rx_keep_2 << 2) |
 +						(pfat->antsel_rx_keep_1 << 1) |
 +						 pfat->antsel_rx_keep_0;
 +				pfat->ant_sum[ant_mux] += pstatus->rx_pwdb_all;
 +				pfat->ant_cnt[ant_mux]++;
 +			}
 +		}
 +	} else if ((rtlefuse->antenna_div_type == CG_TRX_HW_ANTDIV) ||
 +		   (rtlefuse->antenna_div_type == CGCS_RX_HW_ANTDIV)) {
 +		if (pstatus->packet_toself || pstatus->packet_matchbssid) {
 +			ant_mux = (pfat->antsel_rx_keep_2 << 2) |
 +				  (pfat->antsel_rx_keep_1 << 1) |
 +				   pfat->antsel_rx_keep_0;
 +			rtl88e_dm_ant_sel_statistics(hw, ant_mux, 0,
 +						     pstatus->rx_pwdb_all);
 +		}
 +	}
 +}
 +
 +static void _rtl88ee_translate_rx_signal_stuff(struct ieee80211_hw *hw,
 +		struct sk_buff *skb, struct rtl_stats *pstatus,
 +		u8 *pdesc, struct rx_fwinfo_88e *p_drvinfo)
 +{
 +	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
 +	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
 +	struct ieee80211_hdr *hdr;
 +	u8 *tmp_buf;
 +	u8 *praddr;
 +	u8 *psaddr;
 +	__le16 fc;
 +	u16 type, ufc;
 +	bool match_bssid, packet_toself, packet_beacon, addr;
 +
 +	tmp_buf = skb->data + pstatus->rx_drvinfo_size + pstatus->rx_bufshift;
 +
 +	hdr = (struct ieee80211_hdr *)tmp_buf;
 +	fc = hdr->frame_control;
 +	ufc = le16_to_cpu(fc);
 +	type = WLAN_FC_GET_TYPE(fc);
 +	praddr = hdr->addr1;
 +	psaddr = ieee80211_get_SA(hdr);
 +	memcpy(pstatus->psaddr, psaddr, ETH_ALEN);
 +
 +	addr = (!compare_ether_addr(mac->bssid, (ufc & IEEE80211_FCTL_TODS) ?
 +		hdr->addr1 : (ufc & IEEE80211_FCTL_FROMDS) ?
 +		hdr->addr2 : hdr->addr3));
 +	match_bssid = ((IEEE80211_FTYPE_CTL != type) && (!pstatus->hwerror) &&
 +		       (!pstatus->crc) && (!pstatus->icv)) && addr;
 +
 +	addr = (!compare_ether_addr(praddr, rtlefuse->dev_addr));
 +	packet_toself = match_bssid && addr;
 +
 +	if (ieee80211_is_beacon(fc))
 +		packet_beacon = true;
 +
 +	_rtl88ee_query_rxphystatus(hw, pstatus, pdesc, p_drvinfo,
 +				   match_bssid, packet_toself, packet_beacon);
 +	_rtl88ee_smart_antenna(hw, pstatus);
 +	rtl_process_phyinfo(hw, tmp_buf, pstatus);
 +}
 +
 +static void insert_em(struct rtl_tcb_desc *ptcb_desc, u8 *virtualaddress)
 +{
 +	u32 dwtmp = 0;
 +
 +	memset(virtualaddress, 0, 8);
 +
 +	SET_EARLYMODE_PKTNUM(virtualaddress, ptcb_desc->empkt_num);
 +	if (ptcb_desc->empkt_num == 1) {
 +		dwtmp = ptcb_desc->empkt_len[0];
 +	} else {
 +		dwtmp = ptcb_desc->empkt_len[0];
 +		dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
 +		dwtmp += ptcb_desc->empkt_len[1];
 +	}
 +	SET_EARLYMODE_LEN0(virtualaddress, dwtmp);
 +
 +	if (ptcb_desc->empkt_num <= 3) {
 +		dwtmp = ptcb_desc->empkt_len[2];
 +	} else {
 +		dwtmp = ptcb_desc->empkt_len[2];
 +		dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
 +		dwtmp += ptcb_desc->empkt_len[3];
 +	}
 +	SET_EARLYMODE_LEN1(virtualaddress, dwtmp);
 +	if (ptcb_desc->empkt_num <= 5) {
 +		dwtmp = ptcb_desc->empkt_len[4];
 +	} else {
 +		dwtmp = ptcb_desc->empkt_len[4];
 +		dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
 +		dwtmp += ptcb_desc->empkt_len[5];
 +	}
 +	SET_EARLYMODE_LEN2_1(virtualaddress, dwtmp & 0xF);
 +	SET_EARLYMODE_LEN2_2(virtualaddress, dwtmp >> 4);
 +	if (ptcb_desc->empkt_num <= 7) {
 +		dwtmp = ptcb_desc->empkt_len[6];
 +	} else {
 +		dwtmp = ptcb_desc->empkt_len[6];
 +		dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
 +		dwtmp += ptcb_desc->empkt_len[7];
 +	}
 +	SET_EARLYMODE_LEN3(virtualaddress, dwtmp);
 +	if (ptcb_desc->empkt_num <= 9) {
 +		dwtmp = ptcb_desc->empkt_len[8];
 +	} else {
 +		dwtmp = ptcb_desc->empkt_len[8];
 +		dwtmp += ((dwtmp % 4) ? (4 - dwtmp % 4) : 0) + 4;
 +		dwtmp += ptcb_desc->empkt_len[9];
 +	}
 +	SET_EARLYMODE_LEN4(virtualaddress, dwtmp);
 +}
 +
 +bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
 +			   struct rtl_stats *status,
 +			   struct ieee80211_rx_status *rx_status,
 +			   u8 *pdesc, struct sk_buff *skb)
 +{
 +	struct rtl_priv *rtlpriv = rtl_priv(hw);
 +	struct rx_fwinfo_88e *p_drvinfo;
 +	struct ieee80211_hdr *hdr;
 +
 +	u32 phystatus = GET_RX_DESC_PHYST(pdesc);
 +	status->packet_report_type = (u8)GET_RX_STATUS_DESC_RPT_SEL(pdesc);
 +	if (status->packet_report_type == TX_REPORT2)
 +		status->length = (u16) GET_RX_RPT2_DESC_PKT_LEN(pdesc);
 +	else
 +		status->length = (u16) GET_RX_DESC_PKT_LEN(pdesc);
 +	status->rx_drvinfo_size = (u8) GET_RX_DESC_DRV_INFO_SIZE(pdesc) *
 +				       RX_DRV_INFO_SIZE_UNIT;
 +	status->rx_bufshift = (u8) (GET_RX_DESC_SHIFT(pdesc) & 0x03);
 +	status->icv = (u16) GET_RX_DESC_ICV(pdesc);
 +	status->crc = (u16) GET_RX_DESC_CRC32(pdesc);
 +	status->hwerror = (status->crc | status->icv);
 +	status->decrypted = !GET_RX_DESC_SWDEC(pdesc);
 +	status->rate = (u8) GET_RX_DESC_RXMCS(pdesc);
 +	status->shortpreamble = (u16) GET_RX_DESC_SPLCP(pdesc);
 +	status->isampdu = (bool) (GET_RX_DESC_PAGGR(pdesc) == 1);
 +	status->isfirst_ampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1) &&
 +					(GET_RX_DESC_FAGGR(pdesc) == 1));
 +	if (status->packet_report_type == NORMAL_RX)
 +		status->timestamp_low = GET_RX_DESC_TSFL(pdesc);
 +	status->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
 +	status->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
 +
 +	status->is_cck = RTL8188_RX_HAL_IS_CCK_RATE(status->rate);
 +
 +	status->macid = GET_RX_DESC_MACID(pdesc);
 +	if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))
 +		status->wake_match = BIT(2);
 +	else if (GET_RX_STATUS_DESC_MAGIC_MATCH(pdesc))
 +		status->wake_match = BIT(1);
 +	else if (GET_RX_STATUS_DESC_UNICAST_MATCH(pdesc))
 +		status->wake_match = BIT(0);
 +	else
 +		status->wake_match = 0;
 +	if (status->wake_match)
 +		RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD,
 +			 "Get Wakeup Packet!! WakeMatch =%d\n",
 +			 status->wake_match);
- 	rx_status->freq = hw->conf.channel->center_freq;
- 	rx_status->band = hw->conf.channel->band;
++	rx_status->freq = hw->conf.chandef.chan->center_freq;
++	rx_status->band = hw->conf.chandef.chan->band;
 +
 +	if (status->crc)
 +		rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
 +
 +	if (status->rx_is40Mhzpacket)
 +		rx_status->flag |= RX_FLAG_40MHZ;
 +
 +	if (status->is_ht)
 +		rx_status->flag |= RX_FLAG_HT;
 +
 +	rx_status->flag |= RX_FLAG_MACTIME_START;
 +
 +	/* hw will set status->decrypted true, if it finds the
 +	 * frame is open data frame or mgmt frame.
 +	 * So hw will not decryption robust managment frame
 +	 * for IEEE80211w but still set status->decrypted
 +	 * true, so here we should set it back to undecrypted
 +	 * for IEEE80211w frame, and mac80211 sw will help
 +	 * to decrypt it
 +	 */
 +	if (status->decrypted) {
 +		hdr = (struct ieee80211_hdr *)(skb->data +
 +		       status->rx_drvinfo_size + status->rx_bufshift);
 +
 +		if (!hdr) {
 +			/* During testing, hdr was NULL */
 +			return false;
 +		}
 +		if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
 +		    (ieee80211_has_protected(hdr->frame_control)))
 +			rx_status->flag &= ~RX_FLAG_DECRYPTED;
 +		else
 +			rx_status->flag |= RX_FLAG_DECRYPTED;
 +	}
 +
 +	/* rate_idx: index of data rate into band's
 +	 * supported rates or MCS index if HT rates
 +	 * are use (RX_FLAG_HT)
 +	 * Notice: this is diff with windows define
 +	 */
 +	rx_status->rate_idx = rtlwifi_rate_mapping(hw, status->is_ht,
 +						   status->rate, false);
 +
 +	rx_status->mactime = status->timestamp_low;
 +	if (phystatus == true) {
 +		p_drvinfo = (struct rx_fwinfo_88e *)(skb->data +
 +						     status->rx_bufshift);
 +
 +		_rtl88ee_translate_rx_signal_stuff(hw, skb, status, pdesc,
 +						   p_drvinfo);
 +	}
 +
 +	/*rx_status->qual = status->signal; */
 +	rx_status->signal = status->recvsignalpower + 10;
 +	/*rx_status->noise = -status->noise; */
 +	if (status->packet_report_type == TX_REPORT2) {
 +		status->macid_valid_entry[0] =
 +			 GET_RX_RPT2_DESC_MACID_VALID_1(pdesc);
 +		status->macid_valid_entry[1] =
 +			 GET_RX_RPT2_DESC_MACID_VALID_2(pdesc);
 +	}
 +	return true;
 +}
 +
 +void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,
 +			  struct ieee80211_hdr *hdr, u8 *pdesc_tx,
 +			  struct ieee80211_tx_info *info,
 +			  struct ieee80211_sta *sta,
 +			  struct sk_buff *skb,
 +			  u8 hw_queue, struct rtl_tcb_desc *ptcb_desc)
 +{
 +	struct rtl_priv *rtlpriv = rtl_priv(hw);
 +	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
 +	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 +	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
 +	u8 *pdesc = (u8 *)pdesc_tx;
 +	u16 seq_number;
 +	__le16 fc = hdr->frame_control;
 +	unsigned int buf_len = 0;
 +	unsigned int skb_len = skb->len;
 +	u8 fw_qsel = _rtl88ee_map_hwqueue_to_fwqueue(skb, hw_queue);
 +	bool firstseg = ((hdr->seq_ctrl &
 +			    cpu_to_le16(IEEE80211_SCTL_FRAG)) == 0);
 +	bool lastseg = ((hdr->frame_control &
 +			   cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)) == 0);
 +	dma_addr_t mapping;
 +	u8 bw_40 = 0;
 +	u8 short_gi = 0;
 +
 +	if (mac->opmode == NL80211_IFTYPE_STATION) {
 +		bw_40 = mac->bw_40;
 +	} else if (mac->opmode == NL80211_IFTYPE_AP ||
 +		mac->opmode == NL80211_IFTYPE_ADHOC) {
 +		if (sta)
 +			bw_40 = sta->ht_cap.cap &
 +				IEEE80211_HT_CAP_SUP_WIDTH_20_40;
 +	}
 +	seq_number = (le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4;
 +	rtl_get_tcb_desc(hw, info, sta, skb, ptcb_desc);
 +	/* reserve 8 byte for AMPDU early mode */
 +	if (rtlhal->earlymode_enable) {
 +		skb_push(skb, EM_HDR_LEN);
 +		memset(skb->data, 0, EM_HDR_LEN);
 +	}
 +	buf_len = skb->len;
 +	mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
 +				 PCI_DMA_TODEVICE);
 +	if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
 +		RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
 +			 "DMA mapping error");
 +		return;
 +	}
 +	CLEAR_PCI_TX_DESC_CONTENT(pdesc, sizeof(struct tx_desc_88e));
 +	if (ieee80211_is_nullfunc(fc) || ieee80211_is_ctl(fc)) {
 +		firstseg = true;
 +		lastseg = true;
 +	}
 +	if (firstseg) {
 +		if (rtlhal->earlymode_enable) {
 +			SET_TX_DESC_PKT_OFFSET(pdesc, 1);
 +			SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN +
 +					   EM_HDR_LEN);
 +			if (ptcb_desc->empkt_num) {
 +				RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
 +					 "Insert 8 byte.pTcb->EMPktNum:%d\n",
 +					 ptcb_desc->empkt_num);
 +				insert_em(ptcb_desc, (u8 *)(skb->data));
 +			}
 +		} else {
 +			SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
 +		}
 +
 +		ptcb_desc->use_driver_rate = true;
 +		SET_TX_DESC_TX_RATE(pdesc, ptcb_desc->hw_rate);
 +		if (ptcb_desc->hw_rate > DESC92C_RATEMCS0)
 +			short_gi = (ptcb_desc->use_shortgi) ? 1 : 0;
 +		else
 +			short_gi = (ptcb_desc->use_shortpreamble) ? 1 : 0;
 +		SET_TX_DESC_DATA_SHORTGI(pdesc, short_gi);
 +
 +		if (info->flags & IEEE80211_TX_CTL_AMPDU) {
 +			SET_TX_DESC_AGG_ENABLE(pdesc, 1);
 +			SET_TX_DESC_MAX_AGG_NUM(pdesc, 0x14);
 +		}
 +		SET_TX_DESC_SEQ(pdesc, seq_number);
 +		SET_TX_DESC_RTS_ENABLE(pdesc, ((ptcb_desc->rts_enable &&
 +					      !ptcb_desc->cts_enable) ? 1 : 0));
 +		SET_TX_DESC_HW_RTS_ENABLE(pdesc, 0);
 +		SET_TX_DESC_CTS2SELF(pdesc, ((ptcb_desc->cts_enable) ? 1 : 0));
 +		SET_TX_DESC_RTS_STBC(pdesc, ((ptcb_desc->rts_stbc) ? 1 : 0));
 +
 +		SET_TX_DESC_RTS_RATE(pdesc, ptcb_desc->rts_rate);
 +		SET_TX_DESC_RTS_BW(pdesc, 0);
 +		SET_TX_DESC_RTS_SC(pdesc, ptcb_desc->rts_sc);
 +		SET_TX_DESC_RTS_SHORT(pdesc,
 +			((ptcb_desc->rts_rate <= DESC92C_RATE54M) ?
 +			(ptcb_desc->rts_use_shortpreamble ? 1 : 0) :
 +			(ptcb_desc->rts_use_shortgi ? 1 : 0)));
 +
 +		if (ptcb_desc->btx_enable_sw_calc_duration)
 +			SET_TX_DESC_NAV_USE_HDR(pdesc, 1);
 +
 +		if (bw_40) {
 +			if (ptcb_desc->packet_bw) {
 +				SET_TX_DESC_DATA_BW(pdesc, 1);
 +				SET_TX_DESC_TX_SUB_CARRIER(pdesc, 3);
 +			} else {
 +				SET_TX_DESC_DATA_BW(pdesc, 0);
 +				SET_TX_DESC_TX_SUB_CARRIER(pdesc,
 +						   mac->cur_40_prime_sc);
 +			}
 +		} else {
 +			SET_TX_DESC_DATA_BW(pdesc, 0);
 +			SET_TX_DESC_TX_SUB_CARRIER(pdesc, 0);
 +		}
 +
 +		SET_TX_DESC_LINIP(pdesc, 0);
 +		SET_TX_DESC_PKT_SIZE(pdesc, (u16) skb_len);
 +		if (sta) {
 +			u8 ampdu_density = sta->ht_cap.ampdu_density;
 +			SET_TX_DESC_AMPDU_DENSITY(pdesc, ampdu_density);
 +		}
 +		if (info->control.hw_key) {
 +			struct ieee80211_key_conf *keyconf;
 +			keyconf = info->control.hw_key;
 +			switch (keyconf->cipher) {
 +			case WLAN_CIPHER_SUITE_WEP40:
 +			case WLAN_CIPHER_SUITE_WEP104:
 +			case WLAN_CIPHER_SUITE_TKIP:
 +				SET_TX_DESC_SEC_TYPE(pdesc, 0x1);
 +				break;
 +			case WLAN_CIPHER_SUITE_CCMP:
 +				SET_TX_DESC_SEC_TYPE(pdesc, 0x3);
 +				break;
 +			default:
 +				SET_TX_DESC_SEC_TYPE(pdesc, 0x0);
 +				break;
 +			}
 +		}
 +
 +		SET_TX_DESC_QUEUE_SEL(pdesc, fw_qsel);
 +		SET_TX_DESC_DATA_RATE_FB_LIMIT(pdesc, 0x1F);
 +		SET_TX_DESC_RTS_RATE_FB_LIMIT(pdesc, 0xF);
 +		SET_TX_DESC_DISABLE_FB(pdesc, ptcb_desc->disable_ratefallback ?
 +				       1 : 0);
 +		SET_TX_DESC_USE_RATE(pdesc, ptcb_desc->use_driver_rate ? 1 : 0);
 +
 +		/* Set TxRate and RTSRate in TxDesc  */
 +		/* This prevent Tx initial rate of new-coming packets */
 +		/* from being overwritten by retried  packet rate.*/
 +		if (!ptcb_desc->use_driver_rate) {
 +			/*SET_TX_DESC_RTS_RATE(pdesc, 0x08); */
 +			/* SET_TX_DESC_TX_RATE(pdesc, 0x0b); */
 +		}
 +		if (ieee80211_is_data_qos(fc)) {
 +			if (mac->rdg_en) {
 +				RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
 +					 "Enable RDG function.\n");
 +				SET_TX_DESC_RDG_ENABLE(pdesc, 1);
 +				SET_TX_DESC_HTC(pdesc, 1);
 +			}
 +		}
 +	}
 +
 +	SET_TX_DESC_FIRST_SEG(pdesc, (firstseg ? 1 : 0));
 +	SET_TX_DESC_LAST_SEG(pdesc, (lastseg ? 1 : 0));
 +	SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16) buf_len);
 +	SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
 +	if (rtlpriv->dm.useramask) {
 +		SET_TX_DESC_RATE_ID(pdesc, ptcb_desc->ratr_index);
 +		SET_TX_DESC_MACID(pdesc, ptcb_desc->mac_id);
 +	} else {
 +		SET_TX_DESC_RATE_ID(pdesc, 0xC + ptcb_desc->ratr_index);
 +		SET_TX_DESC_MACID(pdesc, ptcb_desc->ratr_index);
 +	}
 +	if (ieee80211_is_data_qos(fc))
 +		SET_TX_DESC_QOS(pdesc, 1);
 +
 +	if (!ieee80211_is_data_qos(fc))
 +		SET_TX_DESC_HWSEQ_EN(pdesc, 1);
 +	SET_TX_DESC_MORE_FRAG(pdesc, (lastseg ? 0 : 1));
 +	if (is_multicast_ether_addr(ieee80211_get_DA(hdr)) ||
 +	    is_broadcast_ether_addr(ieee80211_get_DA(hdr)))
 +		SET_TX_DESC_BMC(pdesc, 1);
 +
 +	rtl88e_dm_set_tx_ant_by_tx_info(hw, pdesc, ptcb_desc->mac_id);
 +	RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
 +}
 +
 +void rtl88ee_tx_fill_cmddesc(struct ieee80211_hw *hw,
 +			     u8 *pdesc, bool firstseg,
 +			     bool lastseg, struct sk_buff *skb)
 +{
 +	struct rtl_priv *rtlpriv = rtl_priv(hw);
 +	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 +	u8 fw_queue = QSLT_BEACON;
 +
 +	dma_addr_t mapping = pci_map_single(rtlpci->pdev,
 +					    skb->data, skb->len,
 +					    PCI_DMA_TODEVICE);
 +
 +	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
 +	__le16 fc = hdr->frame_control;
 +
 +	if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
 +		RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
 +			 "DMA mapping error");
 +		return;
 +	}
 +	CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE);
 +
 +	if (firstseg)
 +		SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
 +
 +	SET_TX_DESC_TX_RATE(pdesc, DESC92C_RATE1M);
 +
 +	SET_TX_DESC_SEQ(pdesc, 0);
 +
 +	SET_TX_DESC_LINIP(pdesc, 0);
 +
 +	SET_TX_DESC_QUEUE_SEL(pdesc, fw_queue);
 +
 +	SET_TX_DESC_FIRST_SEG(pdesc, 1);
 +	SET_TX_DESC_LAST_SEG(pdesc, 1);
 +
 +	SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16)(skb->len));
 +
 +	SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
 +
 +	SET_TX_DESC_RATE_ID(pdesc, 7);
 +	SET_TX_DESC_MACID(pdesc, 0);
 +
 +	SET_TX_DESC_OWN(pdesc, 1);
 +
 +	SET_TX_DESC_PKT_SIZE((u8 *)pdesc, (u16)(skb->len));
 +
 +	SET_TX_DESC_FIRST_SEG(pdesc, 1);
 +	SET_TX_DESC_LAST_SEG(pdesc, 1);
 +
 +	SET_TX_DESC_OFFSET(pdesc, 0x20);
 +
 +	SET_TX_DESC_USE_RATE(pdesc, 1);
 +
 +	if (!ieee80211_is_data_qos(fc))
 +		SET_TX_DESC_HWSEQ_EN(pdesc, 1);
 +
 +	RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
 +		      "H2C Tx Cmd Content\n",
 +		      pdesc, TX_DESC_SIZE);
 +}
 +
 +void rtl88ee_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
 +{
 +	if (istx == true) {
 +		switch (desc_name) {
 +		case HW_DESC_OWN:
 +			SET_TX_DESC_OWN(pdesc, 1);
 +			break;
 +		case HW_DESC_TX_NEXTDESC_ADDR:
 +			SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *)val);
 +			break;
 +		default:
 +			RT_ASSERT(false, "ERR txdesc :%d not processed\n",
 +				  desc_name);
 +			break;
 +		}
 +	} else {
 +		switch (desc_name) {
 +		case HW_DESC_RXOWN:
 +			SET_RX_DESC_OWN(pdesc, 1);
 +			break;
 +		case HW_DESC_RXBUFF_ADDR:
 +			SET_RX_DESC_BUFF_ADDR(pdesc, *(u32 *)val);
 +			break;
 +		case HW_DESC_RXPKT_LEN:
 +			SET_RX_DESC_PKT_LEN(pdesc, *(u32 *)val);
 +			break;
 +		case HW_DESC_RXERO:
 +			SET_RX_DESC_EOR(pdesc, 1);
 +			break;
 +		default:
 +			RT_ASSERT(false, "ERR rxdesc :%d not processed\n",
 +				  desc_name);
 +			break;
 +		}
 +	}
 +}
 +
 +u32 rtl88ee_get_desc(u8 *pdesc, bool istx, u8 desc_name)
 +{
 +	u32 ret = 0;
 +
 +	if (istx == true) {
 +		switch (desc_name) {
 +		case HW_DESC_OWN:
 +			ret = GET_TX_DESC_OWN(pdesc);
 +			break;
 +		case HW_DESC_TXBUFF_ADDR:
 +			ret = GET_TX_DESC_TX_BUFFER_ADDRESS(pdesc);
 +			break;
 +		default:
 +			RT_ASSERT(false, "ERR txdesc :%d not processed\n",
 +				  desc_name);
 +			break;
 +		}
 +	} else {
 +		switch (desc_name) {
 +		case HW_DESC_OWN:
 +			ret = GET_RX_DESC_OWN(pdesc);
 +			break;
 +		case HW_DESC_RXPKT_LEN:
 +			ret = GET_RX_DESC_PKT_LEN(pdesc);
 +			break;
 +		default:
 +			RT_ASSERT(false, "ERR rxdesc :%d not processed\n",
 +				  desc_name);
 +			break;
 +		}
 +	}
 +	return ret;
 +}
 +
 +void rtl88ee_tx_polling(struct ieee80211_hw *hw, u8 hw_queue)
 +{
 +	struct rtl_priv *rtlpriv = rtl_priv(hw);
 +	if (hw_queue == BEACON_QUEUE) {
 +		rtl_write_word(rtlpriv, REG_PCIE_CTRL_REG, BIT(4));
 +	} else {
 +		rtl_write_word(rtlpriv, REG_PCIE_CTRL_REG,
 +			       BIT(0) << (hw_queue));
 +	}
 +}
diff --cc drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
index 65bf5fb97002,27e4ebd51091..6ad23b413eb3
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
@@@ -359,23 -543,20 +359,23 @@@ bool rtl92ce_rx_query_desc(struct ieee8
  				   && (GET_RX_DESC_FAGGR(pdesc) == 1));
  	stats->timestamp_low = GET_RX_DESC_TSFL(pdesc);
  	stats->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
 +	stats->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
 +
 +	stats->is_cck = RX_HAL_IS_CCK_RATE(pdesc);
  
- 	rx_status->freq = hw->conf.channel->center_freq;
- 	rx_status->band = hw->conf.channel->band;
+ 	rx_status->freq = hw->conf.chandef.chan->center_freq;
+ 	rx_status->band = hw->conf.chandef.chan->band;
  
 -	if (GET_RX_DESC_CRC32(pdesc))
 -		rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
 +	hdr = (struct ieee80211_hdr *)(skb->data + stats->rx_drvinfo_size
 +			+ stats->rx_bufshift);
  
 -	if (!GET_RX_DESC_SWDEC(pdesc))
 -		rx_status->flag |= RX_FLAG_DECRYPTED;
 +	if (stats->crc)
 +		rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
  
 -	if (GET_RX_DESC_BW(pdesc))
 +	if (stats->rx_is40Mhzpacket)
  		rx_status->flag |= RX_FLAG_40MHZ;
  
 -	if (GET_RX_DESC_RXHT(pdesc))
 +	if (stats->is_ht)
  		rx_status->flag |= RX_FLAG_HT;
  
  	rx_status->flag |= RX_FLAG_MACTIME_START;
diff --cc drivers/net/wireless/rtlwifi/rtl8192se/trx.c
index 960bc28cc51e,0b074f11f969..c7095118de6e
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
@@@ -281,9 -538,12 +281,9 @@@ bool rtl92se_rx_query_desc(struct ieee8
  	if (stats->hwerror)
  		return false;
  
- 	rx_status->freq = hw->conf.channel->center_freq;
- 	rx_status->band = hw->conf.channel->band;
+ 	rx_status->freq = hw->conf.chandef.chan->center_freq;
+ 	rx_status->band = hw->conf.chandef.chan->band;
  
 -	hdr = (struct ieee80211_hdr *)(skb->data + stats->rx_drvinfo_size
 -	      + stats->rx_bufshift);
 -
  	if (stats->crc)
  		rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
  
diff --cc drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
index 6c64365308d3,601261d67e84..c72758d8f4ed
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
@@@ -304,9 -304,12 +304,9 @@@ bool rtl8723ae_rx_query_desc(struct iee
  
  	status->is_cck = RTL8723E_RX_HAL_IS_CCK_RATE(status->rate);
  
- 	rx_status->freq = hw->conf.channel->center_freq;
- 	rx_status->band = hw->conf.channel->band;
+ 	rx_status->freq = hw->conf.chandef.chan->center_freq;
+ 	rx_status->band = hw->conf.chandef.chan->band;
  
 -	hdr = (struct ieee80211_hdr *)(skb->data + status->rx_drvinfo_size
 -		+ status->rx_bufshift);
 -
  	if (status->crc)
  		rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
  
diff --cc net/mac80211/chan.c
index 931be419ab5a,8024874ba95d..7d0baa89c784
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@@ -77,17 -76,8 +77,15 @@@ ieee80211_new_chanctx(struct ieee80211_
  	ctx->conf.rx_chains_dynamic = 1;
  	ctx->mode = mode;
  
 +	/* acquire mutex to prevent idle from changing */
 +	mutex_lock(&local->mtx);
 +	/* turn idle off *before* setting channel -- some drivers need that */
 +	changed = ieee80211_idle_off(local);
 +	if (changed)
 +		ieee80211_hw_config(local, changed);
 +
  	if (!local->use_chanctx) {
- 		local->_oper_channel_type =
- 			cfg80211_get_chandef_type(chandef);
- 		local->_oper_channel = chandef->chan;
+ 		local->_oper_chandef = *chandef;
  		ieee80211_hw_config(local, 0);
  	} else {
  		err = drv_add_chanctx(local, ctx);
diff --cc net/mac80211/ieee80211_i.h
index 0b09716d22ad,8d5dcbf17bbc..135ab463cfd9
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@@ -1330,8 -1315,9 +1316,9 @@@ void ieee80211_offchannel_stop_vifs(str
  void ieee80211_offchannel_return(struct ieee80211_local *local);
  void ieee80211_roc_setup(struct ieee80211_local *local);
  void ieee80211_start_next_roc(struct ieee80211_local *local);
- void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata);
+ void ieee80211_roc_purge(struct ieee80211_local *local,
+ 			 struct ieee80211_sub_if_data *sdata);
 -void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc);
 +void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc, bool free);
  void ieee80211_sw_roc_work(struct work_struct *work);
  void ieee80211_handle_roc_started(struct ieee80211_roc_work *roc);
  
diff --cc net/mac80211/iface.c
index 69aaba79a9f7,b6abaaa3676f..146b1320af4e
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@@ -346,10 -346,10 +346,10 @@@ static void ieee80211_set_default_queue
  	sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE;
  }
  
- static int ieee80211_add_virtual_monitor(struct ieee80211_local *local)
+ int ieee80211_add_virtual_monitor(struct ieee80211_local *local)
  {
  	struct ieee80211_sub_if_data *sdata;
 -	int ret = 0;
 +	int ret;
  
  	if (!(local->hw.flags & IEEE80211_HW_WANT_MONITOR_VIF))
  		return 0;
@@@ -389,17 -391,16 +389,17 @@@
  	if (ret) {
  		drv_remove_interface(local, sdata);
  		kfree(sdata);
 -		goto out_unlock;
 +		return ret;
  	}
  
 +	mutex_lock(&local->iflist_mtx);
  	rcu_assign_pointer(local->monitor_sdata, sdata);
 - out_unlock:
  	mutex_unlock(&local->iflist_mtx);
 -	return ret;
 +
 +	return 0;
  }
  
- static void ieee80211_del_virtual_monitor(struct ieee80211_local *local)
+ void ieee80211_del_virtual_monitor(struct ieee80211_local *local)
  {
  	struct ieee80211_sub_if_data *sdata;