From patchwork Tue Dec 16 15:25:15 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 14261 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.176.167]) by ozlabs.org (Postfix) with ESMTP id EA4BBDDF18 for ; Wed, 17 Dec 2008 02:25:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757571AbYLPPZZ (ORCPT ); Tue, 16 Dec 2008 10:25:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757557AbYLPPZY (ORCPT ); Tue, 16 Dec 2008 10:25:24 -0500 Received: from gw01.mail.saunalahti.fi ([195.197.172.115]:45126 "EHLO gw01.mail.saunalahti.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756444AbYLPPZX (ORCPT ); Tue, 16 Dec 2008 10:25:23 -0500 Received: from retiisi.dyndns.org (a91-152-223-52.elisa-laajakaista.fi [91.152.223.52]) by gw01.mail.saunalahti.fi (Postfix) with ESMTP id 15CFF151506; Tue, 16 Dec 2008 17:25:17 +0200 (EET) Received: from masiina.localdomain (masiina.localdomain [192.168.1.1]) by retiisi.dyndns.org (Postfix) with ESMTP id E574652E28; Tue, 16 Dec 2008 17:25:16 +0200 (EET) Received: from masiina.localdomain (localhost [127.0.0.1]) by masiina.localdomain (8.13.8/8.13.8/Debian-3) with ESMTP id mBGFPHkP015106; Tue, 16 Dec 2008 17:25:17 +0200 Received: (from sakke@localhost) by masiina.localdomain (8.13.8/8.13.8/Submit) id mBGFPGWN015103; Tue, 16 Dec 2008 17:25:16 +0200 From: Sakari Ailus To: netdev@vger.kernel.org Cc: Sakari Ailus Subject: [PATCH 1/2] tlan: Fix pci memory unmapping Date: Tue, 16 Dec 2008 17:25:15 +0200 Message-Id: <1229441116-15077-1-git-send-email-sakari.ailus@iki.fi> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <4947C842.1020503@iki.fi> References: <4947C842.1020503@iki.fi> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix pci unmapping problem introduced by commit id 8953f1282793882a5444924f7a273dc72a43d0a3 "tlan: Fix small (< 64 bytes) datagram transmissions". Signed-off-by: Sakari Ailus --- drivers/net/tlan.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c index cf8cdaf..e604982 100644 --- a/drivers/net/tlan.c +++ b/drivers/net/tlan.c @@ -1433,7 +1433,9 @@ static u32 TLan_HandleTxEOF( struct net_device *dev, u16 host_int ) if ( ! bbuf ) { struct sk_buff *skb = TLan_GetSKB(head_list); pci_unmap_single(priv->pciDev, head_list->buffer[0].address, - skb->len, PCI_DMA_TODEVICE); + max(skb->len, + (unsigned int)TLAN_MIN_FRAME_SIZE), + PCI_DMA_TODEVICE); dev_kfree_skb_any(skb); head_list->buffer[8].address = 0; head_list->buffer[9].address = 0; @@ -2057,9 +2059,12 @@ static void TLan_FreeLists( struct net_device *dev ) list = priv->txList + i; skb = TLan_GetSKB(list); if ( skb ) { - pci_unmap_single(priv->pciDev, - list->buffer[0].address, skb->len, - PCI_DMA_TODEVICE); + pci_unmap_single( + priv->pciDev, + list->buffer[0].address, + max(skb->len, + (unsigned int)TLAN_MIN_FRAME_SIZE), + PCI_DMA_TODEVICE); dev_kfree_skb_any( skb ); list->buffer[8].address = 0; list->buffer[9].address = 0;