Commit acd11255 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-next-2023-04-05' of... 

Merge tag 'wireless-next-2023-04-05' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

Kalle Valo says:

====================
wireless-next patches for v6.3

Smaller pull request this time, sending this early to fix the conflict
in mac80211. Nothing really special this time, only smaller changes.

 * enable Wi-Fi 7 (EHT) mesh support

* tag 'wireless-next-2023-04-05' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (37 commits)
  wifi: rt2x00: Fix memory leak when handling surveys
  wifi: b43legacy: Remove the unused function prev_slot()
  wifi: rtw89: Remove redundant pci_clear_master
  wifi: rtw89: fix potential race condition between napi_init and napi_enable
  wifi: rtw89: config EDCCA threshold during scan to prevent TX failed
  wifi: rtw89: fix incorrect channel info during scan due to ppdu_sts filtering
  wifi: rtw89: remove superfluous H2C of join_info
  wifi: rtw89: set data lowest rate according to AP supported rate
  wifi: rtw89: add counters of register-based H2C/C2H
  wifi: rtw89: coex: Update Wi-Fi Bluetooth coexistence version to 7.0.1
  wifi: rtw89: coex: Add report control v5 variation
  wifi: rtw89: coex: Update RTL8852B LNA2 hardware parameter
  wifi: rtw89: coex: Not to enable firmware report when WiFi is power saving
  wifi: rtw89: coex: Add LPS protocol radio state for RTL8852B
  bcma: remove unused mips_read32 function
  bcma: Use of_address_to_resource()
  wifi: mwifiex: remove unused evt_buf variable
  wifi: brcmsmac: ampdu: remove unused suc_mpdu variable
  wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_reg()
  wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()
  ...
====================

Link: https://lore.kernel.org/r/20230405111037.4792BC43443@smtp.kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 2acbeb5d cbef9a83

drivers/bcma/driver_mips.c

+0 −6
Original line number Diff line number Diff line
@@ -46,12 +46,6 @@ static inline bool bcma_core_mips_bcm5357b0_quirk(struct bcma_device *dev) 
	       dev->id.id == BCMA_CORE_USB20_HOST;

}



static inline u32 mips_read32(struct bcma_drv_mips *mcore,

			      u16 offset)

{

	return bcma_read32(mcore->core, offset);

}



static u32 bcma_core_mips_irqflag(struct bcma_device *dev)

{

	u32 flag;

drivers/bcma/main.c

+5 −5
Original line number Diff line number Diff line
@@ -140,17 +140,17 @@ static struct device_node *bcma_of_find_child_device(struct device *parent, 
						     struct bcma_device *core)

{

	struct device_node *node;

	u64 size;

	const __be32 *reg;

	int ret;



	if (!parent->of_node)

		return NULL;



	for_each_child_of_node(parent->of_node, node) {

		reg = of_get_address(node, 0, &size, NULL);

		if (!reg)

		struct resource res;

		ret = of_address_to_resource(node, 0, &res);

		if (ret)

			continue;

		if (of_translate_address(node, reg) == core->addr)

		if (res.start == core->addr)

			return node;

	}

	return NULL;

drivers/net/wireless/broadcom/b43legacy/dma.c

+0 −8
Original line number Diff line number Diff line
@@ -127,14 +127,6 @@ static inline int next_slot(struct b43legacy_dmaring *ring, int slot) 
	return slot + 1;

}



static inline int prev_slot(struct b43legacy_dmaring *ring, int slot)

{

	B43legacy_WARN_ON(!(slot >= 0 && slot <= ring->nr_slots - 1));

	if (slot == 0)

		return ring->nr_slots - 1;

	return slot - 1;

}



#ifdef CONFIG_B43LEGACY_DEBUG

static void update_max_used_slots(struct b43legacy_dmaring *ring,

				  int current_used_slots)

drivers/net/wireless/broadcom/b43legacy/radio.c

+0 −17
Original line number Diff line number Diff line
@@ -1709,23 +1709,6 @@ u16 b43legacy_radio_init2050(struct b43legacy_wldev *dev) 
	return ret;

}



static inline

u16 freq_r3A_value(u16 frequency)

{

	u16 value;



	if (frequency < 5091)

		value = 0x0040;

	else if (frequency < 5321)

		value = 0x0000;

	else if (frequency < 5806)

		value = 0x0080;

	else

		value = 0x0040;



	return value;

}



int b43legacy_radio_selectchannel(struct b43legacy_wldev *dev,

				  u8 channel,

				  int synthetic_pu_workaround)

drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c

+1 −2
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, 
	u16 seq, start_seq = 0, bindex, index, mcl;

	u8 mcs = 0;

	bool ba_recd = false, ack_recd = false;

	u8 suc_mpdu = 0, tot_mpdu = 0;

	u8 tot_mpdu = 0;

	uint supr_status;

	bool retry = true;

	u16 mimoantsel = 0;
@@ -975,7 +975,6 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, 
				ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw,

							    p);

				ack_recd = true;

				suc_mpdu++;

			}

		}

		/* either retransmit or send bar if ack not recd */