diff --git a/[refs] b/[refs] index 2bcc567959fc..37358edbc34a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 483ba50bd41d14d5325d6cd9935de86a982d08a2 +refs/heads/master: 52f6d697dc0f2c039e8413e780b0f45ddf8161fc diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index e53c1dc58d08..92b0e4975135 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -2802,6 +2802,12 @@ static int tg3_rx(struct tg3 *tp, int budget) next_pkt_nopost: sw_idx++; sw_idx %= TG3_RX_RCB_RING_SIZE(tp); + + /* Refresh hw_idx to see if there is new work */ + if (sw_idx == hw_idx) { + hw_idx = tp->hw_status->idx[0].rx_producer; + rmb(); + } } /* ACK the status ring. */