1 files changed, 58 insertions, 61 deletions

diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index ae842dbf9b50..8946e8ad1b85 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -363,9 +363,9 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,
                                     struct sk_buff *skb)
 {
         struct sk_buff *nskb, *skb_pool[MAX_PKT_NUM_IN_TRANSFER];
-        int index = 0, i = 0, chk_idx, len = skb->len;
-        int rx_remain_len = 0, rx_pkt_len = 0;
-        u16 pkt_len, pkt_tag, pool_index = 0;
+        int index = 0, i = 0, len = skb->len;
+        int rx_remain_len, rx_pkt_len;
+        u16 pool_index = 0;
         u8 *ptr;
 
         spin_lock(&hif_dev->rx_lock);
@@ -399,64 +399,64 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,
         spin_unlock(&hif_dev->rx_lock);
 
         while (index < len) {
+                u16 pkt_len;
+                u16 pkt_tag;
+                u16 pad_len;
+                int chk_idx;
+
                 ptr = (u8 *) skb->data;
 
                 pkt_len = ptr[index] + (ptr[index+1] << 8);
                 pkt_tag = ptr[index+2] + (ptr[index+3] << 8);
 
-                if (pkt_tag == ATH_USB_RX_STREAM_MODE_TAG) {
-                        u16 pad_len;
-
-                        pad_len = 4 - (pkt_len & 0x3);
-                        if (pad_len == 4)
-                                pad_len = 0;
-
-                        chk_idx = index;
-                        index = index + 4 + pkt_len + pad_len;
-
-                        if (index > MAX_RX_BUF_SIZE) {
-                                spin_lock(&hif_dev->rx_lock);
-                                hif_dev->rx_remain_len = index - MAX_RX_BUF_SIZE;
-                                hif_dev->rx_transfer_len =
-                                        MAX_RX_BUF_SIZE - chk_idx - 4;
-                                hif_dev->rx_pad_len = pad_len;
-
-                                nskb = __dev_alloc_skb(pkt_len + 32,
-                                                       GFP_ATOMIC);
-                                if (!nskb) {
-                                        dev_err(&hif_dev->udev->dev,
-                                        "ath9k_htc: RX memory allocation"
-                                        " error\n");
-                                        spin_unlock(&hif_dev->rx_lock);
-                                        goto err;
-                                }
-                                skb_reserve(nskb, 32);
-                                RX_STAT_INC(skb_allocated);
-
-                                memcpy(nskb->data, &(skb->data[chk_idx+4]),
-                                       hif_dev->rx_transfer_len);
-
-                                /* Record the buffer pointer */
-                                hif_dev->remain_skb = nskb;
+                if (pkt_tag != ATH_USB_RX_STREAM_MODE_TAG) {
+                        RX_STAT_INC(skb_dropped);
+                        return;
+                }
+
+                pad_len = 4 - (pkt_len & 0x3);
+                if (pad_len == 4)
+                        pad_len = 0;
+
+                chk_idx = index;
+                index = index + 4 + pkt_len + pad_len;
+
+                if (index > MAX_RX_BUF_SIZE) {
+                        spin_lock(&hif_dev->rx_lock);
+                        hif_dev->rx_remain_len = index - MAX_RX_BUF_SIZE;
+                        hif_dev->rx_transfer_len =
+                                MAX_RX_BUF_SIZE - chk_idx - 4;
+                        hif_dev->rx_pad_len = pad_len;
+
+                        nskb = __dev_alloc_skb(pkt_len + 32, GFP_ATOMIC);
+                        if (!nskb) {
+                                dev_err(&hif_dev->udev->dev,
+                                        "ath9k_htc: RX memory allocation error\n");
                                 spin_unlock(&hif_dev->rx_lock);
-                        } else {
-                                nskb = __dev_alloc_skb(pkt_len + 32, GFP_ATOMIC);
-                                if (!nskb) {
-                                        dev_err(&hif_dev->udev->dev,
-                                        "ath9k_htc: RX memory allocation"
-                                        " error\n");
-                                        goto err;
-                                }
-                                skb_reserve(nskb, 32);
-                                RX_STAT_INC(skb_allocated);
-
-                                memcpy(nskb->data, &(skb->data[chk_idx+4]), pkt_len);
-                                skb_put(nskb, pkt_len);
-                                skb_pool[pool_index++] = nskb;
+                                goto err;
                         }
+                        skb_reserve(nskb, 32);
+                        RX_STAT_INC(skb_allocated);
+
+                        memcpy(nskb->data, &(skb->data[chk_idx+4]),
+                               hif_dev->rx_transfer_len);
+
+                        /* Record the buffer pointer */
+                        hif_dev->remain_skb = nskb;
+                        spin_unlock(&hif_dev->rx_lock);
                 } else {
-                        RX_STAT_INC(skb_dropped);
-                        return;
+                        nskb = __dev_alloc_skb(pkt_len + 32, GFP_ATOMIC);
+                        if (!nskb) {
+                                dev_err(&hif_dev->udev->dev,
+                                        "ath9k_htc: RX memory allocation error\n");
+                                goto err;
+                        }
+                        skb_reserve(nskb, 32);
+                        RX_STAT_INC(skb_allocated);
+
+                        memcpy(nskb->data, &(skb->data[chk_idx+4]), pkt_len);
+                        skb_put(nskb, pkt_len);
+                        skb_pool[pool_index++] = nskb;
                 }
         }
 
@@ -471,7 +471,7 @@ err:
 static void ath9k_hif_usb_rx_cb(struct urb *urb)
 {
         struct sk_buff *skb = (struct sk_buff *) urb->context;
-        struct hif_device_usb *hif_dev = (struct hif_device_usb *)
+        struct hif_device_usb *hif_dev =
                 usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));
         int ret;
 
@@ -518,7 +518,7 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb)
 {
         struct sk_buff *skb = (struct sk_buff *) urb->context;
         struct sk_buff *nskb;
-        struct hif_device_usb *hif_dev = (struct hif_device_usb *)
+        struct hif_device_usb *hif_dev =
                 usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));
         int ret;
 
@@ -993,8 +993,7 @@ static void ath9k_hif_usb_reboot(struct usb_device *udev)
 static void ath9k_hif_usb_disconnect(struct usb_interface *interface)
 {
         struct usb_device *udev = interface_to_usbdev(interface);
-        struct hif_device_usb *hif_dev =
-                (struct hif_device_usb *) usb_get_intfdata(interface);
+        struct hif_device_usb *hif_dev = usb_get_intfdata(interface);
 
         if (hif_dev) {
                 ath9k_htc_hw_deinit(hif_dev->htc_handle,
@@ -1016,8 +1015,7 @@ static void ath9k_hif_usb_disconnect(struct usb_interface *interface)
 static int ath9k_hif_usb_suspend(struct usb_interface *interface,
                                  pm_message_t message)
 {
-        struct hif_device_usb *hif_dev =
-                (struct hif_device_usb *) usb_get_intfdata(interface);
+        struct hif_device_usb *hif_dev = usb_get_intfdata(interface);
 
         ath9k_hif_usb_dealloc_urbs(hif_dev);
 
@@ -1026,8 +1024,7 @@ static int ath9k_hif_usb_suspend(struct usb_interface *interface,
 
 static int ath9k_hif_usb_resume(struct usb_interface *interface)
 {
-        struct hif_device_usb *hif_dev =
-                (struct hif_device_usb *) usb_get_intfdata(interface);
+        struct hif_device_usb *hif_dev = usb_get_intfdata(interface);
         struct htc_target *htc_handle = hif_dev->htc_handle;
         int ret;