Commit 18b3246d authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge tag 'rtw-next-2025-07-18' of https://github.com/pkshih/rtw 



Ping-Ke Shih says:
==================
rtw-next patches for v6.17

Some minor fixes and refinements. Major changes are listed:

rtw89:

 - STA+P2P concurrency feature gets implemented.

 - add USB architecture and support RTL8851BU and RTL8852BU.
==================

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents af2d6148 94cd0ba1

drivers/net/wireless/realtek/rtl8xxxu/core.c

+1 −1
Original line number Diff line number Diff line
@@ -6618,7 +6618,7 @@ static int rtl8xxxu_submit_rx_urb(struct rtl8xxxu_priv *priv, 
		skb_size = fops->rx_agg_buf_size;

		skb_size += (rx_desc_sz + sizeof(struct rtl8723au_phy_stats));

	} else {

		skb_size = IEEE80211_MAX_FRAME_LEN;

		skb_size = IEEE80211_MAX_FRAME_LEN + rx_desc_sz;

	}



	skb = __netdev_alloc_skb(NULL, skb_size, GFP_KERNEL);

drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c

+3 −16
Original line number Diff line number Diff line
@@ -1487,22 +1487,9 @@ _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, 
			rtlefuse->txpwrlevel_ht40_1s[rf_path][i] =

			    rtlefuse->

			    eeprom_chnlarea_txpwr_ht40_1s[rf_path][index];



			if ((rtlefuse->

			     eeprom_chnlarea_txpwr_ht40_1s[rf_path][index] -

			     rtlefuse->

			     eprom_chnl_txpwr_ht40_2sdf[rf_path][index])

			    > 0) {

			rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =

				    rtlefuse->

				    eeprom_chnlarea_txpwr_ht40_1s[rf_path]

				    [index] -

				    rtlefuse->

				    eprom_chnl_txpwr_ht40_2sdf[rf_path]

				    [index];

			} else {

				rtlefuse->txpwrlevel_ht40_2s[rf_path][i] = 0;

			}

				max(rtlefuse->eeprom_chnlarea_txpwr_ht40_1s[rf_path][index] -

				    rtlefuse->eprom_chnl_txpwr_ht40_2sdf[rf_path][index], 0);

		}



		for (i = 0; i < 14; i++) {

drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c

+3 −14
Original line number Diff line number Diff line
@@ -163,20 +163,9 @@ _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, 
			rtlefuse->txpwrlevel_ht40_1s[rf_path][i] =

			    rtlefuse->

			    eeprom_chnlarea_txpwr_ht40_1s[rf_path][index];

			if ((rtlefuse->

			     eeprom_chnlarea_txpwr_ht40_1s[rf_path][index] -

			     rtlefuse->

			     eprom_chnl_txpwr_ht40_2sdf[rf_path][index])

			    > 0) {

			rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =

				    rtlefuse->

				    eeprom_chnlarea_txpwr_ht40_1s[rf_path]

				    [index] - rtlefuse->

				    eprom_chnl_txpwr_ht40_2sdf[rf_path]

				    [index];

			} else {

				rtlefuse->txpwrlevel_ht40_2s[rf_path][i] = 0;

			}

				max(rtlefuse->eeprom_chnlarea_txpwr_ht40_1s[rf_path][index] -

				    rtlefuse->eprom_chnl_txpwr_ht40_2sdf[rf_path][index], 0);

		}

		for (i = 0; i < 14; i++) {

			RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c

+1 −4
Original line number Diff line number Diff line
@@ -223,10 +223,7 @@ static void rtl92ee_dm_dig(struct ieee80211_hw *hw) 


	if (mac->link_state >= MAC80211_LINKED) {

		if (bfirstconnect) {

			if (dm_dig->rssi_val_min <= dig_maxofmin)

				current_igi = dm_dig->rssi_val_min;

			else

				current_igi = dig_maxofmin;

			current_igi = min(dm_dig->rssi_val_min, dig_maxofmin);



			dm_dig->large_fa_hit = 0;

		} else {

drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c

+3 −12
Original line number Diff line number Diff line
@@ -1449,18 +1449,9 @@ _rtl8723e_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, 
				rtlefuse->eeprom_chnlarea_txpwr_ht40_1s

					[rf_path][index];



			if ((rtlefuse->eeprom_chnlarea_txpwr_ht40_1s

					[rf_path][index] -

			     rtlefuse->eprom_chnl_txpwr_ht40_2sdf

					[rf_path][index]) > 0) {

			rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =

				  rtlefuse->eeprom_chnlarea_txpwr_ht40_1s

				  [rf_path][index] -

				  rtlefuse->eprom_chnl_txpwr_ht40_2sdf

				  [rf_path][index];

			} else {

				rtlefuse->txpwrlevel_ht40_2s[rf_path][i] = 0;

			}

				max(rtlefuse->eeprom_chnlarea_txpwr_ht40_1s[rf_path][index] -

				    rtlefuse->eprom_chnl_txpwr_ht40_2sdf[rf_path][index], 0);

		}



		for (i = 0; i < 14; i++) {