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

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

Merge branch 'master' of ssh://infradead/~/public_git/wireless-next into for-davem

parents 765cf997 12e62d6f

MAINTAINERS

+8 −6
Original line number Diff line number Diff line
@@ -1246,6 +1246,14 @@ W: http://wireless.kernel.org/en/users/Drivers/ath5k 
S:	Maintained

F:	drivers/net/wireless/ath/ath5k/



ATHEROS ATH6KL WIRELESS DRIVER

M:	Kalle Valo <kvalo@qca.qualcomm.com>

L:	linux-wireless@vger.kernel.org

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

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath6kl.git

S:	Supported

F:	drivers/net/wireless/ath/ath6kl/



ATHEROS ATH9K WIRELESS DRIVER

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

M:	Jouni Malinen <jouni@qca.qualcomm.com>
@@ -6145,12 +6153,6 @@ M: Jakub Schmidtke <sjakub@gmail.com> 
S:	Odd Fixes

F:	drivers/staging/asus_oled/



STAGING - ATHEROS ATH6KL WIRELESS DRIVER

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

M:	Naveen Singh <nsingh@atheros.com>

S:	Odd Fixes

F:	drivers/staging/ath6kl/



STAGING - COMEDI

M:	Ian Abbott <abbotti@mev.co.uk>

M:	Mori Hess <fmhess@users.sourceforge.net>

drivers/bcma/sprom.c

+9 −0
Original line number Diff line number Diff line
@@ -133,6 +133,15 @@ static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom) 
		v = sprom[SPOFF(SSB_SPROM8_IL0MAC) + i];

		*(((__be16 *)bus->sprom.il0mac) + i) = cpu_to_be16(v);

	}



	bus->sprom.board_rev = sprom[SPOFF(SSB_SPROM8_BOARDREV)];



	bus->sprom.boardflags_lo = sprom[SPOFF(SSB_SPROM8_BFLLO)];

	bus->sprom.boardflags_hi = sprom[SPOFF(SSB_SPROM8_BFLHI)];

	bus->sprom.boardflags2_lo = sprom[SPOFF(SSB_SPROM8_BFL2LO)];

	bus->sprom.boardflags2_hi = sprom[SPOFF(SSB_SPROM8_BFL2HI)];



	bus->sprom.country_code = sprom[SPOFF(SSB_SPROM8_CCODE)];

}



int bcma_sprom_get(struct bcma_bus *bus)

drivers/net/wireless/ath/ath.h

