diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 16:25:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 16:25:49 -0800 |
| commit | aca361c1a0dc0165ac3148137983cb4b1458b5c1 (patch) | |
| tree | 3527ff422fe90e97657d5996499fa4a9d30e2d5a /include/linux | |
| parent | cec6062037783a762aa5606b06b8bc5c14d9657f (diff) | |
| parent | 9b7c84899ea6bfc4f8932a83b28db313e7397bd1 (diff) | |
| download | kernel_samsung_tuna-aca361c1a0dc0165ac3148137983cb4b1458b5c1.zip kernel_samsung_tuna-aca361c1a0dc0165ac3148137983cb4b1458b5c1.tar.gz kernel_samsung_tuna-aca361c1a0dc0165ac3148137983cb4b1458b5c1.tar.bz2 | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (45 commits)
[PATCH] Restore channel setting after scan.
[PATCH] hostap: Fix memory leak on PCI probe error path
[PATCH] hostap: Remove dead code (duplicated idx != 0)
[PATCH] hostap: Fix unlikely read overrun in CIS parsing
[PATCH] hostap: Fix double free in prism2_config() error path
[PATCH] hostap: Fix ap_add_sta() return value verification
[PATCH] hostap: Fix hw reset after CMDCODE_ACCESS_WRITE timeout
[PATCH] wireless/airo: cache wireless scans
[PATCH] wireless/airo: define default MTU
[PATCH] wireless/airo: clean up printk usage to print device name
[PATCH] WE-20 for kernel 2.6.16
[PATCH] softmac: remove function_enter()
[PATCH] skge: version 1.5
[PATCH] skge: compute available ring buffers
[PATCH] skge: dont free skb until multi-part transmit complete
[PATCH] skge: multicast statistics fix
[PATCH] skge: rx_reuse called twice
[PATCH] skge: dont use dev_alloc_skb for rx buffs
[PATCH] skge: align receive buffers
[PATCH] sky2: dont need to use dev_kfree_skb_any
...
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/wireless.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/wireless.h b/include/linux/wireless.h index a555a0f..1358856 100644 --- a/include/linux/wireless.h +++ b/include/linux/wireless.h @@ -1,10 +1,10 @@ /* * This file define a set of standard wireless extensions * - * Version : 19 18.3.05 + * Version : 20 17.2.06 * * Authors : Jean Tourrilhes - HPL - <jt@hpl.hp.com> - * Copyright (c) 1997-2005 Jean Tourrilhes, All Rights Reserved. + * Copyright (c) 1997-2006 Jean Tourrilhes, All Rights Reserved. */ #ifndef _LINUX_WIRELESS_H @@ -80,7 +80,7 @@ * (there is some stuff that will be added in the future...) * I just plan to increment with each new version. */ -#define WIRELESS_EXT 19 +#define WIRELESS_EXT 20 /* * Changes : @@ -204,6 +204,10 @@ * - Add IW_QUAL_ALL_UPDATED and IW_QUAL_ALL_INVALID macros * - Add explicit flag to tell stats are in dBm : IW_QUAL_DBM * - Add IW_IOCTL_IDX() and IW_EVENT_IDX() macros + * + * V19 to V20 + * ---------- + * - RtNetlink requests support (SET/GET) */ /**************************** CONSTANTS ****************************/ |