Commit 0d25e8dc authored by Jean Tourrilhes's avatar Jean Tourrilhes Committed by Jeff Garzik

[PATCH] Wireless Extension dropped patchlet

	This tiny bit of the last WE-17 patch was lost between me and
you. I initially decided to wait to resubmit, but Chris Wedgwood
reported that the MadWifi driver needs it. Sorry for not having pushed
harder.
	I recreated this patch, and tested with 2.6.10-rc1, and Chris
tested it with MadWifi. Would you mind pushing that up to Linus ?

Changelog :
	o remove unneeded const
	o spelling + comments
Signed-off-by: default avatarJean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent d92539e1
...@@ -314,10 +314,10 @@ struct iw_handler_def ...@@ -314,10 +314,10 @@ struct iw_handler_def
{ {
/* Number of handlers defined (more precisely, index of the /* Number of handlers defined (more precisely, index of the
* last defined handler + 1) */ * last defined handler + 1) */
const __u16 num_standard; __u16 num_standard;
const __u16 num_private; __u16 num_private;
/* Number of private arg description */ /* Number of private arg description */
const __u16 num_private_args; __u16 num_private_args;
/* Array of handlers for standard ioctls /* Array of handlers for standard ioctls
* We will call dev->wireless_handlers->standard[ioctl - SIOCSIWNAME] * We will call dev->wireless_handlers->standard[ioctl - SIOCSIWNAME]
...@@ -335,7 +335,7 @@ struct iw_handler_def ...@@ -335,7 +335,7 @@ struct iw_handler_def
const struct iw_priv_args * private_args; const struct iw_priv_args * private_args;
/* This field will be *removed* in the next version of WE */ /* This field will be *removed* in the next version of WE */
const long spy_offset; /* DO NOT USE */ long spy_offset; /* DO NOT USE */
/* New location of get_wireless_stats, to de-bloat struct net_device. /* New location of get_wireless_stats, to de-bloat struct net_device.
* The old pointer in struct net_device will be gradually phased * The old pointer in struct net_device will be gradually phased
......
...@@ -52,7 +52,8 @@ ...@@ -52,7 +52,8 @@
* v6 - 18.06.04 - Jean II * v6 - 18.06.04 - Jean II
* o Change get_spydata() method for added safety * o Change get_spydata() method for added safety
* o Remove spy #ifdef, they are always on -> cleaner code * o Remove spy #ifdef, they are always on -> cleaner code
* o Allow any size GET request is user specifies length > max * o Allow any size GET request if user specifies length > max
* and if request has IW_DESCR_FLAG_NOMAX flag or is SIOCGIWPRIV
* o Start migrating get_wireless_stats to struct iw_handler_def * o Start migrating get_wireless_stats to struct iw_handler_def
* o Add wmb() in iw_handler_set_spy() for non-coherent archs/cpus * o Add wmb() in iw_handler_set_spy() for non-coherent archs/cpus
* Based on patch from Pavel Roskin <proski@gnu.org> : * Based on patch from Pavel Roskin <proski@gnu.org> :
...@@ -690,6 +691,10 @@ static inline int ioctl_standard_call(struct net_device * dev, ...@@ -690,6 +691,10 @@ static inline int ioctl_standard_call(struct net_device * dev,
* we can support any size GET requests. * we can support any size GET requests.
* There is still a limit : -ENOMEM. */ * There is still a limit : -ENOMEM. */
extra_size = user_length * descr->token_size; extra_size = user_length * descr->token_size;
/* Note : user_length is originally a __u16,
* and token_size is controlled by us,
* so extra_size won't get negative and
* won't overflow... */
} }
} }
...@@ -1227,7 +1232,7 @@ int iw_handler_set_spy(struct net_device * dev, ...@@ -1227,7 +1232,7 @@ int iw_handler_set_spy(struct net_device * dev,
/* We want to operate without locking, because wireless_spy_update() /* We want to operate without locking, because wireless_spy_update()
* most likely will happen in the interrupt handler, and therefore * most likely will happen in the interrupt handler, and therefore
* have it own locking constraints and needs performance. * have its own locking constraints and needs performance.
* The rtnl_lock() make sure we don't race with the other iw_handlers. * The rtnl_lock() make sure we don't race with the other iw_handlers.
* This make sure wireless_spy_update() "see" that the spy list * This make sure wireless_spy_update() "see" that the spy list
* is temporarily disabled. */ * is temporarily disabled. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment