diff options
| author |   Kalle Valo <kvalo@qca.qualcomm.com> | 2017-02-21 21:47:06 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-02-21 15:59:45 -0500 |
| commit | 005c3490e9db23738d91e02788606c0fe4734723 (patch) | |
| tree | 501aa1ddf9ecfc22082f4648407e9f0602d74808 /drivers/net/wireless/ath/ath10k/core.h | |
| parent | net: socket: fix recvmmsg not returning error from sock_error (diff) | |
| download | linux-dev-005c3490e9db23738d91e02788606c0fe4734723.tar.xz linux-dev-005c3490e9db23738d91e02788606c0fe4734723.zip | |
Revert "ath10k: Search SMBIOS for OEM board file extension"
This reverts commit f2593cb1b29185d38db706cbcbe22ed538720ae1.
Paul reported that this patch with older board-2.bin ath10k initialisation
fails on Dell XPS 13:
ath10k_pci 0000:3a:00.0: failed to fetch board data for bus=pci,vendor=168c,
device=003e,subsystem-vendor=1a56,subsystem-device=1535,variant=RV_0520 from
ath10k/QCA6174/hw3.0/board-2.bin
The reason is that the older board-2.bin does not have the variant version of
the image name and ath10k does not fallback to the older naming scheme.
Reported-by: Paul Menzel <pmenzel@molgen.mpg.de>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=185621#c9
Fixes: f2593cb1b291 ("ath10k: Search SMBIOS for OEM board file extension")
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/core.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 88d14be7fcce..757242ef52ac 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -69,23 +69,6 @@ #define ATH10K_NAPI_BUDGET 64 #define ATH10K_NAPI_QUOTA_LIMIT 60 -/* SMBIOS type containing Board Data File Name Extension */ -#define ATH10K_SMBIOS_BDF_EXT_TYPE 0xF8 - -/* SMBIOS type structure length (excluding strings-set) */ -#define ATH10K_SMBIOS_BDF_EXT_LENGTH 0x9 - -/* Offset pointing to Board Data File Name Extension */ -#define ATH10K_SMBIOS_BDF_EXT_OFFSET 0x8 - -/* Board Data File Name Extension string length. - * String format: BDF_<Customer ID>_<Extension>\0 - */ -#define ATH10K_SMBIOS_BDF_EXT_STR_LENGTH 0x20 - -/* The magic used by QCA spec */ -#define ATH10K_SMBIOS_BDF_EXT_MAGIC "BDF_" - struct ath10k; enum ath10k_bus { @@ -815,8 +798,6 @@ struct ath10k { bool bmi_ids_valid; u8 bmi_board_id; u8 bmi_chip_id; - - char bdf_ext[ATH10K_SMBIOS_BDF_EXT_STR_LENGTH]; } id; int fw_api; |