Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

diff --combined drivers/net/wireless/p54/p54pci.c
index 269fda362836befbf3c95e4ccc576998d1ab9126,21f673d8565fc0f6bf3c1387d9df8126aa218f43..c24067f1a0cb526560f40247aa647c1c57e2f734
--- 1/drivers/net/wireless/p54/p54pci.c
--- 2/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@@ -15,7 -15,6 +15,7 @@@
  
  #include <linux/init.h>
  #include <linux/pci.h>
 +#include <linux/slab.h>
  #include <linux/firmware.h>
  #include <linux/etherdevice.h>
  #include <linux/delay.h>
@@@ -246,7 -245,7 +246,7 @@@ static void p54p_check_tx_ring(struct i
        u32 idx, i;
  
        i = (*index) % ring_limit;
-       (*index) = idx = le32_to_cpu(ring_control->device_idx[1]);
+       (*index) = idx = le32_to_cpu(ring_control->device_idx[ring_index]);
        idx %= ring_limit;
  
        while (i != idx) {