aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/tg3.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 10d476153ee..e53c1dc58d0 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -2686,8 +2686,8 @@ static int tg3_vlan_rx(struct tg3 *tp, struct sk_buff *skb, u16 vlan_tag)
2686static int tg3_rx(struct tg3 *tp, int budget) 2686static int tg3_rx(struct tg3 *tp, int budget)
2687{ 2687{
2688 u32 work_mask; 2688 u32 work_mask;
2689 u32 rx_rcb_ptr = tp->rx_rcb_ptr; 2689 u32 sw_idx = tp->rx_rcb_ptr;
2690 u16 hw_idx, sw_idx; 2690 u16 hw_idx;
2691 int received; 2691 int received;
2692 2692
2693 hw_idx = tp->hw_status->idx[0].rx_producer; 2693 hw_idx = tp->hw_status->idx[0].rx_producer;
@@ -2696,7 +2696,6 @@ static int tg3_rx(struct tg3 *tp, int budget)
2696 * the opaque cookie. 2696 * the opaque cookie.
2697 */ 2697 */
2698 rmb(); 2698 rmb();
2699 sw_idx = rx_rcb_ptr % TG3_RX_RCB_RING_SIZE(tp);
2700 work_mask = 0; 2699 work_mask = 0;
2701 received = 0; 2700 received = 0;
2702 while (sw_idx != hw_idx && budget > 0) { 2701 while (sw_idx != hw_idx && budget > 0) {
@@ -2801,14 +2800,13 @@ static int tg3_rx(struct tg3 *tp, int budget)
2801next_pkt: 2800next_pkt:
2802 (*post_ptr)++; 2801 (*post_ptr)++;
2803next_pkt_nopost: 2802next_pkt_nopost:
2804 rx_rcb_ptr++; 2803 sw_idx++;
2805 sw_idx = rx_rcb_ptr % TG3_RX_RCB_RING_SIZE(tp); 2804 sw_idx %= TG3_RX_RCB_RING_SIZE(tp);
2806 } 2805 }
2807 2806
2808 /* ACK the status ring. */ 2807 /* ACK the status ring. */
2809 tp->rx_rcb_ptr = rx_rcb_ptr; 2808 tp->rx_rcb_ptr = sw_idx;
2810 tw32_rx_mbox(MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW, 2809 tw32_rx_mbox(MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW, sw_idx);
2811 (rx_rcb_ptr % TG3_RX_RCB_RING_SIZE(tp)));
2812 2810
2813 /* Refill RX ring(s). */ 2811 /* Refill RX ring(s). */
2814 if (work_mask & RXD_OPAQUE_RING_STD) { 2812 if (work_mask & RXD_OPAQUE_RING_STD) {