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

Commit 75a241f9 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 e18e37e5 957b0516

drivers/net/ps3_gelic_wireless.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -2101,6 +2101,9 @@ static int gelic_wl_associate_bss(struct gelic_wl_info *wl, 
	if (ret) {

	if (ret) {

		pr_debug("%s: WEP/WPA setup failed %d\n", __func__,

		pr_debug("%s: WEP/WPA setup failed %d\n", __func__,

			 ret);

			 ret);

		ret = -EPERM;

		gelic_wl_send_iwap_event(wl, NULL);

		goto out;

	}

	}





	/* start association */

	/* start association */

drivers/net/wireless/airo.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -6713,11 +6713,11 @@ static int airo_set_auth(struct net_device *dev, 
				local->config.authType = AUTH_ENCRYPT;

				local->config.authType = AUTH_ENCRYPT;

			} else

			} else

				return -EINVAL;

				return -EINVAL;

			break;





			/* Commit the changes to flags if needed */

			/* Commit the changes to flags if needed */

			if (local->config.authType != currentAuthType)

			if (local->config.authType != currentAuthType)

				set_bit (FLAG_COMMIT, &local->flags);

				set_bit (FLAG_COMMIT, &local->flags);

			break;

		}

		}





	case IW_AUTH_WPA_ENABLED:

	case IW_AUTH_WPA_ENABLED:

drivers/net/wireless/ar9170/hw.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -310,7 +310,7 @@ struct ar9170_tx_control { 




struct ar9170_rx_head {

struct ar9170_rx_head {

	u8 plcp[12];

	u8 plcp[12];

};

} __packed;





struct ar9170_rx_tail {

struct ar9170_rx_tail {

	union {

	union {
@@ -318,16 +318,16 @@ struct ar9170_rx_tail { 
			u8 rssi_ant0, rssi_ant1, rssi_ant2,

			u8 rssi_ant0, rssi_ant1, rssi_ant2,

			   rssi_ant0x, rssi_ant1x, rssi_ant2x,

			   rssi_ant0x, rssi_ant1x, rssi_ant2x,

			   rssi_combined;

			   rssi_combined;

		};

		} __packed;

		u8 rssi[7];

		u8 rssi[7];

	};

	} __packed;





	u8 evm_stream0[6], evm_stream1[6];

	u8 evm_stream0[6], evm_stream1[6];

	u8 phy_err;

	u8 phy_err;

	u8 SAidx, DAidx;

	u8 SAidx, DAidx;

	u8 error;

	u8 error;

	u8 status;

	u8 status;

};

} __packed;





#define AR9170_ENC_ALG_NONE			0x0

#define AR9170_ENC_ALG_NONE			0x0

#define AR9170_ENC_ALG_WEP64			0x1

#define AR9170_ENC_ALG_WEP64			0x1

drivers/net/wireless/ar9170/usb.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,8 @@ static struct usb_device_id ar9170_usb_ids[] = { 
	{ USB_DEVICE(0x0cf3, 0x9170) },

	{ USB_DEVICE(0x0cf3, 0x9170) },

	/* Atheros TG121N */

	/* Atheros TG121N */

	{ USB_DEVICE(0x0cf3, 0x1001) },

	{ USB_DEVICE(0x0cf3, 0x1001) },

	/* Cace Airpcap NX */

	{ USB_DEVICE(0xcace, 0x0300) },

	/* D-Link DWA 160A */

	/* D-Link DWA 160A */

	{ USB_DEVICE(0x07d1, 0x3c10) },

	{ USB_DEVICE(0x07d1, 0x3c10) },

	/* Netgear WNDA3100 */

	/* Netgear WNDA3100 */
@@ -67,6 +69,8 @@ static struct usb_device_id ar9170_usb_ids[] = { 
	{ USB_DEVICE(0x0846, 0x9001) },

	{ USB_DEVICE(0x0846, 0x9001) },

	/* Zydas ZD1221 */

	/* Zydas ZD1221 */

	{ USB_DEVICE(0x0ace, 0x1221) },

	{ USB_DEVICE(0x0ace, 0x1221) },

	/* ZyXEL NWD271N */

	{ USB_DEVICE(0x0586, 0x3417) },

	/* Z-Com UB81 BG */

	/* Z-Com UB81 BG */

	{ USB_DEVICE(0x0cde, 0x0023) },

	{ USB_DEVICE(0x0cde, 0x0023) },

	/* Z-Com UB82 ABG */

	/* Z-Com UB82 ABG */

drivers/net/wireless/at76c50x-usb.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -250,6 +250,8 @@ static struct usb_device_id dev_table[] = { 
	{ USB_DEVICE(0x03eb, 0x7617), USB_DEVICE_DATA(BOARD_505A) },

	{ USB_DEVICE(0x03eb, 0x7617), USB_DEVICE_DATA(BOARD_505A) },

	/* Siemens Gigaset USB WLAN Adapter 11 */

	/* Siemens Gigaset USB WLAN Adapter 11 */

	{ USB_DEVICE(0x1690, 0x0701), USB_DEVICE_DATA(BOARD_505A) },

	{ USB_DEVICE(0x1690, 0x0701), USB_DEVICE_DATA(BOARD_505A) },

	/* OQO Model 01+ Internal Wi-Fi */

	{ USB_DEVICE(0x1557, 0x0002), USB_DEVICE_DATA(BOARD_505A) },

	/*

	/*

	 * at76c505amx-rfmd

	 * at76c505amx-rfmd

	 */

	 */