Received: with ECARTIS (v1.0.0; list netdev); Tue, 12 Oct 2004 16:49:13 -0700 (PDT) Received: from omx2.sgi.com (omx2-ext.sgi.com [192.48.171.19]) by oss.sgi.com (8.13.0/8.13.0) with ESMTP id i9CNn9Xf016059 for ; Tue, 12 Oct 2004 16:49:09 -0700 Received: from cthulhu.engr.sgi.com (cthulhu.engr.sgi.com [192.26.80.2]) by omx2.sgi.com (8.12.11/8.12.9/linux-outbound_gateway-1.1) with ESMTP id i9D11EPt015901 for ; Tue, 12 Oct 2004 18:01:14 -0700 Received: from [192.168.2.3] (mtv-vpn-sw-corp-0-176.corp.sgi.com [134.15.0.176]) by cthulhu.engr.sgi.com (SGI-8.12.5/8.12.5) with ESMTP id i9CNmsLH3349802; Tue, 12 Oct 2004 16:48:55 -0700 (PDT) Date: Tue, 12 Oct 2004 16:34:30 -0700 (PDT) From: X-X-Sender: To: cc: Subject: [PATCH 1/2] net/tg3.c: use mmiowb in tg3_rx, tg3_start_xmit Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-archive-position: 10157 X-ecartis-version: Ecartis v1.0.0 Sender: netdev-bounce@oss.sgi.com Errors-to: netdev-bounce@oss.sgi.com X-original-sender: akepner@sgi.com Precedence: bulk X-list: netdev Content-Length: 598 Lines: 27 Using mmiowb() prevents an occasional oops in tg3_tx() resulting from a NULL skb pointer in the tx_ring_info structure. Signed-off-by: Greg Banks --- --- linux.1/drivers/net/tg3.c 2004-10-12 13:50:39.000000000 -0700 +++ linux/drivers/net/tg3.c 2004-10-12 13:55:37.000000000 -0700 @@ -2729,6 +2729,7 @@ tw32_rx_mbox(MAILBOX_RCV_JUMBO_PROD_IDX + TG3_64BIT_REG_LOW, sw_idx); } + mmiowb(); return received; } @@ -3176,6 +3177,7 @@ netif_stop_queue(dev); out_unlock: + mmiowb(); spin_unlock_irqrestore(&tp->tx_lock, flags); dev->trans_start = jiffies;