lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

r8152: adjust some duplicated code

Browse Source 
- Use r8152_get_tx_agg for getting tx agg list
- Replace submit rx with goto submit

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
hayeswang
2013-08-16 16:09:35 +08:00
committed by David S. Miller
parent a5a4f468e3
commit 0de98f6c6f
1 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
drivers/net/usb/r8152.c
View File

@@ -1067,6 +1067,24 @@ err1:
return -ENOMEM; return -ENOMEM;
} }
static struct tx_agg *r8152_get_tx_agg(struct r8152 *tp)
{
struct tx_agg *agg = NULL;
unsigned long flags;
spin_lock_irqsave(&tp->tx_lock, flags);
if (!list_empty(&tp->tx_free)) {
struct list_head *cursor;
cursor = tp->tx_free.next;
list_del_init(cursor);
agg = list_entry(cursor, struct tx_agg, list);
}
spin_unlock_irqrestore(&tp->tx_lock, flags);
return agg;
}
static void static void
r8152_tx_csum(struct r8152 *tp, struct tx_desc *desc, struct sk_buff *skb) r8152_tx_csum(struct r8152 *tp, struct tx_desc *desc, struct sk_buff *skb)
{ {
@@ -1139,15 +1157,8 @@ static void rx_bottom(struct r8152 *tp)
agg = list_entry(cursor, struct rx_agg, list); agg = list_entry(cursor, struct rx_agg, list);
urb = agg->urb; urb = agg->urb;
if (urb->actual_length < ETH_ZLEN) { if (urb->actual_length < ETH_ZLEN)
ret = r8152_submit_rx(tp, agg, GFP_ATOMIC); goto submit;
spin_lock_irqsave(&tp->rx_lock, flags);
if (ret && ret != -ENODEV) {
list_add_tail(&agg->list, next);
tasklet_schedule(&tp->tl);
}
continue;
}
len_used = 0; len_used = 0;
rx_desc = agg->head; rx_desc = agg->head;
@@ -1181,6 +1192,7 @@ static void rx_bottom(struct r8152 *tp)
len_used += sizeof(struct rx_desc) + pkt_len; len_used += sizeof(struct rx_desc) + pkt_len;
} }
submit:
ret = r8152_submit_rx(tp, agg, GFP_ATOMIC); ret = r8152_submit_rx(tp, agg, GFP_ATOMIC);
spin_lock_irqsave(&tp->rx_lock, flags); spin_lock_irqsave(&tp->rx_lock, flags);
if (ret && ret != -ENODEV) { if (ret && ret != -ENODEV) {
@@ -1205,16 +1217,10 @@ static void tx_bottom(struct r8152 *tp)
next_agg: next_agg:
agg = NULL; agg = NULL;
spin_lock_irqsave(&tp->tx_lock, flags); if (skb_queue_empty(&tp->tx_queue))
if (!skb_queue_empty(&tp->tx_queue) && !list_empty(&tp->tx_free)) { return;
struct list_head *cursor;
cursor = tp->tx_free.next;
list_del_init(cursor);
agg = list_entry(cursor, struct tx_agg, list);
}
spin_unlock_irqrestore(&tp->tx_lock, flags);
agg = r8152_get_tx_agg(tp);
if (!agg) if (!agg)
return; return;
@@ -1382,15 +1388,10 @@ static netdev_tx_t rtl8152_start_xmit(struct sk_buff *skb,
skb_tx_timestamp(skb); skb_tx_timestamp(skb);
spin_lock_irqsave(&tp->tx_lock, flags); /* If tx_queue is not empty, it means at least one previous packt */
if (!list_empty(&tp->tx_free) && skb_queue_empty(&tp->tx_queue)) { /* is waiting for sending. Don't send current one before it. */
struct list_head *cursor; if (skb_queue_empty(&tp->tx_queue))
agg = r8152_get_tx_agg(tp);
cursor = tp->tx_free.next;
list_del_init(cursor);
agg = list_entry(cursor, struct tx_agg, list);
}
spin_unlock_irqrestore(&tp->tx_lock, flags);
if (!agg) { if (!agg) {
skb_queue_tail(&tp->tx_queue, skb); skb_queue_tail(&tp->tx_queue, skb);