From patchwork Thu Jun 17 14:05:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 106688 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5HE6rvQ001488 for ; Thu, 17 Jun 2010 14:06:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760108Ab0FQOG3 (ORCPT ); Thu, 17 Jun 2010 10:06:29 -0400 Received: from sh.osrg.net ([192.16.179.4]:46491 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760107Ab0FQOG1 (ORCPT ); Thu, 17 Jun 2010 10:06:27 -0400 Received: from localhost (rose.osrg.net [10.76.0.1]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id o5HE5xPS016333; Thu, 17 Jun 2010 23:05:59 +0900 Date: Thu, 17 Jun 2010 23:05:59 +0900 To: mchan@broadcom.com Cc: JBottomley@Novell.com, fujita.tomonori@lab.ntt.co.jp, vapier@gentoo.org, netdev@vger.kernel.org, linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: bnx2 fails to compile on parisc because of missing get_dma_ops() From: FUJITA Tomonori In-Reply-To: References: <1276780336.2789.6.camel@mulgrave.site> Mime-Version: 1.0 Message-Id: <20100617230435J.fujita.tomonori@lab.ntt.co.jp> Lines: 75 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 17 Jun 2010 14:06:53 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Thu, 17 Jun 2010 23:06:00 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96.1 at sh X-Virus-Status: Clean Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 949d7a9..85f1692 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -3099,12 +3099,10 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget) skb = rx_buf->skb; prefetchw(skb); - if (!get_dma_ops(&pdev->dev)->sync_single_for_cpu) { - next_rx_buf = - &rxr->rx_buf_ring[ - RX_RING_IDX(NEXT_RX_BD(sw_cons))]; - prefetch(next_rx_buf->desc); - } + next_rx_buf = + &rxr->rx_buf_ring[RX_RING_IDX(NEXT_RX_BD(sw_cons))]; + prefetch(next_rx_buf->desc); + rx_buf->skb = NULL; dma_addr = dma_unmap_addr(rx_buf, mapping);