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

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 

Conflicts:
	drivers/net/wireless/ath/ath5k/base.c
	net/mac80211/main.c
parents 6e5c2b4e cd87a2d3

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4555,7 +4555,7 @@ F: include/linux/preempt.h 
PRISM54 WIRELESS DRIVER

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

L:	linux-wireless@vger.kernel.org

W:	http://prism54.org

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

S:	Obsolete

F:	drivers/net/wireless/prism54/

drivers/net/wireless/ath/ath5k/base.c

+4 −0
Original line number Diff line number Diff line
@@ -673,6 +673,10 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf, 
			PCI_DMA_TODEVICE);



	rate = ieee80211_get_tx_rate(sc->hw, info);

	if (!rate) {

		ret = -EINVAL;

		goto err_unmap;

	}



	if (info->flags & IEEE80211_TX_CTL_NO_ACK)

		flags |= AR5K_TXDESC_NOACK;

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

+1 −1
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ static bool ar9300_uncompress_block(struct ath_hw *ah, 
		length = block[it+1];

		length &= 0xff;



		if (length > 0 && spot >= 0 && spot+length < mdataSize) {

		if (length > 0 && spot >= 0 && spot+length <= mdataSize) {

			ath_print(common, ATH_DBG_EEPROM,

				  "Restore at %d: spot=%d "

				  "offset=%d length=%d\n",

drivers/net/wireless/ath/ath9k/eeprom.h

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 


#define SD_NO_CTL               0xE0

#define NO_CTL                  0xff

#define CTL_MODE_M              7

#define CTL_MODE_M              0xf

#define CTL_11A                 0

#define CTL_11B                 1

#define CTL_11G                 2

drivers/net/wireless/ath/regd.h

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ enum ctl_group { 
#define NO_CTL 0xff

#define SD_NO_CTL               0xE0

#define NO_CTL                  0xff

#define CTL_MODE_M              7

#define CTL_11A                 0

#define CTL_11B                 1

#define CTL_11G                 2