r8152: move some declearation of variables
authorhayeswang <hayeswang@realtek.com>
Fri, 16 Aug 2013 08:09:36 +0000 (16:09 +0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 20 Aug 2013 07:08:22 +0000 (00:08 -0700)
Move some declearation of variables in rx_bottom().

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/r8152.c

index 4dee76b463643a16102f4be92db0c6554fbab11a..0a88f647f075957c6558fab90d8aa61a858a5fe4 100644 (file)
@@ -1133,25 +1133,19 @@ r8152_tx_csum(struct r8152 *tp, struct tx_desc *desc, struct sk_buff *skb)
 
 static void rx_bottom(struct r8152 *tp)
 {
-       struct net_device_stats *stats;
-       struct net_device *netdev;
-       struct rx_agg *agg;
-       struct rx_desc *rx_desc;
        unsigned long flags;
        struct list_head *cursor, *next;
-       struct sk_buff *skb;
-       struct urb *urb;
-       unsigned pkt_len;
-       int len_used;
-       u8 *rx_data;
-       int ret;
-
-       netdev = tp->netdev;
-
-       stats = rtl8152_get_stats(netdev);
 
        spin_lock_irqsave(&tp->rx_lock, flags);
        list_for_each_safe(cursor, next, &tp->rx_done) {
+               struct rx_desc *rx_desc;
+               struct rx_agg *agg;
+               unsigned pkt_len;
+               int len_used = 0;
+               struct urb *urb;
+               u8 *rx_data;
+               int ret;
+
                list_del_init(cursor);
                spin_unlock_irqrestore(&tp->rx_lock, flags);
 
@@ -1160,16 +1154,21 @@ static void rx_bottom(struct r8152 *tp)
                if (urb->actual_length < ETH_ZLEN)
                        goto submit;
 
-               len_used = 0;
                rx_desc = agg->head;
                rx_data = agg->head;
                pkt_len = le32_to_cpu(rx_desc->opts1) & RX_LEN_MASK;
                len_used += sizeof(struct rx_desc) + pkt_len;
 
                while (urb->actual_length >= len_used) {
+                       struct net_device *netdev = tp->netdev;
+                       struct net_device_stats *stats;
+                       struct sk_buff *skb;
+
                        if (pkt_len < ETH_ZLEN)
                                break;
 
+                       stats = rtl8152_get_stats(netdev);
+
                        pkt_len -= 4; /* CRC */
                        rx_data += sizeof(struct rx_desc);