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

staging: et131x: reduce split lines in nic_return_rfd

Browse source 
Signed-off-by: ZHAO Gang <gamerh2o@gmail.com>
Acked-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
ZHAO Gang 2013-12-09 19:38:27 +08:00 • committed by Greg Kroah-Hartman
parent f876f59e45
commit 39bdb4a02b
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/staging/et131x/et131x.c
View file

@ -2412,11 +2412,13 @@ static void nic_return_rfd(struct et131x_adapter *adapter, struct rfd *rfd)
u16 buff_index = rfd->bufferindex; u16 buff_index = rfd->bufferindex;
u8 ring_index = rfd->ringindex; u8 ring_index = rfd->ringindex;
unsigned long flags; unsigned long flags;
struct fbr_lookup *fbr = rx_local->fbr[ring_index];
/* We don't use any of the OOB data besides status. Otherwise, we /* We don't use any of the OOB data besides status. Otherwise, we
* need to clean up OOB data * need to clean up OOB data
*/ */
if (buff_index < rx_local->fbr[ring_index]->num_entries) { if (buff_index < fbr->num_entries) {
u32 free_buff_ring;
u32 __iomem *offset; u32 __iomem *offset;
struct fbr_desc *next; struct fbr_desc *next;
@ -2427,22 +2429,20 @@ static void nic_return_rfd(struct et131x_adapter *adapter, struct rfd *rfd)
else else
offset = &rx_dma->fbr1_full_offset; offset = &rx_dma->fbr1_full_offset;
next = (struct fbr_desc *) next = (struct fbr_desc *)(fbr->ring_virtaddr) +
(rx_local->fbr[ring_index]->ring_virtaddr) + INDEX10(fbr->local_full);
INDEX10(rx_local->fbr[ring_index]->local_full);
/* Handle the Free Buffer Ring advancement here. Write /* Handle the Free Buffer Ring advancement here. Write
* the PA / Buffer Index for the returned buffer into * the PA / Buffer Index for the returned buffer into
* the oldest (next to be freed)FBR entry * the oldest (next to be freed)FBR entry
*/ */
next->addr_hi = rx_local->fbr[ring_index]->bus_high[buff_index]; next->addr_hi = fbr->bus_high[buff_index];
next->addr_lo = rx_local->fbr[ring_index]->bus_low[buff_index]; next->addr_lo = fbr->bus_low[buff_index];
next->word2 = buff_index; next->word2 = buff_index;
writel(bump_free_buff_ring( free_buff_ring = bump_free_buff_ring(&fbr->local_full,
&rx_local->fbr[ring_index]->local_full, fbr->num_entries - 1);
rx_local->fbr[ring_index]->num_entries - 1), writel(free_buff_ring, offset);
offset);
spin_unlock_irqrestore(&adapter->fbr_lock, flags); spin_unlock_irqrestore(&adapter->fbr_lock, flags);
} else { } else {