d22b0022e7
This patch fixes the lockdep warning shown below, and also initializes the starting sequence number when starting a TX aggregation session. ============================================= [ INFO: possible recursive locking detected ] 2.6.29-rc2-wl #21 --------------------------------------------- swapper/0 is trying to acquire lock: (_xmit_IEEE80211#2){-+..}, at: [<ffffffff80456d71>] __qdisc_run+0x221/0x290 but task is already holding lock: (_xmit_IEEE80211#2){-+..}, at: [<ffffffff80456d71>] __qdisc_run+0x221/0x290 other info that might help us debug this: 7 locks held by swapper/0: #0: (rcu_read_lock){..--}, at: [<ffffffff80442a63>] dev_queue_xmit+0x53/0x620 #1: (_xmit_ETHER#2){-+..}, at: [<ffffffff80456d71>] __qdisc_run+0x221/0x290 #2: (rcu_read_lock){..--}, at: [<ffffffff80442a63>] dev_queue_xmit+0x53/0x620 #3: (_xmit_IEEE80211#2){-+..}, at: [<ffffffff80456d71>] __qdisc_run+0x221/0x290 #4: (rcu_read_lock){..--}, at: [<ffffffffa0154919>] ieee80211_master_start_xmit+0x219/0x6c0 [mac80211] #5: (rcu_read_lock){..--}, at: [<ffffffffa01427c6>] ieee80211_start_tx_ba_session+0x66/0x4e0 [mac80211] #6: (rcu_read_lock){..--}, at: [<ffffffff80442a63>] dev_queue_xmit+0x53/0x620 stack backtrace: Pid: 0, comm: swapper Not tainted 2.6.29-rc2-wl #21 Call Trace: <IRQ> [<ffffffff8026c329>] __lock_acquire+0x1be9/0x1c40 [<ffffffff80442af1>] dev_queue_xmit+0xe1/0x620 [<ffffffff8026a8cc>] __lock_acquire+0x18c/0x1c40 [<ffffffff8026c3d5>] lock_acquire+0x55/0x70 [<ffffffff80456d71>] __qdisc_run+0x221/0x290 [<ffffffff804dbeb9>] _spin_lock+0x39/0x50 [<ffffffff80456d71>] __qdisc_run+0x221/0x290 [<ffffffff804dbd2f>] _spin_unlock+0x1f/0x50 [<ffffffff80456d71>] __qdisc_run+0x221/0x290 [<ffffffff80442d18>] dev_queue_xmit+0x308/0x620 [<ffffffff80442a63>] dev_queue_xmit+0x53/0x620 [<ffffffffa0142a63>] ieee80211_start_tx_ba_session+0x303/0x4e0 [mac80211] [<ffffffffa01427c6>] ieee80211_start_tx_ba_session+0x66/0x4e0 [mac80211] [<ffffffffa0149dae>] rate_control_get_rate+0xae/0xc0 [mac80211] [<ffffffffa01526b5>] invoke_tx_handlers+0x655/0x1000 [mac80211] [<ffffffff802699fd>] mark_held_locks+0x4d/0x90 [<ffffffff804dbcf5>] _spin_unlock_irqrestore+0x65/0x80 [<ffffffffa0151aaa>] __ieee80211_tx_prepare+0x16a/0x310 [mac80211] [<ffffffffa0151adc>] __ieee80211_tx_prepare+0x19c/0x310 [mac80211] [<ffffffff80439cc2>] pskb_expand_head+0x112/0x190 [<ffffffffa0154986>] ieee80211_master_start_xmit+0x286/0x6c0 [mac80211] [<ffffffffa0154919>] ieee80211_master_start_xmit+0x219/0x6c0 [mac80211] [<ffffffff8026a8cc>] __lock_acquire+0x18c/0x1c40 [<ffffffff80456d8e>] __qdisc_run+0x23e/0x290 [<ffffffff80442d18>] dev_queue_xmit+0x308/0x620 [<ffffffff80442a63>] dev_queue_xmit+0x53/0x620 [<ffffffffa0154221>] ieee80211_subif_start_xmit+0x4a1/0x980 [mac80211] [<ffffffffa0153f18>] ieee80211_subif_start_xmit+0x198/0x980 [mac80211] [<ffffffff80456d8e>] __qdisc_run+0x23e/0x290 [<ffffffff80442d18>] dev_queue_xmit+0x308/0x620 [<ffffffff80442a63>] dev_queue_xmit+0x53/0x620 [<ffffffffa028ecfd>] ip6_output+0x62d/0x1230 [ipv6] [<ffffffff8024ca00>] __mod_timer+0xb0/0xd0 [<ffffffffa02ad25a>] mld_sendpack+0x3fa/0x4a0 [ipv6] [<ffffffffa02ace60>] mld_sendpack+0x0/0x4a0 [ipv6] [<ffffffffa02adf90>] mld_ifc_timer_expire+0x0/0x340 [ipv6] [<ffffffffa02ae219>] mld_ifc_timer_expire+0x289/0x340 [ipv6] [<ffffffffa02adf90>] mld_ifc_timer_expire+0x0/0x340 [ipv6] [<ffffffff8024c097>] run_timer_softirq+0x147/0x220 [<ffffffff802473fb>] __do_softirq+0x9b/0x180 [<ffffffff80265516>] tick_dev_program_event+0x36/0xb0 [<ffffffff8020d77c>] call_softirq+0x1c/0x30 [<ffffffff8020f2c5>] do_softirq+0x65/0xb0 [<ffffffff80246ebd>] irq_exit+0x9d/0xc0 [<ffffffff80221db6>] smp_apic_timer_interrupt+0x86/0xd0 [<ffffffff8020d1b3>] apic_timer_interrupt+0x13/0x20 Signed-off-by: Sujith <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> |
||
---|---|---|
.. | ||
ath5k | ||
ath9k | ||
b43 | ||
b43legacy | ||
hostap | ||
ipw2x00 | ||
iwlwifi | ||
libertas | ||
libertas_tf | ||
orinoco | ||
p54 | ||
prism54 | ||
rt2x00 | ||
rtl818x | ||
zd1211rw | ||
adm8211.c | ||
adm8211.h | ||
airo.c | ||
airo.h | ||
airo_cs.c | ||
arlan-main.c | ||
arlan-proc.c | ||
arlan.h | ||
atmel.c | ||
atmel.h | ||
atmel_cs.c | ||
atmel_pci.c | ||
i82586.h | ||
i82593.h | ||
Kconfig | ||
mac80211_hwsim.c | ||
Makefile | ||
netwave_cs.c | ||
ray_cs.c | ||
ray_cs.h | ||
rayctl.h | ||
rndis_wlan.c | ||
strip.c | ||
wavelan.c | ||
wavelan.h | ||
wavelan.p.h | ||
wavelan_cs.c | ||
wavelan_cs.h | ||
wavelan_cs.p.h | ||
wl3501.h | ||
wl3501_cs.c | ||
zd1201.c | ||
zd1201.h |