6 files changed, 17 insertions, 12 deletions

diff --git a/drivers/staging/rtl8821ae/base.c b/drivers/staging/rtl8821ae/base.c
index b5a50d0c6304..18c936fbdf1e 100644
--- a/drivers/staging/rtl8821ae/base.c
+++ b/drivers/staging/rtl8821ae/base.c
@@ -369,7 +369,6 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
 
         /* TODO: Correct this value for our hw */
         /* TODO: define these hard code value */
-        hw->channel_change_time = 100;
         hw->max_listen_interval = 10;
         hw->max_rate_tries = 4;
         /* hw->max_rates = 1; */
@@ -1182,7 +1181,7 @@ void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb)
                 return;
 
         /* and only beacons from the associated BSSID, please */
-        if (compare_ether_addr(hdr->addr3, rtlpriv->mac80211.bssid))
+        if (ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid))
                 return;
 
         rtlpriv->link_info.bcn_rx_inperiod ++;
@@ -1650,7 +1649,7 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len)
                 return;
 
         /* and only beacons from the associated BSSID, please */
-        if (compare_ether_addr(hdr->addr3, rtlpriv->mac80211.bssid))
+        if (ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid))
                 return;
 
         if (rtl_find_221_ie(hw, data, len)) {
diff --git a/drivers/staging/rtl8821ae/ps.c b/drivers/staging/rtl8821ae/ps.c
index 6c86436e8dd3..f12ffa83c58d 100644
--- a/drivers/staging/rtl8821ae/ps.c
+++ b/drivers/staging/rtl8821ae/ps.c
@@ -527,7 +527,7 @@ void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len)
                 return;
 
         /* and only beacons from the associated BSSID, please */
-        if (compare_ether_addr(hdr->addr3, rtlpriv->mac80211.bssid))
+        if (ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid))
                 return;
 
         rtlpriv->psc.last_beacon = jiffies;
@@ -1007,7 +1007,7 @@ void rtl_p2p_info(struct ieee80211_hw *hw, void *data, unsigned int len)
                 return;
 
         /* and only beacons from the associated BSSID, please */
-        if (compare_ether_addr(hdr->addr3, rtlpriv->mac80211.bssid))
+        if (ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid))
                 return;
 
         /* check if this really is a beacon */
diff --git a/drivers/staging/rtl8821ae/regd.h b/drivers/staging/rtl8821ae/regd.h
index c126cf9c92ad..abc60ab8165c 100644
--- a/drivers/staging/rtl8821ae/regd.h
+++ b/drivers/staging/rtl8821ae/regd.h
@@ -30,6 +30,12 @@
 #ifndef __RTL_REGD_H__
 #define __RTL_REGD_H__
 
