forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-06 08f87f769b595151be1afeff53e144f543faa614 
 kernel/drivers/net/wireless/realtek/rtlwifi/base.c
....@@ -1,27 +1,5 @@
1
-/******************************************************************************
2
- *
3
- * Copyright(c) 2009-2012  Realtek Corporation.
4
- *
5
- * This program is free software; you can redistribute it and/or modify it
6
- * under the terms of version 2 of the GNU General Public License as
7
- * published by the Free Software Foundation.
8
- *
9
- * This program is distributed in the hope that it will be useful, but WITHOUT
10
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
12
- * more details.
13
- *
14
- * The full GNU General Public License is included in this distribution in the
15
- * file called LICENSE.
16
- *
17
- * Contact Information:
18
- * wlanfae <wlanfae@realtek.com>
19
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
20
- * Hsinchu 300, Taiwan.
21
- *
22
- * Larry Finger <Larry.Finger@lwfinger.net>
23
- *
24
- *****************************************************************************/
1
+// SPDX-License-Identifier: GPL-2.0
2
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
253 
264 #include "wifi.h"
275 #include "rc.h"
....@@ -217,8 +195,8 @@
217195 	} else {
218196 		if (get_rf_type(rtlphy) == RF_1T2R ||
219197 		    get_rf_type(rtlphy) == RF_2T2R) {
220
-			RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
221
-				 "1T2R or 2T2R\n");
198
+			rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,
199
+				"1T2R or 2T2R\n");
222200 			ht_cap->mcs.rx_mask[0] = 0xFF;
223201 			ht_cap->mcs.rx_mask[1] = 0xFF;
224202 			ht_cap->mcs.rx_mask[4] = 0x01;
....@@ -226,7 +204,7 @@
226204 			ht_cap->mcs.rx_highest =
227205 				 cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS15);
228206 		} else if (get_rf_type(rtlphy) == RF_1T1R) {
229
-			RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "1T1R\n");
207
+			rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "1T1R\n");
230208 
231209 			ht_cap->mcs.rx_mask[0] = 0xFF;
232210 			ht_cap->mcs.rx_mask[1] = 0x00;
....@@ -452,10 +430,15 @@
452430 		SET_IEEE80211_PERM_ADDR(hw, rtlefuse->dev_addr);
453431 	} else {
454432 		u8 rtlmac1[] = { 0x00, 0xe0, 0x4c, 0x81, 0x92, 0x00 };
433
+
455434 		get_random_bytes((rtlmac1 + (ETH_ALEN - 1)), 1);
456435 		SET_IEEE80211_PERM_ADDR(hw, rtlmac1);
457436 	}
458437 }
438
+
439
+static void rtl_watchdog_wq_callback(struct work_struct *work);
440
+static void rtl_fwevt_wq_callback(struct work_struct *work);
441
+static void rtl_c2hcmd_wq_callback(struct work_struct *work);
459442 
460443 static int _rtl_init_deferred_work(struct ieee80211_hw *hw)
461444 {
....@@ -476,17 +459,14 @@
476459 	rtlpriv->works.rtl_wq = wq;
477460 
478461 	INIT_DELAYED_WORK(&rtlpriv->works.watchdog_wq,
479
-			  (void *)rtl_watchdog_wq_callback);
462
+			  rtl_watchdog_wq_callback);
480463 	INIT_DELAYED_WORK(&rtlpriv->works.ips_nic_off_wq,
481
-			  (void *)rtl_ips_nic_off_wq_callback);
482
-	INIT_DELAYED_WORK(&rtlpriv->works.ps_work,
483
-			  (void *)rtl_swlps_wq_callback);
464
+			  rtl_ips_nic_off_wq_callback);
465
+	INIT_DELAYED_WORK(&rtlpriv->works.ps_work, rtl_swlps_wq_callback);
484466 	INIT_DELAYED_WORK(&rtlpriv->works.ps_rfon_wq,
485
-			  (void *)rtl_swlps_rfon_wq_callback);
486
-	INIT_DELAYED_WORK(&rtlpriv->works.fwevt_wq,
487
-			  (void *)rtl_fwevt_wq_callback);
488
-	INIT_DELAYED_WORK(&rtlpriv->works.c2hcmd_wq,
489
-			  (void *)rtl_c2hcmd_wq_callback);
467
+			  rtl_swlps_rfon_wq_callback);
468
+	INIT_DELAYED_WORK(&rtlpriv->works.fwevt_wq, rtl_fwevt_wq_callback);
469
+	INIT_DELAYED_WORK(&rtlpriv->works.c2hcmd_wq, rtl_c2hcmd_wq_callback);
490470 	return 0;
491471 }
492472 
....@@ -528,7 +508,7 @@
528508 
529509 		rtlpriv->rfkill.rfkill_state = radio_state;
530510 
531
-		blocked = (rtlpriv->rfkill.rfkill_state == 1) ? 0 : 1;
511
+		blocked = rtlpriv->rfkill.rfkill_state != 1;
532512 		wiphy_rfkill_set_hw_state(hw->wiphy, blocked);
533513 	}
534514 
....@@ -644,6 +624,7 @@
644624 	u8 rate_flag = info->control.rates[0].flags;
645625 	u8 sgi_40 = 0, sgi_20 = 0, bw_40 = 0;
646626 	u8 sgi_80 = 0, bw_80 = 0;
627
+
647628 	tcb_desc->use_shortgi = false;
648629 
649630 	if (sta == NULL)
....@@ -1344,7 +1325,7 @@
13441325 			rtlpriv->cfg->ops->chk_switch_dmdp(hw);
13451326 	}
13461327 	if (ieee80211_is_auth(fc)) {
1347
-		RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "MAC80211_LINKING\n");
1328
+		rtl_dbg(rtlpriv, COMP_SEND, DBG_DMESG, "MAC80211_LINKING\n");
13481329 
13491330 		mac->link_state = MAC80211_LINKING;
13501331 		/* Dul mac */
....@@ -1405,7 +1386,7 @@
14051386 			if (mac->act_scanning)
14061387 				return false;
14071388 
1408
-			RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
1389
+			rtl_dbg(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
14091390 				"%s ACT_ADDBAREQ From :%pM\n",
14101391 				is_tx ? "Tx" : "Rx", hdr->addr2);
14111392 			RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "req\n",
....@@ -1420,8 +1401,8 @@
14201401 				rcu_read_lock();
14211402 				sta = rtl_find_sta(hw, hdr->addr3);
14221403 				if (sta == NULL) {
1423
-					RT_TRACE(rtlpriv, COMP_SEND | COMP_RECV,
1424
-						 DBG_DMESG, "sta is NULL\n");
1404
+					rtl_dbg(rtlpriv, COMP_SEND | COMP_RECV,
1405
+						DBG_DMESG, "sta is NULL\n");
14251406 					rcu_read_unlock();
14261407 					return true;
14271408 				}
....@@ -1448,13 +1429,13 @@
14481429 			}
14491430 			break;
14501431 		case ACT_ADDBARSP:
1451
-			RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
1452
-				 "%s ACT_ADDBARSP From :%pM\n",
1453
-				  is_tx ? "Tx" : "Rx", hdr->addr2);
1432
+			rtl_dbg(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
1433
+				"%s ACT_ADDBARSP From :%pM\n",
1434
+				is_tx ? "Tx" : "Rx", hdr->addr2);
14541435 			break;
14551436 		case ACT_DELBA:
1456
-			RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
1457
-				 "ACT_ADDBADEL From :%pM\n", hdr->addr2);
1437
+			rtl_dbg(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
1438
+				"ACT_ADDBADEL From :%pM\n", hdr->addr2);
14581439 			break;
14591440 		}
14601441 		break;
....@@ -1475,7 +1456,7 @@
14751456 	if (rtlpriv->cfg->ops->get_btc_status())
14761457 		rtlpriv->btcoexist.btc_ops->btc_special_packet_notify(
14771458 					rtlpriv, type);
1478
-	rtl_lps_leave(hw);
1459
+	rtl_lps_leave(hw, false);
14791460 	ppsc->last_delaylps_stamp_jiffies = jiffies;
14801461 }
14811462 
....@@ -1539,9 +1520,9 @@
15391520 				/* 68 : UDP BOOTP client
15401521 				 * 67 : UDP BOOTP server
15411522 				 */
1542
-				RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV),
1543
-					 DBG_DMESG, "dhcp %s !!\n",
1544
-					 (is_tx) ? "Tx" : "Rx");
1523
+				rtl_dbg(rtlpriv, (COMP_SEND | COMP_RECV),
1524
+					DBG_DMESG, "dhcp %s !!\n",
1525
+					(is_tx) ? "Tx" : "Rx");
15451526 
15461527 				if (is_tx)
15471528 					setup_special_tx(rtlpriv, ppsc,
....@@ -1560,12 +1541,12 @@
15601541 		rtlpriv->btcoexist.btc_info.in_4way = true;
15611542 		rtlpriv->btcoexist.btc_info.in_4way_ts = jiffies;
15621543 
1563
-		RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
1564
-			 "802.1X %s EAPOL pkt!!\n", (is_tx) ? "Tx" : "Rx");
1544
+		rtl_dbg(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
1545
+			"802.1X %s EAPOL pkt!!\n", (is_tx) ? "Tx" : "Rx");
15651546 
15661547 		if (is_tx) {
15671548 			rtlpriv->ra.is_special_data = true;
1568
-			rtl_lps_leave(hw);
1549
+			rtl_lps_leave(hw, false);
15691550 			ppsc->last_delaylps_stamp_jiffies = jiffies;
15701551 
15711552 			setup_special_tx(rtlpriv, ppsc, PACKET_EAPOL);
....@@ -1603,12 +1584,12 @@
16031584 	info = IEEE80211_SKB_CB(skb);
16041585 	ieee80211_tx_info_clear_status(info);
16051586 	if (ack) {
1606
-		RT_TRACE(rtlpriv, COMP_TX_REPORT, DBG_LOUD,
1607
-			 "tx report: ack\n");
1587
+		rtl_dbg(rtlpriv, COMP_TX_REPORT, DBG_LOUD,
1588
+			"tx report: ack\n");
16081589 		info->flags |= IEEE80211_TX_STAT_ACK;
16091590 	} else {
1610
-		RT_TRACE(rtlpriv, COMP_TX_REPORT, DBG_LOUD,
1611
-			 "tx report: not ack\n");
1591
+		rtl_dbg(rtlpriv, COMP_TX_REPORT, DBG_LOUD,
1592
+			"tx report: not ack\n");
16121593 		info->flags &= ~IEEE80211_TX_STAT_ACK;
16131594 	}
16141595 	ieee80211_tx_status_irqsafe(hw, skb);
....@@ -1646,8 +1627,8 @@
16461627 	tx_report->last_sent_time = jiffies;
16471628 	tx_info->sn = sn;
16481629 	tx_info->send_time = tx_report->last_sent_time;
1649
-	RT_TRACE(rtlpriv, COMP_TX_REPORT, DBG_DMESG,
1650
-		 "Send TX-Report sn=0x%X\n", sn);
1630
+	rtl_dbg(rtlpriv, COMP_TX_REPORT, DBG_DMESG,
1631
+		"Send TX-Report sn=0x%X\n", sn);
16511632 
16521633 	return sn;
16531634 }
....@@ -1694,9 +1675,9 @@
16941675 			break;
16951676 		}
16961677 	}
1697
-	RT_TRACE(rtlpriv, COMP_TX_REPORT, DBG_DMESG,
1698
-		 "Recv TX-Report st=0x%02X sn=0x%X retry=0x%X\n",
1699
-		 st, sn, retry);
1678
+	rtl_dbg(rtlpriv, COMP_TX_REPORT, DBG_DMESG,
1679
+		"Recv TX-Report st=0x%02X sn=0x%X retry=0x%X\n",
1680
+		st, sn, retry);
17001681 }
17011682 EXPORT_SYMBOL_GPL(rtl_tx_report_handler);
17021683 
....@@ -1709,9 +1690,9 @@
17091690 		return true;
17101691 
17111692 	if (time_before(tx_report->last_sent_time + 3 * HZ, jiffies)) {
1712
-		RT_TRACE(rtlpriv, COMP_TX_REPORT, DBG_WARNING,
1713
-			 "Check TX-Report timeout!! s_sn=0x%X r_sn=0x%X\n",
1714
-			 tx_report->last_sent_sn, tx_report->last_recv_sn);
1693
+		rtl_dbg(rtlpriv, COMP_TX_REPORT, DBG_WARNING,
1694
+			"Check TX-Report timeout!! s_sn=0x%X r_sn=0x%X\n",
1695
+			tx_report->last_sent_sn, tx_report->last_recv_sn);
17151696 		return true;	/* 3 sec. (timeout) seen as acked */
17161697 	}
17171698 
....@@ -1727,8 +1708,8 @@
17271708 		if (rtl_check_tx_report_acked(hw))
17281709 			break;
17291710 		usleep_range(1000, 2000);
1730
-		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
1731
-			 "Wait 1ms (%d/%d) to disable key.\n", i, wait_ms);
1711
+		rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
1712
+			"Wait 1ms (%d/%d) to disable key.\n", i, wait_ms);
17321713 	}
17331714 }
17341715 
....@@ -1790,14 +1771,13 @@
17901771 		return -ENXIO;
17911772 	tid_data = &sta_entry->tids[tid];
17921773 
1793
-	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,
1794
-		 "on ra = %pM tid = %d seq:%d\n", sta->addr, tid,
1795
-		 *ssn);
1774
+	rtl_dbg(rtlpriv, COMP_SEND, DBG_DMESG,
1775
+		"on ra = %pM tid = %d seq:%d\n", sta->addr, tid,
1776
+		*ssn);
17961777 
17971778 	tid_data->agg.agg_state = RTL_AGG_START;
17981779 
1799
-	ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
1800
-	return 0;
1780
+	return IEEE80211_AMPDU_TX_START_IMMEDIATE;
18011781 }
18021782 
18031783 int rtl_tx_agg_stop(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
....@@ -1809,8 +1789,8 @@
18091789 	if (sta == NULL)
18101790 		return -EINVAL;
18111791 
1812
-	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,
1813
-		 "on ra = %pM tid = %d\n", sta->addr, tid);
1792
+	rtl_dbg(rtlpriv, COMP_SEND, DBG_DMESG,
1793
+		"on ra = %pM tid = %d\n", sta->addr, tid);
18141794 
18151795 	if (unlikely(tid >= MAX_TID_COUNT))
18161796 		return -EINVAL;
....@@ -1849,8 +1829,8 @@
18491829 		return -ENXIO;
18501830 	tid_data = &sta_entry->tids[tid];
18511831 
1852
-	RT_TRACE(rtlpriv, COMP_RECV, DBG_DMESG,
1853
-		 "on ra = %pM tid = %d\n", sta->addr, tid);
1832
+	rtl_dbg(rtlpriv, COMP_RECV, DBG_DMESG,
1833
+		"on ra = %pM tid = %d\n", sta->addr, tid);
18541834 
18551835 	tid_data->agg.rx_agg_state = RTL_RX_AGG_START;
18561836 	return 0;
....@@ -1865,8 +1845,8 @@
18651845 	if (sta == NULL)
18661846 		return -EINVAL;
18671847 
1868
-	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,
1869
-		 "on ra = %pM tid = %d\n", sta->addr, tid);
1848
+	rtl_dbg(rtlpriv, COMP_SEND, DBG_DMESG,
1849
+		"on ra = %pM tid = %d\n", sta->addr, tid);
18701850 
18711851 	if (unlikely(tid >= MAX_TID_COUNT))
18721852 		return -EINVAL;
....@@ -1876,6 +1856,7 @@
18761856 
18771857 	return 0;
18781858 }
1859
+
18791860 int rtl_tx_agg_oper(struct ieee80211_hw *hw,
18801861 		struct ieee80211_sta *sta, u16 tid)
18811862 {
....@@ -1885,8 +1866,8 @@
18851866 	if (sta == NULL)
18861867 		return -EINVAL;
18871868 
1888
-	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,
1889
-		 "on ra = %pM tid = %d\n", sta->addr, tid);
1869
+	rtl_dbg(rtlpriv, COMP_SEND, DBG_DMESG,
1870
+		"on ra = %pM tid = %d\n", sta->addr, tid);
18901871 
18911872 	if (unlikely(tid >= MAX_TID_COUNT))
18921873 		return -EINVAL;
....@@ -1906,9 +1887,9 @@
19061887 		btc_ops->btc_get_ampdu_cfg(rtlpriv, &reject_agg,
19071888 					   &ctrl_agg_size, &agg_size);
19081889 
1909
-	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
1910
-		 "Set RX AMPDU: coex - reject=%d, ctrl_agg_size=%d, size=%d",
1911
-		 reject_agg, ctrl_agg_size, agg_size);
1890
+	rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_DMESG,
1891
+		"Set RX AMPDU: coex - reject=%d, ctrl_agg_size=%d, size=%d",
1892
+		reject_agg, ctrl_agg_size, agg_size);
19121893 
19131894 	rtlpriv->hw->max_rx_aggregation_subframes =
19141895 		(ctrl_agg_size ? agg_size : IEEE80211_MAX_AMPDU_BUF_HT);
....@@ -1996,9 +1977,9 @@
19961977 		list_del(&entry->list);
19971978 		rtlpriv->scan_list.num--;
19981979 
1999
-		RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
2000
-			 "BSSID=%pM is expire in scan list (total=%d)\n",
2001
-			 entry->bssid, rtlpriv->scan_list.num);
1980
+		rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD,
1981
+			"BSSID=%pM is expire in scan list (total=%d)\n",
1982
+			entry->bssid, rtlpriv->scan_list.num);
20021983 		kfree(entry);
20031984 	}
20041985 
....@@ -2032,9 +2013,9 @@
20322013 		if (memcmp(entry->bssid, hdr->addr3, ETH_ALEN) == 0) {
20332014 			list_del_init(&entry->list);
20342015 			entry_found = true;
2035
-			RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
2036
-				 "Update BSSID=%pM to scan list (total=%d)\n",
2037
-				 hdr->addr3, rtlpriv->scan_list.num);
2016
+			rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD,
2017
+				"Update BSSID=%pM to scan list (total=%d)\n",
2018
+				hdr->addr3, rtlpriv->scan_list.num);
20382019 			break;
20392020 		}
20402021 	}
....@@ -2048,9 +2029,9 @@
20482029 		memcpy(entry->bssid, hdr->addr3, ETH_ALEN);
20492030 		rtlpriv->scan_list.num++;
20502031 
2051
-		RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
2052
-			 "Add BSSID=%pM to scan list (total=%d)\n",
2053
-			 hdr->addr3, rtlpriv->scan_list.num);
2032
+		rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD,
2033
+			"Add BSSID=%pM to scan list (total=%d)\n",
2034
+			hdr->addr3, rtlpriv->scan_list.num);
20542035 	}
20552036 
20562037 	entry->age = jiffies;
....@@ -2062,11 +2043,10 @@
20622043 }
20632044 EXPORT_SYMBOL(rtl_collect_scan_list);
20642045 
2065
-void rtl_watchdog_wq_callback(void *data)
2046
+static void rtl_watchdog_wq_callback(struct work_struct *work)
20662047 {
2067
-	struct rtl_works *rtlworks = container_of_dwork_rtl(data,
2068
-							    struct rtl_works,
2069
-							    watchdog_wq);
2048
+	struct rtl_works *rtlworks = container_of(work, struct rtl_works,
2049
+						  watchdog_wq.work);
20702050 	struct ieee80211_hw *hw = rtlworks->hw;
20712051 	struct rtl_priv *rtlpriv = rtl_priv(hw);
20722052 	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
....@@ -2099,7 +2079,6 @@
20992079 	 * busytraffic we don't change channel
21002080 	 */
21012081 	if (mac->link_state >= MAC80211_LINKED) {
2102
-
21032082 		/* (1) get aver_rx_cnt_inperiod & aver_tx_cnt_inperiod */
21042083 		for (idx = 0; idx <= 2; idx++) {
21052084 			rtlpriv->link_info.num_rx_in4period[idx] =
....@@ -2168,16 +2147,14 @@
21682147 		if (rtlpriv->link_info.num_rx_inperiod +
21692148 		      rtlpriv->link_info.num_tx_inperiod > 8 ||
21702149 		    rtlpriv->link_info.num_rx_inperiod > 2)
2171
-			rtl_lps_leave(hw);
2150
+			rtl_lps_leave(hw, true);
21722151 		else
2173
-			rtl_lps_enter(hw);
2152
+			rtl_lps_enter(hw, true);
21742153 
21752154 label_lps_done:
21762155 		;
21772156 	}
21782157 
2179
-	rtlpriv->link_info.num_rx_inperiod = 0;
2180
-	rtlpriv->link_info.num_tx_inperiod = 0;
21812158 	for (tid = 0; tid <= 7; tid++)
21822159 		rtlpriv->link_info.tidtx_inperiod[tid] = 0;
21832160 
....@@ -2213,8 +2190,8 @@
22132190 		if ((rtlpriv->link_info.bcn_rx_inperiod +
22142191 		    rtlpriv->link_info.num_rx_inperiod) == 0) {
22152192 			rtlpriv->link_info.roam_times++;
2216
-			RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,
2217
-				 "AP off for %d s\n",
2193
+			rtl_dbg(rtlpriv, COMP_ERR, DBG_DMESG,
2194
+				"AP off for %d s\n",
22182195 				(rtlpriv->link_info.roam_times * 2));
22192196 
22202197 			/* if we can't recv beacon for 10s,
....@@ -2240,6 +2217,8 @@
22402217 			rtlpriv->btcoexist.btc_info.in_4way = false;
22412218 	}
22422219 
2220
+	rtlpriv->link_info.num_rx_inperiod = 0;
2221
+	rtlpriv->link_info.num_tx_inperiod = 0;
22432222 	rtlpriv->link_info.bcn_rx_inperiod = 0;
22442223 
22452224 	/* <6> scan list */
....@@ -2259,10 +2238,11 @@
22592238 	mod_timer(&rtlpriv->works.watchdog_timer,
22602239 		  jiffies + MSECS(RTL_WATCH_DOG_TIME));
22612240 }
2262
-void rtl_fwevt_wq_callback(void *data)
2241
+
2242
+static void rtl_fwevt_wq_callback(struct work_struct *work)
22632243 {
2264
-	struct rtl_works *rtlworks =
2265
-		container_of_dwork_rtl(data, struct rtl_works, fwevt_wq);
2244
+	struct rtl_works *rtlworks = container_of(work, struct rtl_works,
2245
+						  fwevt_wq.work);
22662246 	struct ieee80211_hw *hw = rtlworks->hw;
22672247 	struct rtl_priv *rtlpriv = rtl_priv(hw);
22682248 
....@@ -2315,21 +2295,20 @@
23152295 	struct rtl_priv *rtlpriv = rtl_priv(hw);
23162296 	struct rtl_hal_ops *hal_ops = rtlpriv->cfg->ops;
23172297 	const struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;
2318
-	u8 cmd_id, cmd_seq, cmd_len;
2298
+	u8 cmd_id, cmd_len;
23192299 	u8 *cmd_buf = NULL;
23202300 
23212301 	cmd_id = GET_C2H_CMD_ID(skb->data);
2322
-	cmd_seq = GET_C2H_SEQ(skb->data);
23232302 	cmd_len = skb->len - C2H_DATA_OFFSET;
23242303 	cmd_buf = GET_C2H_DATA_PTR(skb->data);
23252304 
23262305 	switch (cmd_id) {
23272306 	case C2H_DBG:
2328
-		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "[C2H], C2H_DBG!!\n");
2307
+		rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, "[C2H], C2H_DBG!!\n");
23292308 		break;
23302309 	case C2H_TXBF:
2331
-		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
2332
-			 "[C2H], C2H_TXBF!!\n");
2310
+		rtl_dbg(rtlpriv, COMP_FW, DBG_TRACE,
2311
+			"[C2H], C2H_TXBF!!\n");
23332312 		break;
23342313 	case C2H_TX_REPORT:
23352314 		rtl_tx_report_handler(hw, cmd_buf, cmd_len);
....@@ -2339,20 +2318,20 @@
23392318 			hal_ops->c2h_ra_report_handler(hw, cmd_buf, cmd_len);
23402319 		break;
23412320 	case C2H_BT_INFO:
2342
-		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
2343
-			 "[C2H], C2H_BT_INFO!!\n");
2321
+		rtl_dbg(rtlpriv, COMP_FW, DBG_TRACE,
2322
+			"[C2H], C2H_BT_INFO!!\n");
23442323 		if (rtlpriv->cfg->ops->get_btc_status())
23452324 			btc_ops->btc_btinfo_notify(rtlpriv, cmd_buf, cmd_len);
23462325 		break;
23472326 	case C2H_BT_MP:
2348
-		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
2349
-			 "[C2H], C2H_BT_MP!!\n");
2327
+		rtl_dbg(rtlpriv, COMP_FW, DBG_TRACE,
2328
+			"[C2H], C2H_BT_MP!!\n");
23502329 		if (rtlpriv->cfg->ops->get_btc_status())
23512330 			btc_ops->btc_btmpinfo_notify(rtlpriv, cmd_buf, cmd_len);
23522331 		break;
23532332 	default:
2354
-		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
2355
-			 "[C2H], Unknown packet!! cmd_id(%#X)!\n", cmd_id);
2333
+		rtl_dbg(rtlpriv, COMP_FW, DBG_TRACE,
2334
+			"[C2H], Unknown packet!! cmd_id(%#X)!\n", cmd_id);
23562335 		break;
23572336 	}
23582337 }
....@@ -2376,8 +2355,8 @@
23762355 		if (!skb)
23772356 			break;
23782357 
2379
-		RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG, "C2H rx_desc_shift=%d\n",
2380
-			 *((u8 *)skb->cb));
2358
+		rtl_dbg(rtlpriv, COMP_FW, DBG_DMESG, "C2H rx_desc_shift=%d\n",
2359
+			*((u8 *)skb->cb));
23812360 		RT_PRINT_DATA(rtlpriv, COMP_FW, DBG_DMESG,
23822361 			      "C2H data: ", skb->data, skb->len);
23832362 
....@@ -2389,11 +2368,10 @@
23892368 	}
23902369 }
23912370 
2392
-void rtl_c2hcmd_wq_callback(void *data)
2371
+static void rtl_c2hcmd_wq_callback(struct work_struct *work)
23932372 {
2394
-	struct rtl_works *rtlworks = container_of_dwork_rtl(data,
2395
-							    struct rtl_works,
2396
-							    c2hcmd_wq);
2373
+	struct rtl_works *rtlworks = container_of(work, struct rtl_works,
2374
+						  c2hcmd_wq.work);
23972375 	struct ieee80211_hw *hw = rtlworks->hw;
23982376 
23992377 	rtl_c2hcmd_launcher(hw, 1);
....@@ -2411,6 +2389,7 @@
24112389 
24122390 	rtlpriv->cfg->ops->dualmac_easy_concurrent(hw);
24132391 }
2392
+
24142393 /*********************************************************
24152394  *
24162395  * frame process functions
....@@ -2463,7 +2442,7 @@
24632442 	case IEEE80211_SMPS_AUTOMATIC:/* 0 */
24642443 	case IEEE80211_SMPS_NUM_MODES:/* 4 */
24652444 		WARN_ON(1);
2466
-	/* fall through */
2445
+		fallthrough;
24672446 	case IEEE80211_SMPS_OFF:/* 1 */ /*MIMO_PS_NOLIMIT*/
24682447 		action_frame->u.action.u.ht_smps.smps_control =
24692448 				WLAN_HT_SMPS_CONTROL_DISABLED;/* 0 */
....@@ -2721,29 +2700,29 @@
27212700 		(memcmp(mac->bssid, ap5_6, 3) == 0) ||
27222701 		vendor == PEER_ATH) {
27232702 		vendor = PEER_ATH;
2724
-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>ath find\n");
2703
+		rtl_dbg(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>ath find\n");
27252704 	} else if ((memcmp(mac->bssid, ap4_4, 3) == 0) ||
27262705 		(memcmp(mac->bssid, ap4_5, 3) == 0) ||
27272706 		(memcmp(mac->bssid, ap4_1, 3) == 0) ||
27282707 		(memcmp(mac->bssid, ap4_2, 3) == 0) ||
27292708 		(memcmp(mac->bssid, ap4_3, 3) == 0) ||
27302709 		vendor == PEER_RAL) {
2731
-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>ral find\n");
2710
+		rtl_dbg(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>ral find\n");
27322711 		vendor = PEER_RAL;
27332712 	} else if (memcmp(mac->bssid, ap6_1, 3) == 0 ||
27342713 		vendor == PEER_CISCO) {
27352714 		vendor = PEER_CISCO;
2736
-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>cisco find\n");
2715
+		rtl_dbg(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>cisco find\n");
27372716 	} else if ((memcmp(mac->bssid, ap3_1, 3) == 0) ||
27382717 		(memcmp(mac->bssid, ap3_2, 3) == 0) ||
27392718 		(memcmp(mac->bssid, ap3_3, 3) == 0) ||
27402719 		vendor == PEER_BROAD) {
2741
-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>broad find\n");
2720
+		rtl_dbg(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>broad find\n");
27422721 		vendor = PEER_BROAD;
27432722 	} else if (memcmp(mac->bssid, ap7_1, 3) == 0 ||
27442723 		vendor == PEER_MARV) {
27452724 		vendor = PEER_MARV;
2746
-		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>marv find\n");
2725
+		rtl_dbg(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>marv find\n");
27472726 	}
27482727 
27492728 	mac->vendor = vendor;