Message ID | 1416932471-8744-1-git-send-email-cascardo@linux.vnet.ibm.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> Date: Tue, 25 Nov 2014 14:21:11 -0200 > @@ -8563,7 +8563,8 @@ static int tg3_init_rings(struct tg3 *tp) > if (tnapi->rx_rcb) > memset(tnapi->rx_rcb, 0, TG3_RX_RCB_RING_BYTES(tp)); > > - if (tg3_rx_prodring_alloc(tp, &tnapi->prodring)) { > + if (tnapi->prodring.rx_std && > + tg3_rx_prodring_alloc(tp, &tnapi->prodring)) { > tg3_free_rings(tp); > return -ENOMEM; Maybe a better test is "i < tp->rxq_cnt"? This is what is used in tg3_mem_rx_acquire() to determine if tg3_rx_prodring_init() happens. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index dbb41c19..77f8f83 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -8563,7 +8563,8 @@ static int tg3_init_rings(struct tg3 *tp) if (tnapi->rx_rcb) memset(tnapi->rx_rcb, 0, TG3_RX_RCB_RING_BYTES(tp)); - if (tg3_rx_prodring_alloc(tp, &tnapi->prodring)) { + if (tnapi->prodring.rx_std && + tg3_rx_prodring_alloc(tp, &tnapi->prodring)) { tg3_free_rings(tp); return -ENOMEM; }
If TX channels are set to 4 and RX channels are set to less than 4, using ethtool -L, the driver will try to initialize more RX channels than it has allocated, causing an oops. This fix only initializes the RX ring if it has been allocated. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> --- drivers/net/ethernet/broadcom/tg3.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)