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

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

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

parents ec80bfcb 3d7dc7e8

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

+1 −0
Original line number Diff line number Diff line
@@ -2546,6 +2546,7 @@ static struct { 
	{ AR_SREV_VERSION_9287,         "9287" },

	{ AR_SREV_VERSION_9271,         "9271" },

	{ AR_SREV_VERSION_9300,         "9300" },

	{ AR_SREV_VERSION_9485,         "9485" },

};



/* For devices with external radios */

drivers/net/wireless/b43/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -1536,7 +1536,7 @@ static void dma_rx(struct b43_dmaring *ring, int *slot) 
		dmaaddr = meta->dmaaddr;

		goto drop_recycle_buffer;

	}

	if (unlikely(len > ring->rx_buffersize)) {

	if (unlikely(len + ring->frameoffset > ring->rx_buffersize)) {

		/* The data did not fit into one descriptor buffer

		 * and is split over multiple buffers.

		 * This should never happen, as we try to allocate buffers

drivers/net/wireless/b43/dma.h

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ struct b43_dmadesc_generic { 
/* DMA engine tuning knobs */

#define B43_TXRING_SLOTS		256

#define B43_RXRING_SLOTS		64

#define B43_DMA0_RX_BUFFERSIZE		IEEE80211_MAX_FRAME_LEN

#define B43_DMA0_RX_BUFFERSIZE		(B43_DMA0_RX_FRAMEOFFSET + IEEE80211_MAX_FRAME_LEN)



/* Pointer poison */

#define B43_DMA_PTR_POISON		((void *)ERR_PTR(-ENOMEM))

drivers/net/wireless/iwlwifi/iwl-eeprom.h

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ struct iwl_eeprom_enhanced_txpwr { 


/* 6x00 Specific */

#define EEPROM_6000_TX_POWER_VERSION    (4)

#define EEPROM_6000_EEPROM_VERSION	(0x434)

#define EEPROM_6000_EEPROM_VERSION	(0x423)



/* 6x50 Specific */

#define EEPROM_6050_TX_POWER_VERSION    (4)

drivers/net/wireless/p54/p54usb.c

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ static struct usb_device_id p54u_table[] __devinitdata = { 
	{USB_DEVICE(0x0846, 0x4210)},	/* Netgear WG121 the second ? */

	{USB_DEVICE(0x0846, 0x4220)},	/* Netgear WG111 */

	{USB_DEVICE(0x09aa, 0x1000)},	/* Spinnaker Proto board */

	{USB_DEVICE(0x0bf8, 0x1007)},	/* Fujitsu E-5400 USB */

	{USB_DEVICE(0x0cde, 0x0006)},	/* Medion 40900, Roper Europe */

	{USB_DEVICE(0x0db0, 0x6826)},	/* MSI UB54G (MS-6826) */

	{USB_DEVICE(0x107b, 0x55f2)},	/* Gateway WGU-210 (Gemtek) */
@@ -68,6 +69,7 @@ static struct usb_device_id p54u_table[] __devinitdata = { 
	{USB_DEVICE(0x1915, 0x2235)},	/* Linksys WUSB54G Portable OEM */

	{USB_DEVICE(0x2001, 0x3701)},	/* DLink DWL-G120 Spinnaker */

	{USB_DEVICE(0x2001, 0x3703)},	/* DLink DWL-G122 */

	{USB_DEVICE(0x2001, 0x3762)},	/* Conceptronic C54U */

	{USB_DEVICE(0x5041, 0x2234)},	/* Linksys WUSB54G */

	{USB_DEVICE(0x5041, 0x2235)},	/* Linksys WUSB54G Portable */