tg3: fix ring init when there are more TX than RX channels
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> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
c3658e8d0f
Коммит
a620a6bc1c
|
@ -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;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче