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

Commit 6ea25a6c 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 0a5f3846 2b799a6b

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

+5 −4
Original line number Diff line number Diff line
@@ -219,8 +219,9 @@ static int __hif_usb_tx(struct hif_device_usb *hif_dev) 
	struct tx_buf *tx_buf = NULL;

	struct sk_buff *nskb = NULL;

	int ret = 0, i;

	u16 *hdr, tx_skb_cnt = 0;

	u16 tx_skb_cnt = 0;

	u8 *buf;

	__le16 *hdr;



	if (hif_dev->tx.tx_skb_cnt == 0)

		return 0;
@@ -245,9 +246,9 @@ static int __hif_usb_tx(struct hif_device_usb *hif_dev) 


		buf = tx_buf->buf;

		buf += tx_buf->offset;

		hdr = (u16 *)buf;

		*hdr++ = nskb->len;

		*hdr++ = ATH_USB_TX_STREAM_MODE_TAG;

		hdr = (__le16 *)buf;

		*hdr++ = cpu_to_le16(nskb->len);

		*hdr++ = cpu_to_le16(ATH_USB_TX_STREAM_MODE_TAG);

		buf += 4;

		memcpy(buf, nskb->data, nskb->len);

		tx_buf->len = nskb->len + 4;

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

+3 −2
Original line number Diff line number Diff line
@@ -885,7 +885,7 @@ void ath9k_hw_set_interrupts(struct ath_hw *ah, enum ath9k_int ints) 
	struct ath_common *common = ath9k_hw_common(ah);



	if (!(ints & ATH9K_INT_GLOBAL))

		ath9k_hw_enable_interrupts(ah);

		ath9k_hw_disable_interrupts(ah);



	ath_dbg(common, ATH_DBG_INTERRUPT, "0x%x => 0x%x\n", omask, ints);
@@ -963,6 +963,7 @@ void ath9k_hw_set_interrupts(struct ath_hw *ah, enum ath9k_int ints) 
			REG_CLR_BIT(ah, AR_IMR_S5, AR_IMR_S5_TIM_TIMER);

	}



	if (ints & ATH9K_INT_GLOBAL)

		ath9k_hw_enable_interrupts(ah);



	return;

drivers/net/wireless/ath/carl9170/usb.c

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ static struct usb_device_id carl9170_usb_ids[] = { 
	{ USB_DEVICE(0x057c, 0x8402) },

	/* Qwest/Actiontec 802AIN Wireless N USB Network Adapter */

	{ USB_DEVICE(0x1668, 0x1200) },

	/* Airlive X.USB a/b/g/n */

	{ USB_DEVICE(0x1b75, 0x9170) },



	/* terminate */

	{}

drivers/net/wireless/iwlwifi/iwl-5000.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
#include "iwl-agn-debugfs.h"



/* Highest firmware API version supported */

#define IWL5000_UCODE_API_MAX 2

#define IWL5000_UCODE_API_MAX 5

#define IWL5150_UCODE_API_MAX 2



/* Lowest firmware API version supported */

drivers/net/wireless/p54/p54usb.c

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ static struct usb_device_id p54u_table[] __devinitdata = { 
	{USB_DEVICE(0x1413, 0x5400)},   /* Telsey 802.11g USB2.0 Adapter */

	{USB_DEVICE(0x1435, 0x0427)},	/* Inventel UR054G */

	{USB_DEVICE(0x1668, 0x1050)},	/* Actiontec 802UIG-1 */

	{USB_DEVICE(0x1740, 0x1000)},	/* Senao NUB-350 */

	{USB_DEVICE(0x2001, 0x3704)},	/* DLink DWL-G122 rev A2 */

	{USB_DEVICE(0x2001, 0x3705)},	/* D-Link DWL-G120 rev C1 */

	{USB_DEVICE(0x413c, 0x5513)},	/* Dell WLA3310 USB Wireless Adapter */