From patchwork Sun Feb 28 03:00:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitris Michailidis X-Patchwork-Id: 46467 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47135B7DC0 for ; Sun, 28 Feb 2010 14:00:30 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968323Ab0B1DAZ (ORCPT ); Sat, 27 Feb 2010 22:00:25 -0500 Received: from stargate.chelsio.com ([67.207.112.58]:20437 "EHLO stargate.chelsio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966874Ab0B1DAY (ORCPT ); Sat, 27 Feb 2010 22:00:24 -0500 Received: from maui.asicdesigners.com (maui.asicdesigners.com [10.192.180.15]) by stargate.chelsio.com (8.13.1/8.13.1) with SMTP id o1S30OFP025423 for ; Sat, 27 Feb 2010 19:00:24 -0800 Received: from darkside.asicdesigners.com ([10.192.161.150]) by maui.asicdesigners.com with Microsoft SMTPSVC(6.0.3790.3959); Sat, 27 Feb 2010 19:03:10 -0800 Received: from darkside.asicdesigners.com (localhost.localdomain [127.0.0.1]) by darkside.asicdesigners.com (8.13.4/8.13.4) with ESMTP id o1S30O3L003632 for ; Sat, 27 Feb 2010 19:00:24 -0800 Received: (from dm@localhost) by darkside.asicdesigners.com (8.13.4/8.13.4/Submit) id o1S30OH9003631 for netdev@vger.kernel.org; Sat, 27 Feb 2010 19:00:24 -0800 From: Dimitris Michailidis To: netdev@vger.kernel.org Subject: [PATCH] cxgb4: Remove need_skb_unmap and adjust its callers. Date: Sat, 27 Feb 2010 19:00:24 -0800 Message-Id: <1267326024-3610-1-git-send-email-dm@chelsio.com> X-Mailer: git-send-email 1.5.4 X-OriginalArrivalTime: 28 Feb 2010 03:03:10.0078 (UTC) FILETIME=[8EFC51E0:01CAB822] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Applies on top of the V3 patches. Signed-off-by: Dimitris Michailidis --- drivers/net/cxgb4/sge.c | 29 +++-------------------------- 1 files changed, 3 insertions(+), 26 deletions(-) diff --git a/drivers/net/cxgb4/sge.c b/drivers/net/cxgb4/sge.c index 34617f8..eb81d73 100644 --- a/drivers/net/cxgb4/sge.c +++ b/drivers/net/cxgb4/sge.c @@ -298,25 +298,6 @@ unmap: dma_unmap_page(dev, be64_to_cpu(p->addr[0]), } /** - * need_skb_unmap - does the platform need unmapping of sk_buffs? - * - * Returns true if the platfrom needs sk_buff unmapping. The compiler - * optimizes away unecessary code if this returns true. - */ -static inline int need_skb_unmap(void) -{ - /* - * This structure is used to tell if the platfrom needs buffer - * unmapping by checking if DECLARE_PCI_UNMAP_ADDR defines anything. - */ - struct dummy { - DECLARE_PCI_UNMAP_ADDR(addr); - }; - - return sizeof(struct dummy) != 0; -} - -/** * free_tx_desc - reclaims Tx descriptors and their buffers * @adapter: the adapter * @q: the Tx queue to reclaim descriptors from @@ -333,12 +314,10 @@ static void free_tx_desc(struct adapter *adap, struct sge_txq *q, unsigned int cidx = q->cidx; struct device *dev = adap->pdev_dev; - const int need_unmap = need_skb_unmap() && unmap; - d = &q->sdesc[cidx]; while (n--) { if (d->skb) { /* an SGL is present */ - if (need_unmap) + if (unmap) unmap_sgl(dev, d->skb, d->sgl, q); kfree_skb(d->skb); d->skb = NULL; @@ -1300,10 +1279,8 @@ static void service_ofldq(struct sge_ofld_txq *q) pos + flits, hdr_len, (dma_addr_t *)skb->head); - if (need_skb_unmap()) { - skb->dev = q->adap->port[0]; - skb->destructor = deferred_unmap_destructor; - } + skb->dev = q->adap->port[0]; + skb->destructor = deferred_unmap_destructor; last_desc = q->q.pidx + ndesc - 1; if (last_desc >= q->q.size)