Merge tag 'wireless-next-2023-10-26' of... (edd68156) · Commits · git / linux-net

Documentation/driver-api/80211/mac80211.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ functions/definitions
		ieee80211_rx
		ieee80211_rx_ni
		ieee80211_rx_irqsafe
		ieee80211_tx_status
		ieee80211_tx_status_skb
		ieee80211_tx_status_ni
		ieee80211_tx_status_irqsafe
		ieee80211_rts_get

MAINTAINERS

+0 −1

Original line number	Diff line number	Diff line
		@@ -17943,7 +17943,6 @@ F: arch/mips/boot/dts/ralink/mt7621*

		RALINK RT2X00 WIRELESS LAN DRIVER
		M: Stanislaw Gruszka <stf_xl@wp.pl>
		M: Helmut Schaa <helmut.schaa@googlemail.com>
		L: linux-wireless@vger.kernel.org
		S: Maintained
		F: drivers/net/wireless/ralink/rt2x00/

drivers/net/wireless/ath/ath11k/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,8 @@ ath11k-y += core.o \
		peer.o \
		dbring.o \
		hw.o \
		pcic.o
		pcic.o \
		fw.o

		ath11k-$(CONFIG_ATH11K_DEBUGFS) += debugfs.o debugfs_htt_stats.o debugfs_sta.o
		ath11k-$(CONFIG_NL80211_TESTMODE) += testmode.o

drivers/net/wireless/ath/ath11k/ahb.c

+2 −8

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@

		#include <linux/module.h>
		#include <linux/platform_device.h>
		#include <linux/property.h>
		#include <linux/of_device.h>
		#include <linux/of.h>
		#include <linux/dma-mapping.h>
		@@ -1084,19 +1085,12 @@ static int ath11k_ahb_fw_resource_deinit(struct ath11k_base *ab)
		static int ath11k_ahb_probe(struct platform_device *pdev)
		{
		struct ath11k_base *ab;
		const struct of_device_id *of_id;
		const struct ath11k_hif_ops *hif_ops;
		const struct ath11k_pci_ops *pci_ops;
		enum ath11k_hw_rev hw_rev;
		int ret;

		of_id = of_match_device(ath11k_ahb_of_match, &pdev->dev);
		if (!of_id) {
		dev_err(&pdev->dev, "failed to find matching device tree id\n");
		return -EINVAL;
		}

		hw_rev = (uintptr_t)of_id->data;
		hw_rev = (uintptr_t)device_get_match_data(&pdev->dev);

		switch (hw_rev) {
		case ATH11K_HW_IPQ8074:

drivers/net/wireless/ath/ath11k/core.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		#include "debug.h"
		#include "hif.h"
		#include "wow.h"
		#include "fw.h"

		unsigned int ath11k_debug_mask;
		EXPORT_SYMBOL(ath11k_debug_mask);
		@@ -1317,6 +1318,7 @@ int ath11k_core_fetch_bdf(struct ath11k_base ab, struct ath11k_board_data bd)
		{
		char boardname = NULL, fallback_boardname = NULL, *chip_id_boardname = NULL;
		char *filename, filepath[100];
		int bd_api;
		int ret = 0;

		filename = ATH11K_BOARD_API2_FILE;
		@@ -1332,7 +1334,7 @@ int ath11k_core_fetch_bdf(struct ath11k_base ab, struct ath11k_board_data bd)
		goto exit;
		}

		ab->bd_api = 2;
		bd_api = 2;
		ret = ath11k_core_fetch_board_data_api_n(ab, bd, boardname,
		ATH11K_BD_IE_BOARD,
		ATH11K_BD_IE_BOARD_NAME,
		@@ -1381,7 +1383,7 @@ int ath11k_core_fetch_bdf(struct ath11k_base ab, struct ath11k_board_data bd)
		if (!ret)
		goto exit;

		ab->bd_api = 1;
		bd_api = 1;
		ret = ath11k_core_fetch_board_data_api_1(ab, bd, ATH11K_DEFAULT_BOARD_FILE);
		if (ret) {
		ath11k_core_create_firmware_path(ab, filename,
		@@ -1405,7 +1407,7 @@ int ath11k_core_fetch_bdf(struct ath11k_base ab, struct ath11k_board_data bd)
		kfree(chip_id_boardname);

		if (!ret)
		ath11k_dbg(ab, ATH11K_DBG_BOOT, "using board api %d\n", ab->bd_api);
		ath11k_dbg(ab, ATH11K_DBG_BOOT, "using board api %d\n", bd_api);

		return ret;
		}
		@@ -2071,6 +2073,12 @@ int ath11k_core_pre_init(struct ath11k_base *ab)
		return ret;
		}

		ret = ath11k_fw_pre_init(ab);
		if (ret) {
		ath11k_err(ab, "failed to pre init firmware: %d", ret);
		return ret;
		}

		return 0;
		}
		EXPORT_SYMBOL(ath11k_core_pre_init);
		@@ -2101,6 +2109,7 @@ void ath11k_core_deinit(struct ath11k_base *ab)
		ath11k_hif_power_down(ab);
		ath11k_mac_destroy(ab);
		ath11k_core_soc_destroy(ab);
		ath11k_fw_destroy(ab);
		}
		EXPORT_SYMBOL(ath11k_core_deinit);