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

Commit 5b84b6fa authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' of... 

Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
parents e3f2ddea ca0084fa

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ config AIRO_CS 
	tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"

	depends on NET_RADIO && PCMCIA && (BROKEN || !M32R)

	select CRYPTO

	select CRYPTO_AES

	---help---

	  This is the standard Linux driver to support Cisco/Aironet PCMCIA

	  802.11 wireless cards.  This driver is the same as the Aironet

drivers/net/wireless/bcm43xx/bcm43xx_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3701,7 +3701,7 @@ static void bcm43xx_ieee80211_set_security(struct net_device *net_dev, 
	}

	if (sec->flags & SEC_AUTH_MODE) {

		secinfo->auth_mode = sec->auth_mode;

		dprintk(", .auth_mode = %d\n", sec->auth_mode);

		dprintk(", .auth_mode = %d", sec->auth_mode);

	}

	dprintk("\n");

	if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED &&

drivers/net/wireless/orinoco.c

+2 −2
Original line number Diff line number Diff line
@@ -2875,7 +2875,7 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev, 
	if (orinoco_lock(priv, &flags) != 0)

		return -EBUSY;



	if (erq->pointer) {

	if (erq->length > 0) {

		if ((index < 0) || (index >= ORINOCO_MAX_KEYS))

			index = priv->tx_key;
@@ -2918,7 +2918,7 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev, 
	if (erq->flags & IW_ENCODE_RESTRICTED)

		restricted = 1;



	if (erq->pointer) {

	if (erq->pointer && erq->length > 0) {

		priv->keys[index].len = cpu_to_le16(xlen);

		memset(priv->keys[index].data, 0,

		       sizeof(priv->keys[index].data));

drivers/net/wireless/zd1201.c

+2 −0
Original line number Diff line number Diff line
@@ -1820,6 +1820,8 @@ static int zd1201_probe(struct usb_interface *interface, 
	    zd->dev->name);



	usb_set_intfdata(interface, zd);

	zd1201_enable(zd);	/* zd1201 likes to startup enabled, */

	zd1201_disable(zd);	/* interfering with all the wifis in range */

	return 0;



err_net:

net/ieee80211/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ config IEEE80211_CRYPT_TKIP 
	depends on IEEE80211 && NET_RADIO

	select CRYPTO

	select CRYPTO_MICHAEL_MIC

	select CRC32

	---help---

	Include software based cipher suites in support of IEEE 802.11i

	(aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with TKIP enabled