diff options
author | hayeswang <hayeswang@realtek.com> | 2013-08-16 04:09:36 -0400 |
---|---|---|
committer | Vladislav Zhurba <vzhurba@nvidia.com> | 2018-02-01 16:57:58 -0500 |
commit | 61d44c04e3cb26150e30e6effc4a3b4e755baaa4 (patch) | |
tree | 7f3f22d11d51afca4b7b1babce023f05700cee6b /drivers/net/usb/r8152_shield.c | |
parent | edef229a9fc96de75468c075fadf2642ec9ec6e0 (diff) |
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>
Signed-off-by: Preetham Chandru R <pchandru@nvidia.com>
(cherry picked from commit 43a4478d65ffaa1c2def8ffceafbc3a3f1e99b82)
Change-Id: Id1030b714f86feca0c4a23abba1dd5ea3688aecd
Reviewed-on: http://git-master/r/369993
Tested-by: Aly Hirani <ahirani@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Diffstat (limited to 'drivers/net/usb/r8152_shield.c')
-rw-r--r-- | drivers/net/usb/r8152_shield.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/drivers/net/usb/r8152_shield.c b/drivers/net/usb/r8152_shield.c index 4dee76b46..0a88f647f 100644 --- a/drivers/net/usb/r8152_shield.c +++ b/drivers/net/usb/r8152_shield.c | |||
@@ -1133,25 +1133,19 @@ r8152_tx_csum(struct r8152 *tp, struct tx_desc *desc, struct sk_buff *skb) | |||
1133 | 1133 | ||
1134 | static void rx_bottom(struct r8152 *tp) | 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 | unsigned long flags; | 1136 | unsigned long flags; |
1141 | struct list_head *cursor, *next; | 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 | |||
1149 | netdev = tp->netdev; | ||
1150 | |||
1151 | stats = rtl8152_get_stats(netdev); | ||
1152 | 1138 | ||
1153 | spin_lock_irqsave(&tp->rx_lock, flags); | 1139 | spin_lock_irqsave(&tp->rx_lock, flags); |
1154 | list_for_each_safe(cursor, next, &tp->rx_done) { | 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 | list_del_init(cursor); | 1149 | list_del_init(cursor); |
1156 | spin_unlock_irqrestore(&tp->rx_lock, flags); | 1150 | spin_unlock_irqrestore(&tp->rx_lock, flags); |
1157 | 1151 | ||
@@ -1160,16 +1154,21 @@ static void rx_bottom(struct r8152 *tp) | |||
1160 | if (urb->actual_length < ETH_ZLEN) | 1154 | if (urb->actual_length < ETH_ZLEN) |
1161 | goto submit; | 1155 | goto submit; |
1162 | 1156 | ||
1163 | len_used = 0; | ||
1164 | rx_desc = agg->head; | 1157 | rx_desc = agg->head; |
1165 | rx_data = agg->head; | 1158 | rx_data = agg->head; |
1166 | pkt_len = le32_to_cpu(rx_desc->opts1) & RX_LEN_MASK; | 1159 | pkt_len = le32_to_cpu(rx_desc->opts1) & RX_LEN_MASK; |
1167 | len_used += sizeof(struct rx_desc) + pkt_len; | 1160 | len_used += sizeof(struct rx_desc) + pkt_len; |
1168 | 1161 | ||
1169 | while (urb->actual_length >= len_used) { | 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 | if (pkt_len < ETH_ZLEN) | 1167 | if (pkt_len < ETH_ZLEN) |
1171 | break; | 1168 | break; |
1172 | 1169 | ||
1170 | stats = rtl8152_get_stats(netdev); | ||
1171 | |||
1173 | pkt_len -= 4; /* CRC */ | 1172 | pkt_len -= 4; /* CRC */ |
1174 | rx_data += sizeof(struct rx_desc); | 1173 | rx_data += sizeof(struct rx_desc); |
1175 | 1174 | ||