Commit a9c87a10 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 c14bac62 c2805fbb

drivers/net/wireless/bcm43xx/bcm43xx_phy.c

+2 −2
Original line number Diff line number Diff line
@@ -757,7 +757,7 @@ static void bcm43xx_phy_initb5(struct bcm43xx_private *bcm) 
	if (radio->version == 0x2050)

		bcm43xx_phy_write(bcm, 0x0038, 0x0667);



	if (phy->type == BCM43xx_PHYTYPE_G) {

	if (phy->connected) {

		if (radio->version == 0x2050) {

			bcm43xx_radio_write16(bcm, 0x007A,

					      bcm43xx_radio_read16(bcm, 0x007A)
@@ -1192,7 +1192,7 @@ static void bcm43xx_phy_initg(struct bcm43xx_private *bcm) 
		bcm43xx_phy_write(bcm, 0x0811, 0x0400);

		bcm43xx_phy_write(bcm, 0x0015, 0x00C0);

	}

	if (phy->connected) {

	if (phy->rev >= 2 && phy->connected) {

		tmp = bcm43xx_phy_read(bcm, 0x0400) & 0xFF;

		if (tmp < 6) {

			bcm43xx_phy_write(bcm, 0x04C2, 0x1816);

drivers/net/wireless/bcm43xx/bcm43xx_radio.c

+6 −6
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ static void bcm43xx_calc_nrssi_offset(struct bcm43xx_private *bcm) 
		bcm43xx_phy_write(bcm, 0x005A, 0x0480);

		bcm43xx_phy_write(bcm, 0x0059, 0x0810);

		bcm43xx_phy_write(bcm, 0x0058, 0x000D);

		if (phy->rev == 0) {

		if (phy->analog == 0) {

			bcm43xx_phy_write(bcm, 0x0003, 0x0122);

		} else {

			bcm43xx_phy_write(bcm, 0x000A,
@@ -570,9 +570,9 @@ void bcm43xx_calc_nrssi_slope(struct bcm43xx_private *bcm) 
		nrssi0 = (s16)bcm43xx_phy_read(bcm, 0x0027);

		bcm43xx_radio_write16(bcm, 0x007A,

				      bcm43xx_radio_read16(bcm, 0x007A) & 0x007F);

		if (phy->rev >= 2) {

		if (phy->analog >= 2) {

			bcm43xx_write16(bcm, 0x03E6, 0x0040);

		} else if (phy->rev == 0) {

		} else if (phy->analog == 0) {

			bcm43xx_write16(bcm, 0x03E6, 0x0122);

		} else {

			bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
@@ -596,7 +596,7 @@ void bcm43xx_calc_nrssi_slope(struct bcm43xx_private *bcm) 
		bcm43xx_phy_write(bcm, 0x0015, backup[5]);

		bcm43xx_phy_write(bcm, 0x002A, backup[6]);

		bcm43xx_synth_pu_workaround(bcm, radio->channel);

		if (phy->rev != 0)

		if (phy->analog != 0)

			bcm43xx_write16(bcm, 0x03F4, backup[13]);



		bcm43xx_phy_write(bcm, 0x0020, backup[7]);
@@ -692,7 +692,7 @@ void bcm43xx_calc_nrssi_slope(struct bcm43xx_private *bcm) 


		bcm43xx_radio_write16(bcm, 0x007A,

				      bcm43xx_radio_read16(bcm, 0x007A) & 0x007F);

		if (phy->rev >= 2) {

		if (phy->analog >= 2) {

			bcm43xx_phy_write(bcm, 0x0003,

					  (bcm43xx_phy_read(bcm, 0x0003)

					   & 0xFF9F) | 0x0040);
@@ -1579,7 +1579,7 @@ void bcm43xx_radio_set_tx_iq(struct bcm43xx_private *bcm) 
	

	for (i = 0; i < 5; i++) {

		for (j = 0; j < 5; j++) {

			if (tmp == (data_high[i] << 4 | data_low[j])) {

			if (tmp == (data_high[i] | data_low[j])) {

				bcm43xx_phy_write(bcm, 0x0069, (i - j) << 8 | 0x00C0);

				return;

			}

fs/compat_ioctl.c

+9 −0
Original line number Diff line number Diff line
@@ -2553,11 +2553,15 @@ HANDLE_IOCTL(I2C_RDWR, do_i2c_rdwr_ioctl) 
HANDLE_IOCTL(I2C_SMBUS, do_i2c_smbus_ioctl)

/* wireless */

HANDLE_IOCTL(SIOCGIWRANGE, do_wireless_ioctl)

HANDLE_IOCTL(SIOCGIWPRIV, do_wireless_ioctl)

HANDLE_IOCTL(SIOCGIWSTATS, do_wireless_ioctl)

HANDLE_IOCTL(SIOCSIWSPY, do_wireless_ioctl)

HANDLE_IOCTL(SIOCGIWSPY, do_wireless_ioctl)

HANDLE_IOCTL(SIOCSIWTHRSPY, do_wireless_ioctl)

HANDLE_IOCTL(SIOCGIWTHRSPY, do_wireless_ioctl)

HANDLE_IOCTL(SIOCSIWMLME, do_wireless_ioctl)

HANDLE_IOCTL(SIOCGIWAPLIST, do_wireless_ioctl)

HANDLE_IOCTL(SIOCSIWSCAN, do_wireless_ioctl)

HANDLE_IOCTL(SIOCGIWSCAN, do_wireless_ioctl)

HANDLE_IOCTL(SIOCSIWESSID, do_wireless_ioctl)

HANDLE_IOCTL(SIOCGIWESSID, do_wireless_ioctl)
@@ -2565,6 +2569,11 @@ HANDLE_IOCTL(SIOCSIWNICKN, do_wireless_ioctl) 
HANDLE_IOCTL(SIOCGIWNICKN, do_wireless_ioctl)

HANDLE_IOCTL(SIOCSIWENCODE, do_wireless_ioctl)

HANDLE_IOCTL(SIOCGIWENCODE, do_wireless_ioctl)

HANDLE_IOCTL(SIOCSIWGENIE, do_wireless_ioctl)

HANDLE_IOCTL(SIOCGIWGENIE, do_wireless_ioctl)

HANDLE_IOCTL(SIOCSIWENCODEEXT, do_wireless_ioctl)

HANDLE_IOCTL(SIOCGIWENCODEEXT, do_wireless_ioctl)

HANDLE_IOCTL(SIOCSIWPMKSA, do_wireless_ioctl)

HANDLE_IOCTL(SIOCSIFBR, old_bridge_ioctl)

HANDLE_IOCTL(SIOCGIFBR, old_bridge_ioctl)

HANDLE_IOCTL(RTC_IRQP_READ32, rtc_ioctl)

include/linux/wireless.h

+18 −3
Original line number Diff line number Diff line 
/*

 * This file define a set of standard wireless extensions

 *

 * Version :	21	14.3.06

 * Version :	22	16.3.07

 *

 * Authors :	Jean Tourrilhes - HPL - <jt@hpl.hp.com>

 * Copyright (c) 1997-2006 Jean Tourrilhes, All Rights Reserved.

 * Copyright (c) 1997-2007 Jean Tourrilhes, All Rights Reserved.

 */



#ifndef _LINUX_WIRELESS_H
@@ -85,7 +85,7 @@ 
 * (there is some stuff that will be added in the future...)

 * I just plan to increment with each new version.

 */

#define WIRELESS_EXT	21

#define WIRELESS_EXT	22



/*

 * Changes :
@@ -221,6 +221,10 @@ 
 *	- Add IW_RETRY_SHORT/IW_RETRY_LONG retry modifiers

 *	- Power/Retry relative values no longer * 100000

 *	- Add explicit flag to tell stats are in 802.11k RCPI : IW_QUAL_RCPI

 *

 * V21 to V22

 * ----------

 *	- Prevent leaking of kernel space in stream on 64 bits.

 */



/**************************** CONSTANTS ****************************/
@@ -1085,4 +1089,15 @@ struct iw_event 
#define IW_EV_POINT_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_point) - \

			 IW_EV_POINT_OFF)



/* Size of the Event prefix when packed in stream */

#define IW_EV_LCP_PK_LEN	(4)

/* Size of the various events when packed in stream */

#define IW_EV_CHAR_PK_LEN	(IW_EV_LCP_PK_LEN + IFNAMSIZ)

#define IW_EV_UINT_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(__u32))

#define IW_EV_FREQ_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_freq))

#define IW_EV_PARAM_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_param))

#define IW_EV_ADDR_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct sockaddr))

#define IW_EV_QUAL_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_quality))

#define IW_EV_POINT_PK_LEN	(IW_EV_LCP_LEN + 4)



#endif	/* _LINUX_WIRELESS_H */

include/net/iw_handler.h

+21 −9
Original line number Diff line number Diff line 
/*

 * This file define the new driver API for Wireless Extensions

 *

 * Version :	7	18.3.05

 * Version :	8	16.3.07

 *

 * Authors :	Jean Tourrilhes - HPL - <jt@hpl.hp.com>

 * Copyright (c) 2001-2006 Jean Tourrilhes, All Rights Reserved.

 * Copyright (c) 2001-2007 Jean Tourrilhes, All Rights Reserved.

 */



#ifndef _IW_HANDLER_H
@@ -207,7 +207,7 @@ 
 * will be needed...

 * I just plan to increment with each new version.

 */

#define IW_HANDLER_VERSION	7

#define IW_HANDLER_VERSION	8



/*

 * Changes :
@@ -239,6 +239,10 @@ 
 *	- Remove (struct iw_point *)->pointer from events and streams

 *	- Remove spy_offset from struct iw_handler_def

 *	- Add "check" version of event macros for ieee802.11 stack

 *

 * V7 to V8

 * ----------

 *	- Prevent leaking of kernel space in stream on 64 bits.

 */



/**************************** CONSTANTS ****************************/
@@ -500,7 +504,11 @@ iwe_stream_add_event(char * stream, /* Stream of events */ 
	/* Check if it's possible */

	if(likely((stream + event_len) < ends)) {

		iwe->len = event_len;

		memcpy(stream, (char *) iwe, event_len);

		/* Beware of alignement issues on 64 bits */

		memcpy(stream, (char *) iwe, IW_EV_LCP_PK_LEN);

		memcpy(stream + IW_EV_LCP_LEN,

		       ((char *) iwe) + IW_EV_LCP_LEN,

		       event_len - IW_EV_LCP_LEN);

		stream += event_len;

	}

	return stream;
@@ -521,10 +529,10 @@ iwe_stream_add_point(char * stream, /* Stream of events */ 
	/* Check if it's possible */

	if(likely((stream + event_len) < ends)) {

		iwe->len = event_len;

		memcpy(stream, (char *) iwe, IW_EV_LCP_LEN);

		memcpy(stream, (char *) iwe, IW_EV_LCP_PK_LEN);

		memcpy(stream + IW_EV_LCP_LEN,

		       ((char *) iwe) + IW_EV_LCP_LEN + IW_EV_POINT_OFF,

		       IW_EV_POINT_LEN - IW_EV_LCP_LEN);

		       IW_EV_POINT_PK_LEN - IW_EV_LCP_PK_LEN);

		memcpy(stream + IW_EV_POINT_LEN, extra, iwe->u.data.length);

		stream += event_len;

	}
@@ -574,7 +582,11 @@ iwe_stream_check_add_event(char * stream, /* Stream of events */ 
	/* Check if it's possible, set error if not */

	if(likely((stream + event_len) < ends)) {

		iwe->len = event_len;

		memcpy(stream, (char *) iwe, event_len);

		/* Beware of alignement issues on 64 bits */

		memcpy(stream, (char *) iwe, IW_EV_LCP_PK_LEN);

		memcpy(stream + IW_EV_LCP_LEN,

		       ((char *) iwe) + IW_EV_LCP_LEN,

		       event_len - IW_EV_LCP_LEN);

		stream += event_len;

	} else

		*perr = -E2BIG;
@@ -598,10 +610,10 @@ iwe_stream_check_add_point(char * stream, /* Stream of events */ 
	/* Check if it's possible */

	if(likely((stream + event_len) < ends)) {

		iwe->len = event_len;

		memcpy(stream, (char *) iwe, IW_EV_LCP_LEN);

		memcpy(stream, (char *) iwe, IW_EV_LCP_PK_LEN);

		memcpy(stream + IW_EV_LCP_LEN,

		       ((char *) iwe) + IW_EV_LCP_LEN + IW_EV_POINT_OFF,

		       IW_EV_POINT_LEN - IW_EV_LCP_LEN);

		       IW_EV_POINT_PK_LEN - IW_EV_LCP_PK_LEN);

		memcpy(stream + IW_EV_POINT_LEN, extra, iwe->u.data.length);

		stream += event_len;

	} else