include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[linux-2.6-block.git] / drivers / net / wireless / zd1211rw / zd_mac.c

diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 2d555cc3050868954f8cc86789f9fba4a0fbb1f1..16fa289ad77b20367aeff3cd9f1327eb66b25f0c 100644 (file)
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -22,6 +22,7 @@
 
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/slab.h>
 #include <linux/usb.h>
 #include <linux/jiffies.h>
 #include <net/ieee80211_radiotap.h>
@@ -350,7 +351,7 @@ static void zd_mac_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
        first_idx = info->status.rates[0].idx;
        ZD_ASSERT(0<=first_idx && first_idx<ARRAY_SIZE(zd_retry_rates));
        retries = &zd_retry_rates[first_idx];
-       ZD_ASSERT(0<=retry && retry<=retries->count);
+       ZD_ASSERT(1 <= retry && retry <= retries->count);
 
        info->status.rates[0].idx = retries->rate[0];
        info->status.rates[0].count = 1; // (retry > 1 ? 2 : 1);
@@ -360,7 +361,7 @@ static void zd_mac_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
                info->status.rates[i].count = 1; // ((i==retry-1) && success ? 1:2);
        }
        for (; i<IEEE80211_TX_MAX_RATES && i<retry; i++) {
-               info->status.rates[i].idx = retries->rate[retry-1];
+               info->status.rates[i].idx = retries->rate[retry - 1];
                info->status.rates[i].count = 1; // (success ? 1:2);
        }
        if (i<IEEE80211_TX_MAX_RATES)
@@ -374,7 +375,7 @@ static void zd_mac_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
  * zd_mac_tx_failed - callback for failed frames
  * @dev: the mac80211 wireless device
  *
- * This function is called if a frame couldn't be successfully be
+ * This function is called if a frame couldn't be successfully
  * transferred. The first frame from the tx queue, will be selected and
  * reported as error to the upper layers.
  */
@@ -424,12 +425,10 @@ void zd_mac_tx_failed(struct urb *urb)
                first_idx = info->status.rates[0].idx;
                ZD_ASSERT(0<=first_idx && first_idx<ARRAY_SIZE(zd_retry_rates));
                retries = &zd_retry_rates[first_idx];
-               if (retry < 0 || retry > retries->count) {
+               if (retry <= 0 || retry > retries->count)
                        continue;
-               }
 
-               ZD_ASSERT(0<=retry && retry<=retries->count);
-               final_idx = retries->rate[retry-1];
+               final_idx = retries->rate[retry - 1];
                final_rate = zd_rates[final_idx].hw_value;
 
                if (final_rate != tx_status->rate) {