diff --git a/[refs] b/[refs] index 891f91f81998..92c53d7bb0fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1d0521059789a138d19c4f940d6eca7d620a6eb +refs/heads/master: b28f6428af279ffb9e97ee00486a29498b7fcfdc diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 057e8ebc1b25..86f8798a88e2 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -6229,6 +6229,8 @@ static void tg3_free_rings(struct tg3 *tp) for (j = 0; j < tp->irq_cnt; j++) { struct tg3_napi *tnapi = &tp->napi[j]; + tg3_rx_prodring_free(tp, &tp->prodring[j]); + if (!tnapi->tx_buffers) continue; @@ -6264,8 +6266,6 @@ static void tg3_free_rings(struct tg3 *tp) dev_kfree_skb_any(skb); } - - tg3_rx_prodring_free(tp, &tp->prodring[j]); } }