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

Commit b0df3bd1 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream' of... 

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into tmp
parents cc3afe6f a67ab2bd

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -2655,7 +2655,6 @@ M: josejx@gentoo.org 
P:	Daniel Drake

M:	dsd@gentoo.org

W:	http://softmac.sipsolutions.net/

L:	softmac-dev@sipsolutions.net

L:	netdev@vger.kernel.org

S:	Maintained

drivers/net/wireless/airo.c

+10 −9
Original line number Diff line number Diff line
@@ -5868,7 +5868,7 @@ static int airo_set_essid(struct net_device *dev, 
		int	index = (dwrq->flags & IW_ENCODE_INDEX) - 1;



		/* Check the size of the string */

		if(dwrq->length > IW_ESSID_MAX_SIZE+1) {

		if(dwrq->length > IW_ESSID_MAX_SIZE) {

			return -E2BIG ;

		}

		/* Check if index is valid */
@@ -5880,7 +5880,7 @@ static int airo_set_essid(struct net_device *dev, 
		memset(SSID_rid.ssids[index].ssid, 0,

		       sizeof(SSID_rid.ssids[index].ssid));

		memcpy(SSID_rid.ssids[index].ssid, extra, dwrq->length);

		SSID_rid.ssids[index].len = dwrq->length - 1;

		SSID_rid.ssids[index].len = dwrq->length;

	}

	SSID_rid.len = sizeof(SSID_rid);

	/* Write it to the card */
@@ -5990,7 +5990,7 @@ static int airo_set_nick(struct net_device *dev, 
	struct airo_info *local = dev->priv;



	/* Check the size of the string */

	if(dwrq->length > 16 + 1) {

	if(dwrq->length > 16) {

		return -E2BIG;

	}

	readConfigRid(local, 1);
@@ -6015,7 +6015,7 @@ static int airo_get_nick(struct net_device *dev, 
	readConfigRid(local, 1);

	strncpy(extra, local->config.nodeName, 16);

	extra[16] = '\0';

	dwrq->length = strlen(extra) + 1;

	dwrq->length = strlen(extra);



	return 0;

}
@@ -6767,9 +6767,9 @@ static int airo_set_retry(struct net_device *dev, 
	}

	readConfigRid(local, 1);

	if(vwrq->flags & IW_RETRY_LIMIT) {

		if(vwrq->flags & IW_RETRY_MAX)

		if(vwrq->flags & IW_RETRY_LONG)

			local->config.longRetryLimit = vwrq->value;

		else if (vwrq->flags & IW_RETRY_MIN)

		else if (vwrq->flags & IW_RETRY_SHORT)

			local->config.shortRetryLimit = vwrq->value;

		else {

			/* No modifier : set both */
@@ -6805,14 +6805,14 @@ static int airo_get_retry(struct net_device *dev, 
	if((vwrq->flags & IW_RETRY_TYPE) == IW_RETRY_LIFETIME) {

		vwrq->flags = IW_RETRY_LIFETIME;

		vwrq->value = (int)local->config.txLifetime * 1024;

	} else if((vwrq->flags & IW_RETRY_MAX)) {

		vwrq->flags = IW_RETRY_LIMIT | IW_RETRY_MAX;

	} else if((vwrq->flags & IW_RETRY_LONG)) {

		vwrq->flags = IW_RETRY_LIMIT | IW_RETRY_LONG;

		vwrq->value = (int)local->config.longRetryLimit;

	} else {

		vwrq->flags = IW_RETRY_LIMIT;

		vwrq->value = (int)local->config.shortRetryLimit;

		if((int)local->config.shortRetryLimit != (int)local->config.longRetryLimit)

			vwrq->flags |= IW_RETRY_MIN;

			vwrq->flags |= IW_RETRY_SHORT;

	}



	return 0;
@@ -6990,6 +6990,7 @@ static int airo_set_power(struct net_device *dev, 
			local->config.rmode |= RXMODE_BC_MC_ADDR;

			set_bit (FLAG_COMMIT, &local->flags);

		case IW_POWER_ON:

			/* This is broken, fixme ;-) */

			break;

		default:

			return -EINVAL;

drivers/net/wireless/atmel.c

+9 −9
Original line number Diff line number Diff line
@@ -1656,13 +1656,13 @@ static int atmel_set_essid(struct net_device *dev, 
		priv->connect_to_any_BSS = 0;



		/* Check the size of the string */

		if (dwrq->length > MAX_SSID_LENGTH + 1)

		if (dwrq->length > MAX_SSID_LENGTH)

			 return -E2BIG;

		if (index != 0)

			return -EINVAL;



		memcpy(priv->new_SSID, extra, dwrq->length - 1);

		priv->new_SSID_size = dwrq->length - 1;

		memcpy(priv->new_SSID, extra, dwrq->length);

		priv->new_SSID_size = dwrq->length;

	}



	return -EINPROGRESS;
@@ -2120,9 +2120,9 @@ static int atmel_set_retry(struct net_device *dev, 
	struct atmel_private *priv = netdev_priv(dev);



	if (!vwrq->disabled && (vwrq->flags & IW_RETRY_LIMIT)) {

		if (vwrq->flags & IW_RETRY_MAX)

		if (vwrq->flags & IW_RETRY_LONG)

			priv->long_retry = vwrq->value;

		else if (vwrq->flags & IW_RETRY_MIN)

		else if (vwrq->flags & IW_RETRY_SHORT)

			priv->short_retry = vwrq->value;

		else {

			/* No modifier : set both */
@@ -2144,15 +2144,15 @@ static int atmel_get_retry(struct net_device *dev, 


	vwrq->disabled = 0;      /* Can't be disabled */



	/* Note : by default, display the min retry number */

	if (vwrq->flags & IW_RETRY_MAX) {

		vwrq->flags = IW_RETRY_LIMIT | IW_RETRY_MAX;

	/* Note : by default, display the short retry number */

	if (vwrq->flags & IW_RETRY_LONG) {

		vwrq->flags = IW_RETRY_LIMIT | IW_RETRY_LONG;

		vwrq->value = priv->long_retry;

	} else {

		vwrq->flags = IW_RETRY_LIMIT;

		vwrq->value = priv->short_retry;

		if (priv->long_retry != priv->short_retry)

			vwrq->flags |= IW_RETRY_MIN;

			vwrq->flags |= IW_RETRY_SHORT;

	}



	return 0;

drivers/net/wireless/bcm43xx/bcm43xx.h

+0 −1
Original line number Diff line number Diff line
@@ -666,7 +666,6 @@ struct bcm43xx_noise_calculation { 
};



struct bcm43xx_stats {

	u8 link_quality;

	u8 noise;

	struct iw_statistics wstats;

	/* Store the last TX/RX times here for updating the leds. */

drivers/net/wireless/bcm43xx/bcm43xx_main.c

+5 −5
Original line number Diff line number Diff line
@@ -2405,9 +2405,10 @@ static int bcm43xx_chip_init(struct bcm43xx_private *bcm) 
				   BCM43xx_UCODE_TIME) & 0x1f);



	if ( value16 > 0x128 ) {

		dprintk(KERN_ERR PFX

			"Firmware: no support for microcode rev > 0x128\n");

		err = -1;

		printk(KERN_ERR PFX

			"Firmware: no support for microcode extracted "

			"from version 4.x binary drivers.\n");

		err = -EOPNOTSUPP;

		goto err_release_fw;

	}
@@ -3169,8 +3170,7 @@ static void bcm43xx_periodic_work_handler(void *d) 
		 * be preemtible.

		 */

		mutex_lock(&bcm->mutex);

		netif_stop_queue(bcm->net_dev);

		synchronize_net();

		netif_tx_disable(bcm->net_dev);

		spin_lock_irqsave(&bcm->irq_lock, flags);

		bcm43xx_mac_suspend(bcm);

		if (bcm43xx_using_pio(bcm))