diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-07-09 22:34:34 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-09 22:34:34 +0200 |
| commit | 635d999fd3b9f0ddc899eaf45fc49bec65c0b8e2 (patch) | |
| tree | 0456542caa85aff0f4edf91707e36850f76d585f /drivers/net/wireless/rt2x00 | |
| parent | mwifiex: retrieve correct max_power information in reg_notifier handler (diff) | |
| parent | iwlegacy: don't mess up the SCD when removing a key (diff) | |
| download | linux-635d999fd3b9f0ddc899eaf45fc49bec65c0b8e2.tar.xz linux-635d999fd3b9f0ddc899eaf45fc49bec65c0b8e2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'drivers/net/wireless/rt2x00')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c index d357d1ed92f6..74ecc33fdd90 100644 --- a/drivers/net/wireless/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/rt2x00/rt2x00usb.c @@ -436,8 +436,8 @@ void rt2x00usb_kick_queue(struct data_queue *queue) case QID_RX: if (!rt2x00queue_full(queue)) rt2x00queue_for_each_entry(queue, - Q_INDEX_DONE, Q_INDEX, + Q_INDEX_DONE, NULL, rt2x00usb_kick_rx_entry); break; |