evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'r8152-next'

Browse source 
Hayes Wang says:

====================
r8152: adjust rx functions

v3:
For patch #1, remove unnecessary initialization for ret and
unnecessary blank line in r8152_submit_rx().

v2:
For patch #1, set actual_length to 0 before adding the rx to the
list, when a error occurs.

For patch #2, change the flow. Stop submitting the rx if a error
occurs, and add the remaining rx to the list for submitting later.

v1:
Adjust some flows and codes which are relative to r8152_submit_rx()
and rtl_start_rx().
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2014-11-21 14:53:05 -05:00
commit c92d418f97
1 changed files with 39 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
drivers/net/usb/r8152.c
View file

@ -1032,7 +1032,6 @@ static void read_bulk_callback(struct urb *urb)
int status = urb->status; int status = urb->status;
struct rx_agg *agg; struct rx_agg *agg;
struct r8152 *tp; struct r8152 *tp;
int result;
agg = urb->context; agg = urb->context;
if (!agg) if (!agg)
@ -1083,16 +1082,7 @@ static void read_bulk_callback(struct urb *urb)
break; break;
} }
result = r8152_submit_rx(tp, agg, GFP_ATOMIC); r8152_submit_rx(tp, agg, GFP_ATOMIC);
if (result == -ENODEV) {
set_bit(RTL8152_UNPLUG, &tp->flags);
netif_device_detach(tp->netdev);
} else if (result) {
spin_lock(&tp->rx_lock);
list_add_tail(&agg->list, &tp->rx_done);
spin_unlock(&tp->rx_lock);
tasklet_schedule(&tp->tl);
}
} }
static void write_bulk_callback(struct urb *urb) static void write_bulk_callback(struct urb *urb)
@ -1680,7 +1670,6 @@ static void rx_bottom(struct r8152 *tp)
int len_used = 0; int len_used = 0;
struct urb *urb; struct urb *urb;
u8 *rx_data; u8 *rx_data;
int ret;
list_del_init(cursor); list_del_init(cursor);
@ -1733,13 +1722,7 @@ find_next_rx:
} }
submit: submit:
ret = r8152_submit_rx(tp, agg, GFP_ATOMIC); r8152_submit_rx(tp, agg, GFP_ATOMIC);
if (ret && ret != -ENODEV) {
spin_lock_irqsave(&tp->rx_lock, flags);
list_add_tail(&agg->list, &tp->rx_done);
spin_unlock_irqrestore(&tp->rx_lock, flags);
tasklet_schedule(&tp->tl);
}
} }
} }
@ -1806,11 +1789,28 @@ static void bottom_half(unsigned long data)
static static
int r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags) int r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags)
{ {
int ret;
usb_fill_bulk_urb(agg->urb, tp->udev, usb_rcvbulkpipe(tp->udev, 1), usb_fill_bulk_urb(agg->urb, tp->udev, usb_rcvbulkpipe(tp->udev, 1),
agg->head, agg_buf_sz, agg->head, agg_buf_sz,
(usb_complete_t)read_bulk_callback, agg); (usb_complete_t)read_bulk_callback, agg);
return usb_submit_urb(agg->urb, mem_flags); ret = usb_submit_urb(agg->urb, mem_flags);
if (ret == -ENODEV) {
set_bit(RTL8152_UNPLUG, &tp->flags);
netif_device_detach(tp->netdev);
} else if (ret) {
struct urb *urb = agg->urb;
unsigned long flags;
urb->actual_length = 0;
spin_lock_irqsave(&tp->rx_lock, flags);
list_add_tail(&agg->list, &tp->rx_done);
spin_unlock_irqrestore(&tp->rx_lock, flags);
tasklet_schedule(&tp->tl);
}
return ret;
} }
static void rtl_drop_queued_tx(struct r8152 *tp) static void rtl_drop_queued_tx(struct r8152 *tp)
@ -2001,6 +2001,25 @@ static int rtl_start_rx(struct r8152 *tp)
break; break;
} }
if (ret && ++i < RTL8152_MAX_RX) {
struct list_head rx_queue;
unsigned long flags;
INIT_LIST_HEAD(&rx_queue);
do {
struct rx_agg *agg = &tp->rx_info[i++];
struct urb *urb = agg->urb;
urb->actual_length = 0;
list_add_tail(&agg->list, &rx_queue);
} while (i < RTL8152_MAX_RX);
spin_lock_irqsave(&tp->rx_lock, flags);
list_splice_tail(&rx_queue, &tp->rx_done);
spin_unlock_irqrestore(&tp->rx_lock, flags);
}
return ret; return ret;
} }