+#define IEEE80211_CHAN_NO_IBSS          1<<2
+#define IEEE80211_CHAN_PASSIVE_SCAN     1<<1
+#define WIPHY_FLAG_CUSTOM_REGULATORY    BIT(0)
+#define WIPHY_FLAG_STRICT_REGULATORY    BIT(1)
+#define WIPHY_FLAG_DISABLE_BEACON_HINTS BIT(2)
+
 struct country_code_to_enum_rd {
         u16 countrycode;
         const char *iso_name;
diff --git a/drivers/staging/rtl8821ae/rtl8821ae/dm.c b/drivers/staging/rtl8821ae/rtl8821ae/dm.c
index 41bd21d0e8cd..8634206b8929 100644
--- a/drivers/staging/rtl8821ae/rtl8821ae/dm.c
+++ b/drivers/staging/rtl8821ae/rtl8821ae/dm.c
@@ -1339,7 +1339,7 @@ void rtl8812ae_dm_txpwr_track_set_pwr(struct ieee80211_hw *hw,
         u32 final_bb_swing_idx[2];
         u8 pwr_tracking_limit = 26; /*+1.0dB*/
         u8 tx_rate = 0xFF;
-        char final_ofdm_swing_index = 0;
+        s8 final_ofdm_swing_index = 0;
 
         if(rtldm->tx_rate != 0xFF)
                 tx_rate = rtl8812ae_hw_rate_to_mrate(hw, rtldm->tx_rate);
@@ -1999,7 +1999,7 @@ void rtl8821ae_dm_txpwr_track_set_pwr(struct ieee80211_hw *hw,
         u32 final_bb_swing_idx[1];
         u8 pwr_tracking_limit = 26; /*+1.0dB*/
         u8 tx_rate = 0xFF;
-        char final_ofdm_swing_index = 0;
+        s8 final_ofdm_swing_index = 0;
 
         if(rtldm->tx_rate != 0xFF)
                 tx_rate = rtl8812ae_hw_rate_to_mrate(hw, rtldm->tx_rate);
@@ -2599,8 +2599,8 @@ static void rtl8821ae_dm_check_edca_turbo(struct ieee80211_hw *hw)
         struct rtl_dm *rtldm =  rtl_dm(rtl_priv(hw));
 
         /*Keep past Tx/Rx packet count for RT-to-RT EDCA turbo.*/
-        u64 cur_tx_ok_cnt = 0;
-        u64 cur_rx_ok_cnt = 0;
+        unsigned long cur_tx_ok_cnt = 0;
+        unsigned long cur_rx_ok_cnt = 0;
         u32 edca_be_ul = 0x5ea42b;
         u32 edca_be_dl = 0x5ea42b;
         u32 edca_be = 0x5ea42b;
diff --git a/drivers/staging/rtl8821ae/rtl8821ae/phy.c b/drivers/staging/rtl8821ae/rtl8821ae/phy.c
index 09ffdc2e63a3..d02fca38a2b2 100644
--- a/drivers/staging/rtl8821ae/rtl8821ae/phy.c
+++ b/drivers/staging/rtl8821ae/rtl8821ae/phy.c
@@ -3427,7 +3427,7 @@ void _rtl8812ae_iqk_tx(
         bool iqk0_ready = false, tx0_finish = false, rx0_finish = false;
         bool tx1iqkok = false, rx1iqkok = false, tx1_fail = true, rx1_fail;
         bool iqk1_ready = false, tx1_finish = false, rx1_finish = false, vdf_enable = false;
-        int i, tx_dt[3], rx_dt[3], ii, dx = 0, dy = 0;
+        int i, tx_dt[3] = {0}, rx_dt[3] = {0}, ii, dx = 0, dy = 0;
 
         RT_TRACE(COMP_IQK, DBG_LOUD,
                         ("BandWidth = %d.\n",
diff --git a/drivers/staging/rtl8821ae/rtl8821ae/trx.c b/drivers/staging/rtl8821ae/rtl8821ae/trx.c
index 2c797878567d..75ae4387fe19 100644
--- a/drivers/staging/rtl8821ae/rtl8821ae/trx.c
+++ b/drivers/staging/rtl8821ae/rtl8821ae/trx.c
@@ -458,13 +458,13 @@ static void _rtl8821ae_translate_rx_signal_stuff(struct ieee80211_hw *hw,
         memcpy(pstatus->psaddr, psaddr, ETH_ALEN);
 
         b_packet_matchbssid = ((IEEE80211_FTYPE_CTL != type) &&
-             (!compare_ether_addr(mac->bssid, (fc & IEEE80211_FCTL_TODS) ?
+             (!ether_addr_equal(mac->bssid, (fc & IEEE80211_FCTL_TODS) ?
                                   hdr->addr1 : (fc & IEEE80211_FCTL_FROMDS) ?
                                   hdr->addr2 : hdr->addr3)) && (!pstatus->b_hwerror) &&
                                   (!pstatus->b_crc) && (!pstatus->b_icv));
 
         b_packet_toself = b_packet_matchbssid &&
-            (!compare_ether_addr(praddr, rtlefuse->dev_addr));
+            (!ether_addr_equal(praddr, rtlefuse->dev_addr));
 
         if (ieee80211_is_beacon(fc))
                 b_packet_beacon = true;