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

Commit ad86c55b authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
parents 21eb2189 39731b78

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1430,7 +1430,7 @@ F: Documentation/aoe/ 
F:	drivers/block/aoe/



ATHEROS ATH GENERIC UTILITIES

M:	"Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>

M:	"Luis R. Rodriguez" <mcgrof@do-not-panic.com>

L:	linux-wireless@vger.kernel.org

S:	Supported

F:	drivers/net/wireless/ath/*
@@ -1438,7 +1438,7 @@ F: drivers/net/wireless/ath/* 
ATHEROS ATH5K WIRELESS DRIVER

M:	Jiri Slaby <jirislaby@gmail.com>

M:	Nick Kossifidis <mickflemm@gmail.com>

M:	"Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>

M:	"Luis R. Rodriguez" <mcgrof@do-not-panic.com>

L:	linux-wireless@vger.kernel.org

L:	ath5k-devel@lists.ath5k.org

W:	http://wireless.kernel.org/en/users/Drivers/ath5k

drivers/bcma/main.c

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ static int bcma_register_cores(struct bcma_bus *bus) 
			bcma_err(bus,

				 "Could not register dev for core 0x%03X\n",

				 core->id.id);

			put_device(&core->dev);

			continue;

		}

		core->dev_registered = true;

drivers/net/wireless/ath/ath6kl/wmi.c

+3 −3
Original line number Diff line number Diff line
@@ -2754,9 +2754,9 @@ static int ath6kl_set_bitrate_mask64(struct wmi *wmi, u8 if_idx, 
				mask->control[band].legacy << 4;



		/* copy mcs rate mask */

		mcsrate = mask->control[band].mcs[1];

		mcsrate = mask->control[band].ht_mcs[1];

		mcsrate <<= 8;

		mcsrate |= mask->control[band].mcs[0];

		mcsrate |= mask->control[band].ht_mcs[0];

		ratemask[band] |= mcsrate << 12;

		ratemask[band] |= mcsrate << 28;

	}
@@ -2806,7 +2806,7 @@ static int ath6kl_set_bitrate_mask32(struct wmi *wmi, u8 if_idx, 
				mask->control[band].legacy << 4;



		/* copy mcs rate mask */

		mcsrate = mask->control[band].mcs[0];

		mcsrate = mask->control[band].ht_mcs[0];

		ratemask[band] |= mcsrate << 12;

		ratemask[band] |= mcsrate << 20;

	}

drivers/net/wireless/ath/ath9k/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -11,12 +11,14 @@ ath9k-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += mci.o 
ath9k-$(CONFIG_ATH9K_LEGACY_RATE_CONTROL) += rc.o

ath9k-$(CONFIG_ATH9K_PCI) += pci.o

ath9k-$(CONFIG_ATH9K_AHB) += ahb.o

ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o

ath9k-$(CONFIG_ATH9K_DFS_DEBUGFS) += dfs_debug.o

ath9k-$(CONFIG_ATH9K_DFS_CERTIFIED) += dfs.o

ath9k-$(CONFIG_ATH9K_TX99) += tx99.o

ath9k-$(CONFIG_ATH9K_WOW) += wow.o



ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o \

				 spectral.o



obj-$(CONFIG_ATH9K) += ath9k.o



ath9k_hw-y:=	\

drivers/net/wireless/ath/ath9k/antenna.c

+4 −4
Original line number Diff line number Diff line
@@ -724,14 +724,14 @@ void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs) 
	struct ath_ant_comb *antcomb = &sc->ant_comb;

	int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set;

	int curr_main_set;

	int main_rssi = rs->rs_rssi_ctl0;

	int alt_rssi = rs->rs_rssi_ctl1;

	int main_rssi = rs->rs_rssi_ctl[0];

	int alt_rssi = rs->rs_rssi_ctl[1];

	int rx_ant_conf,  main_ant_conf;

	bool short_scan = false, ret;



	rx_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_CURRENT_SHIFT) &

	rx_ant_conf = (rs->rs_rssi_ctl[2] >> ATH_ANT_RX_CURRENT_SHIFT) &

		       ATH_ANT_RX_MASK;

	main_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_MAIN_SHIFT) &

	main_ant_conf = (rs->rs_rssi_ctl[2] >> ATH_ANT_RX_MAIN_SHIFT) &

			 ATH_ANT_RX_MASK;



	if (alt_rssi >= antcomb->low_rssi_thresh) {