提交 0d86df80 编写于 作者: M Matt Carlson 提交者: David S. Miller

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: NMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: NMichael Chan <mchan@broadcom.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 14417063
...@@ -6087,31 +6087,31 @@ static int tg3_rx_prodring_alloc(struct tg3 *tp, ...@@ -6087,31 +6087,31 @@ static int tg3_rx_prodring_alloc(struct tg3 *tp,
memset(tpr->rx_jmb, 0, TG3_RX_JUMBO_RING_BYTES); memset(tpr->rx_jmb, 0, TG3_RX_JUMBO_RING_BYTES);
if (tp->tg3_flags & TG3_FLAG_JUMBO_RING_ENABLE) { if (!(tp->tg3_flags & TG3_FLAG_JUMBO_RING_ENABLE))
for (i = 0; i < TG3_RX_JUMBO_RING_SIZE; i++) { goto done;
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++) { for (i = 0; i < TG3_RX_JUMBO_RING_SIZE; i++) {
if (tg3_alloc_rx_skb(tp, tpr, RXD_OPAQUE_RING_JUMBO, struct tg3_rx_buffer_desc *rxd;
i) < 0) {
printk(KERN_WARNING PFX rxd = &tpr->rx_jmb[i].std;
"%s: Using a smaller RX jumbo ring, " rxd->idx_len = TG3_RX_JMB_DMA_SZ << RXD_LEN_SHIFT;
"only %d out of %d buffers were " rxd->type_flags = (RXD_FLAG_END << RXD_FLAGS_SHIFT) |
"allocated successfully.\n", RXD_FLAG_JUMBO;
tp->dev->name, i, tp->rx_jumbo_pending); rxd->opaque = (RXD_OPAQUE_RING_JUMBO |
if (i == 0) (i << RXD_OPAQUE_INDEX_SHIFT));
goto initfail; }
tp->rx_jumbo_pending = i;
break; 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;
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册