diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-09 10:18:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-09 10:18:35 -0700 |
| commit | 3cd73eedde34c5fd88d62d8523c4260970fdc6fb (patch) | |
| tree | 8aa8915ae6befb482a649365c32d7e5526d9755d /include/net/ieee80211softmac.h | |
| parent | c51e078f82096a7d35ac8ec2416272e843a0e1c4 (diff) | |
| parent | 23aee82e75c1ced9492cbff6090b8e213d95945e (diff) | |
| download | linux-3cd73eedde34c5fd88d62d8523c4260970fdc6fb.tar.bz2 | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6
* 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6:
[PATCH] bcm43xx: Fix access to non-existent PHY registers
[PATCH] bcm43xx: Fix array overrun in bcm43xx_geo_init
[PATCH] bcm43xx: check for valid MAC address in SPROM
[PATCH] ieee80211: Fix A band channel count (resent)
[PATCH] bcm43xx: fix iwmode crash when down
[PATCH] softmac: make non-operational after being stopped
[PATCH] softmac: don't reassociate if user asked for deauthentication
spidernet: enable support for bcm5461 ethernet phy
spidernet: introduce new setting
Fix RTL8019AS init for Toshiba RBTX49xx boards
au1000_eth.c: use ether_crc() from <linux/crc32.h>
sky2: version 1.3
Add more support for the Yukon Ultra chip found in dual core centino laptops.
sky2: synchronize irq on remove
sky2: dont write status ring
sky2: edge triggered workaround enhancement
sky2: use mask instead of modulo operation
sky2: tx ring index mask fix
sky2: status irq hang fix
sky2: backout NAPI reschedule
Diffstat (limited to 'include/net/ieee80211softmac.h')
| -rw-r--r-- | include/net/ieee80211softmac.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h index b1ebfbae397f..052ed596a4e4 100644 --- a/include/net/ieee80211softmac.h +++ b/include/net/ieee80211softmac.h @@ -204,7 +204,8 @@ struct ieee80211softmac_device { /* couple of flags */ u8 scanning:1, /* protects scanning from being done multiple times at once */ - associated:1; + associated:1, + running:1; struct ieee80211softmac_scaninfo *scaninfo; struct ieee80211softmac_assoc_info associnfo; |