tg3: Reduce indent level of tg3_rx_prodring_alloc
Subsystems (2)
PATCH 7/12 tg3: Reduce indent level of tg3_rx_prodring_alloc
This patch adds an inverted "jumbo ring enable" test and jumps to the exit if it succeeds. The change reduces the indent level of the remaining code making it more readable.
Signed-off-by Matt Carlson <[email protected]>
Reviewed-by Michael Chan <[email protected]>
--- drivers/net/tg3.c | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-)
drivers/net/tg3.c +24 -24
@@ -6087,31 +6087,31 @@ static int tg3_rx_prodring_alloc(struct tg3 *tp,memset (tpr->rx_jmb,0 ,TG3_RX_JUMBO_RING_BYTES ); -if (tp->tg3_flags &TG3_FLAG_JUMBO_RING_ENABLE ) { -for (i =0 ; i <TG3_RX_JUMBO_RING_SIZE ; i++) { -struct tg3_rx_buffer_desc *rxd; - - rxd = &tpr->rx_jmb[i].std; - rxd->idx_len =TG3_RX_JMB_DMA_SZ <<RXD_LEN_SHIFT ; - rxd->type_flags = (RXD_FLAG_END <<RXD_FLAGS_SHIFT ) | -RXD_FLAG_JUMBO ; - rxd->opaque = (RXD_OPAQUE_RING_JUMBO | - (i <<RXD_OPAQUE_INDEX_SHIFT )); - } +if (!(tp->tg3_flags &TG3_FLAG_JUMBO_RING_ENABLE )) + goto done; -for (i =0 ; i < tp->rx_jumbo_pending; i++) { -if (tg3_alloc_rx_skb (tp, tpr,RXD_OPAQUE_RING_JUMBO , - i) <0 ) { - printk(KERN_WARNING PFX -"%s: Using a smaller RX jumbo ring, " -"only %d out of %d buffers were " -"allocated successfully.\n" , - tp->dev->name, i, tp->rx_jumbo_pending); -if (i ==0 ) - goto initfail; - tp->rx_jumbo_pending = i; -break ; - } +for (i =0 ; i <TG3_RX_JUMBO_RING_SIZE ; i++) { +struct tg3_rx_buffer_desc *rxd; + + rxd = &tpr->rx_jmb[i].std; + rxd->idx_len =TG3_RX_JMB_DMA_SZ <<RXD_LEN_SHIFT ; + rxd->type_flags = (RXD_FLAG_END <<RXD_FLAGS_SHIFT ) | +RXD_FLAG_JUMBO ; + rxd->opaque = (RXD_OPAQUE_RING_JUMBO | + (i <<RXD_OPAQUE_INDEX_SHIFT )); + } + +for (i =0 ; i < tp->rx_jumbo_pending; i++) { +if (tg3_alloc_rx_skb (tp, tpr,RXD_OPAQUE_RING_JUMBO , i) <0 ) { + printk(KERN_WARNING PFX +"%s: Using a smaller RX jumbo ring, " +"only %d out of %d buffers were " +"allocated successfully.\n" , + tp->dev->name, i, tp->rx_jumbo_pending); +if (i ==0 ) + goto initfail; + tp->rx_jumbo_pending = i; +break ; } }
Signature · 1 line
1.6.4.4