+0 −3
Original line number Diff line number Diff line
@@ -140,9 +140,6 @@ struct ath_common { 
	u8 curbssid[ETH_ALEN];

	u8 bssidmask[ETH_ALEN];



	u8 tx_chainmask;

	u8 rx_chainmask;



	u32 rx_bufsize;



	u32 keymax;

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

+66 −65
Original line number Diff line number Diff line
@@ -14,70 +14,71 @@ 
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



static const u32 ar5416Modes[][6] = {

	{0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0},

	{0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0},

	{0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180},

	{0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008},

	{0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0},

	{0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab, 0x098813cf},

	{0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, 0x08f04810},

	{0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a, 0x0000320a},

	{0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303},

	{0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200},

	{0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},

	{0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001},

	{0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},

	{0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007},

	{0x00009844, 0x1372161e, 0x1372161e, 0x137216a0, 0x137216a0, 0x137216a0},

	{0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},

	{0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},

	{0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},

	{0x00009850, 0x6c48b4e0, 0x6d48b4e0, 0x6d48b0de, 0x6c48b0de, 0x6c48b0de},

	{0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e},

	{0x0000985c, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e, 0x31395d5e},

	{0x00009860, 0x00049d18, 0x00049d18, 0x00049d18, 0x00049d18, 0x00049d18},

	{0x00009864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00},

	{0x00009868, 0x409a4190, 0x409a4190, 0x409a4190, 0x409a4190, 0x409a4190},

	{0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081},

	{0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0},

	{0x00009918, 0x000001b8, 0x00000370, 0x00000268, 0x00000134, 0x00000134},

	{0x00009924, 0xd0058a0b, 0xd0058a0b, 0xd0058a0b, 0xd0058a0b, 0xd0058a0b},

	{0x00009944, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020},

	{0x00009960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80, 0x00012d80},

	{0x0000a960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80, 0x00012d80},

	{0x0000b960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80, 0x00012d80},

	{0x00009964, 0x00000000, 0x00000000, 0x00001120, 0x00001120, 0x00001120},

	{0x000099bc, 0x001a0a00, 0x001a0a00, 0x001a0a00, 0x001a0a00, 0x001a0a00},

	{0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, 0x038919be},

	{0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77},

	{0x000099c8, 0x6af6532c, 0x6af6532c, 0x6af6532c, 0x6af6532c, 0x6af6532c},

	{0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8},

	{0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384},

	{0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

	{0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

	{0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880, 0x00000880},

	{0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788, 0xd03e4788},

	{0x0000a20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120, 0x002ac120},

	{0x0000b20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120, 0x002ac120},

	{0x0000c20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120, 0x002ac120},

	{0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a},

	{0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000},

	{0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa, 0x0a1a7caa},

	{0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000, 0x18010000},

	{0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402, 0x2e032402},

	{0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06, 0x4a0a3c06},

	{0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b, 0x621a540b},

	{0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b, 0x764f6c1b},

	{0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a, 0x845b7a5a},

	{0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf, 0x950f8ccf},

	{0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f, 0xa5cf9b4f},

	{0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f, 0xbddfaf1f},

	{0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f, 0xd1ffc93f},

	{0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000, 0x00000000},

	{0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

	{0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

	{0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

static const u32 ar5416Modes[][5] = {

	/* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */

	{0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},

	{0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},

	{0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},

	{0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000},

	{0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},

	{0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab},

	{0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},

	{0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},

	{0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300},

	{0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200},

	{0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},

	{0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001},

	{0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},

	{0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007},

	{0x00009844, 0x1372161e, 0x1372161e, 0x137216a0, 0x137216a0},

	{0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68},

	{0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68},

	{0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68},

	{0x00009850, 0x6c48b4e0, 0x6d48b4e0, 0x6d48b0de, 0x6c48b0de},

	{0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e},

	{0x0000985c, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},

	{0x00009860, 0x00049d18, 0x00049d18, 0x00049d18, 0x00049d18},

	{0x00009864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00},

	{0x00009868, 0x409a4190, 0x409a4190, 0x409a4190, 0x409a4190},

	{0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081},

	{0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},

	{0x00009918, 0x000001b8, 0x00000370, 0x00000268, 0x00000134},

	{0x00009924, 0xd0058a0b, 0xd0058a0b, 0xd0058a0b, 0xd0058a0b},

	{0x00009944, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020},

	{0x00009960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80},

	{0x0000a960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80},

	{0x0000b960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80},

	{0x00009964, 0x00000000, 0x00000000, 0x00001120, 0x00001120},

	{0x000099bc, 0x001a0a00, 0x001a0a00, 0x001a0a00, 0x001a0a00},

	{0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be},

	{0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77},

	{0x000099c8, 0x6af6532c, 0x6af6532c, 0x6af6532c, 0x6af6532c},

	{0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8},

	{0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384},

	{0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

	{0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

	{0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880},

	{0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788},

	{0x0000a20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120},

	{0x0000b20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120},

	{0x0000c20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120},

	{0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a},

	{0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108},

	{0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa},

	{0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000},

	{0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402},

	{0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06},

	{0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b},

	{0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b},

	{0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a},

	{0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf},

	{0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f},

	{0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f},

	{0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f},

	{0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000},

	{0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

	{0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

	{0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

};



static const u32 ar5416Common[][2] = {
@@ -668,6 +669,6 @@ static const u32 ar5416Addac[][2] = { 
	{0x0000989c, 0x00000000},

	{0x0000989c, 0x00000000},

	{0x0000989c, 0x00000000},

	{0x000098cc, 0x00000000},

	{0x000098c4, 0x00000000},

};

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

+134 −132

File changed.

Preview size limit exceeded, changes collapsed.