diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-21 13:40:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-21 13:40:29 -0700 |
| commit | dcf234f3b0cbc4d2b73f5ee02405b117c5d77fbd (patch) | |
| tree | 1c2c3e2dbfcc709d6b5187ec311706aab76025c3 /drivers/net/wireless/zd1211rw | |
| parent | 946b92437e550d6ed80213bf54a1f383e141aede (diff) | |
| parent | 5826cade4341a6298eb10d476dccc5f403ca7ad8 (diff) | |
| download | kernel_goldelico_gta04-dcf234f3b0cbc4d2b73f5ee02405b117c5d77fbd.zip kernel_goldelico_gta04-dcf234f3b0cbc4d2b73f5ee02405b117c5d77fbd.tar.gz kernel_goldelico_gta04-dcf234f3b0cbc4d2b73f5ee02405b117c5d77fbd.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: (22 commits)
[PATCH] ibmveth: Fix index increment calculation
[PATCH] Fix timer race
[PATCH] Remove useless comment from sb1250
[PATCH] ucc_geth: changes to ucc_geth driver as a result of qe_lib changes and bugfixes
[PATCH] sky2: 88E803X transmit lockup
[PATCH] e1000: Reset all functions after a PCI error
[PATCH] WAN/pc300: handle, propagate minor errors
[PATCH] Update smc91x driver with ARM Versatile board info
[PATCH] wireless: WE-20 compatibility for ESSID and NICKN ioctls
[PATCH] zd1211rw: fix build-break caused by association race fix
[PATCH] sotftmac: fix a slab corruption in WEP restricted key association
[PATCH] airo: check if need to freeze
[PATCH] wireless: More WE-21 potential overflows...
[PATCH] zd1201: Possible NULL dereference
[PATCH] orinoco: fix WE-21 buffer overflow
[PATCH] airo.c: check returned values
[PATCH] bcm43xx-softmac: Fix system hang for x86-64 with >1GB RAM
[PATCH] bcm43xx-softmac: check returned value from pci_enable_device
[PATCH] softmac: Fix WX and association related races
[PATCH] bcm43xx: fix race condition in periodic work handler
...
Diffstat (limited to 'drivers/net/wireless/zd1211rw')
| -rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index 2d12837..a7d29bd 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c @@ -1099,7 +1099,7 @@ static void link_led_handler(void *p) int r; spin_lock_irq(&mac->lock); - is_associated = sm->associated != 0; + is_associated = sm->associnfo.associated != 0; spin_unlock_irq(&mac->lock); r = zd_chip_control_leds(chip, |