diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 21:02:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 21:02:35 -0400 |
| commit | 334d094504c2fe1c44211ecb49146ae6bca8c321 (patch) | |
| tree | d3c0f68e4b9f8e3d2ccc39e7dfe5de0534a5fad9 /include/linux/wireless.h | |
| parent | d1a4be630fb068f251d64b62919f143c49ca8057 (diff) | |
| parent | d1643d24c61b725bef399cc1cf2944b4c9c23177 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26: (1090 commits)
[NET]: Fix and allocate less memory for ->priv'less netdevices
[IPV6]: Fix dangling references on error in fib6_add().
[NETLABEL]: Fix NULL deref in netlbl_unlabel_staticlist_gen() if ifindex not found
[PKT_SCHED]: Fix datalen check in tcf_simp_init().
[INET]: Uninline the __inet_inherit_port call.
[INET]: Drop the inet_inherit_port() call.
SCTP: Initialize partial_bytes_acked to 0, when all of the data is acked.
[netdrvr] forcedeth: internal simplifications; changelog removal
phylib: factor out get_phy_id from within get_phy_device
PHY: add BCM5464 support to broadcom PHY driver
cxgb3: Fix __must_check warning with dev_dbg.
tc35815: Statistics cleanup
natsemi: fix MMIO for PPC 44x platforms
[TIPC]: Cleanup of TIPC reference table code
[TIPC]: Optimized initialization of TIPC reference table
[TIPC]: Remove inlining of reference table locking routines
e1000: convert uint16_t style integers to u16
ixgb: convert uint16_t style integers to u16
sb1000.c: make const arrays static
sb1000.c: stop inlining largish static functions
...
Diffstat (limited to 'include/linux/wireless.h')
| -rw-r--r-- | include/linux/wireless.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/wireless.h b/include/linux/wireless.h index 3160dfed73ca..2864b1699ecc 100644 --- a/include/linux/wireless.h +++ b/include/linux/wireless.h | |||
| @@ -455,6 +455,7 @@ | |||
| 455 | #define IW_MODE_REPEAT 4 /* Wireless Repeater (forwarder) */ | 455 | #define IW_MODE_REPEAT 4 /* Wireless Repeater (forwarder) */ |
| 456 | #define IW_MODE_SECOND 5 /* Secondary master/repeater (backup) */ | 456 | #define IW_MODE_SECOND 5 /* Secondary master/repeater (backup) */ |
| 457 | #define IW_MODE_MONITOR 6 /* Passive monitor (listen only) */ | 457 | #define IW_MODE_MONITOR 6 /* Passive monitor (listen only) */ |
| 458 | #define IW_MODE_MESH 7 /* Mesh (IEEE 802.11s) network */ | ||
| 458 | 459 | ||
| 459 | /* Statistics flags (bitmask in updated) */ | 460 | /* Statistics flags (bitmask in updated) */ |
| 460 | #define IW_QUAL_QUAL_UPDATED 0x01 /* Value was updated since last read */ | 461 | #define IW_QUAL_QUAL_UPDATED 0x01 /* Value was updated since last read */ |