diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-03-13 14:38:51 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-03-13 14:38:51 -0400 |
| commit | 750084b51bc9a7962e7f7c9a29cede0234aed824 (patch) | |
| tree | 0ee4bc3d0a4da50591d8fe9f55f28ca20224e856 /drivers/net/wireless/rt2x00/rt2x00queue.c | |
| parent | 1ab5ecb90cb6a3df1476e052f76a6e8f6511cb3d (diff) | |
| parent | 3780d038fdf4b5ef26ead10b0604ab1f46dd9510 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00queue.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00queue.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index 5adfb3eab9cd..9b1b2b7a7807 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c @@ -619,6 +619,9 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, else if (test_bit(REQUIRE_DMA, &queue->rt2x00dev->cap_flags)) rt2x00queue_align_frame(skb); + /* + * That function must be called with bh disabled. + */ spin_lock(&queue->tx_lock); if (unlikely(rt2x00queue_full(queue))) { |