Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'wireless-drivers-next-for-davem-2015-07-31' of... 

Merge tag 'wireless-drivers-next-for-davem-2015-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
Major changes:

mwifiex:

* add TX DATA Pause support
* add multichannel and TDLS channel switch support

ath10k:

* enable VHT for IBSS
* initial work to support qca99x0 and the corresponding 10.4 firmware branch
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 774ad031 360d9bb5

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6507,7 +6507,7 @@ F: drivers/net/ethernet/marvell/mvneta.* 


MARVELL MWIFIEX WIRELESS DRIVER

M:	Amitkumar Karwar <akarwar@marvell.com>

M:	Avinash Patil <patila@marvell.com>

M:	Nishant Sarmukadam <nishants@marvell.com>

L:	linux-wireless@vger.kernel.org

S:	Maintained

F:	drivers/net/wireless/mwifiex/

drivers/bcma/main.c

+12 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/slab.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>



MODULE_DESCRIPTION("Broadcom's specific AMBA driver");

MODULE_LICENSE("GPL");
@@ -409,6 +410,17 @@ int bcma_bus_register(struct bcma_bus *bus) 
		bcma_core_pci_early_init(&bus->drv_pci[0]);

	}



	/* TODO: remove check for IS_BUILTIN(CONFIG_BCMA) check when

	 * of_default_bus_match_table is exported or in some other way

	 * accessible. This is just a temporary workaround.

	 */

	if (IS_BUILTIN(CONFIG_BCMA) && bus->host_pdev) {

		struct device *dev = &bus->host_pdev->dev;



		of_platform_populate(dev->of_node, of_default_bus_match_table,

				     NULL, dev);

	}



	/* Cores providing flash access go before SPROM init */

	list_for_each_entry(core, &bus->cores, list) {

		if (bcma_is_core_needed_early(core->id.id))

drivers/net/wireless/ath/ath10k/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ ath10k_core-y += mac.o \ 
		 wmi-tlv.o \

		 bmi.o \

		 hw.o \

		 p2p.o

		 p2p.o \

		 swap.o



ath10k_core-$(CONFIG_ATH10K_DEBUGFS) += spectral.o

ath10k_core-$(CONFIG_NL80211_TESTMODE) += testmode.o

drivers/net/wireless/ath/ath10k/bmi.h

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ struct bmi_target_info { 
};



/* in msec */

#define BMI_COMMUNICATION_TIMEOUT_HZ (1*HZ)

#define BMI_COMMUNICATION_TIMEOUT_HZ (2 * HZ)



#define BMI_CE_NUM_TO_TARG 0

#define BMI_CE_NUM_TO_HOST 1

drivers/net/wireless/ath/ath10k/ce.c

+1 −0
Original line number Diff line number Diff line
@@ -452,6 +452,7 @@ int ath10k_ce_completed_recv_next_nolock(struct ath10k_ce_pipe *ce_state, 
{

	struct ath10k_ce_ring *dest_ring = ce_state->dest_ring;

	unsigned int nentries_mask = dest_ring->nentries_mask;

	struct ath10k *ar = ce_state->ar;

	unsigned int sw_index = dest_ring->sw_index;



	struct ce_desc *base = dest_ring->base_addr_owner_space;