Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 43a4478d65ffaa1c2def8ffceafbc3a3f1e99b82

Authored by hayeswang
Committed by David S. Miller
1 parent 0de98f6c6f
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

r8152: move some declearation of variables 

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>

Showing 1 changed file with 14 additions and 15 deletions Side-by-side Diff

drivers/net/usb/r8152.c
Diff comments   View file @ 43a4478
... ... @@ -1133,25 +1133,19 @@
1133 1133  
1134 1134 static void rx_bottom(struct r8152 *tp)
1135 1135 {
1136   - struct net_device_stats *stats;
1137   - struct net_device *netdev;
1138   - struct rx_agg *agg;
1139   - struct rx_desc *rx_desc;
1140 1136 unsigned long flags;
1141 1137 struct list_head *cursor, *next;
1142   - struct sk_buff *skb;
1143   - struct urb *urb;
1144   - unsigned pkt_len;
1145   - int len_used;
1146   - u8 *rx_data;
1147   - int ret;
1148 1138  
1149   - netdev = tp->netdev;
1150   -
1151   - stats = rtl8152_get_stats(netdev);
1152   -
1153 1139 spin_lock_irqsave(&tp->rx_lock, flags);
1154 1140 list_for_each_safe(cursor, next, &tp->rx_done) {
  1141 + struct rx_desc *rx_desc;
  1142 + struct rx_agg *agg;
  1143 + unsigned pkt_len;
  1144 + int len_used = 0;
  1145 + struct urb *urb;
  1146 + u8 *rx_data;
  1147 + int ret;
  1148 +
1155 1149 list_del_init(cursor);
1156 1150 spin_unlock_irqrestore(&tp->rx_lock, flags);
1157 1151  
1158 1152  
1159 1153  
... ... @@ -1160,15 +1154,20 @@
1160 1154 if (urb->actual_length < ETH_ZLEN)
1161 1155 goto submit;
1162 1156  
1163   - len_used = 0;
1164 1157 rx_desc = agg->head;
1165 1158 rx_data = agg->head;
1166 1159 pkt_len = le32_to_cpu(rx_desc->opts1) & RX_LEN_MASK;
1167 1160 len_used += sizeof(struct rx_desc) + pkt_len;
1168 1161  
1169 1162 while (urb->actual_length >= len_used) {
  1163 + struct net_device *netdev = tp->netdev;
  1164 + struct net_device_stats *stats;
  1165 + struct sk_buff *skb;
  1166 +
1170 1167 if (pkt_len < ETH_ZLEN)
1171 1168 break;
  1169 +
  1170 + stats = rtl8152_get_stats(netdev);
1172 1171  
1173 1172 pkt_len -= 4; /* CRC */
1174 1173 rx_data += sizeof(struct rx_desc);