Commit 9d383fbb authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-for-davem-2018-01-17' of... 

Merge tag 'wireless-drivers-for-davem-2018-01-17' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
wireless-drivers fixes for 4.15

One last set of fixes for regression submitted during the last few days.

bcma & ssb

* fix older build problems which (apparently) recently became more
  frequent in certain MIPS configurations

brcmfmac

* continue driver initialisation even if CLM blob (firmware) file is
  not found
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b200bfd6 cc124d5c

drivers/bcma/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ config BCMA_DRIVER_PCI 


config BCMA_DRIVER_PCI_HOSTMODE

	bool "Driver for PCI core working in hostmode"

	depends on MIPS && BCMA_DRIVER_PCI

	depends on MIPS && BCMA_DRIVER_PCI && PCI_DRIVERS_LEGACY

	help

	  PCI core hostmode operation (external PCI bus).

drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c

+3 −6
Original line number Diff line number Diff line
@@ -182,13 +182,10 @@ static int brcmf_c_process_clm_blob(struct brcmf_if *ifp) 


	err = request_firmware(&clm, clm_name, dev);

	if (err) {

		if (err == -ENOENT) {

			brcmf_dbg(INFO, "continue with CLM data currently present in firmware\n");

		brcmf_info("no clm_blob available(err=%d), device may have limited channels available\n",

			   err);

		return 0;

	}

		brcmf_err("request CLM blob file failed (%d)\n", err);

		return err;

	}



	chunk_buf = kzalloc(sizeof(*chunk_buf) + MAX_CHUNK_LEN - 1, GFP_KERNEL);

	if (!chunk_buf) {

drivers/ssb/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ config SSB_BLOCKIO 


config SSB_PCIHOST_POSSIBLE

	bool

	depends on SSB && (PCI = y || PCI = SSB)

	depends on SSB && (PCI = y || PCI = SSB) && PCI_DRIVERS_LEGACY

	default y



config SSB_PCIHOST

CRA Git | Maintained and supported by SUSTech CRA and CCSE