From patchwork Fri Dec 4 15:22:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chas williams - CONTRACTOR X-Patchwork-Id: 40334 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 022DEB6F08 for ; Sat, 5 Dec 2009 02:34:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755051AbZLDPe1 (ORCPT ); Fri, 4 Dec 2009 10:34:27 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754397AbZLDPe0 (ORCPT ); Fri, 4 Dec 2009 10:34:26 -0500 Received: from hedwig.cmf.nrl.navy.mil ([134.207.12.162]:57005 "EHLO hedwig.cmf.nrl.navy.mil" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751147AbZLDPe0 (ORCPT ); Fri, 4 Dec 2009 10:34:26 -0500 X-Greylist: delayed 895 seconds by postgrey-1.27 at vger.kernel.org; Fri, 04 Dec 2009 10:34:26 EST Received: from cmf.nrl.navy.mil (thirdoffive.cmf.nrl.navy.mil [134.207.12.180]) by hedwig.cmf.nrl.navy.mil (8.14.2/8.14.2) with ESMTP id nB4FMHTd031388 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Fri, 4 Dec 2009 10:22:18 -0500 Received: from thirdoffive.cmf.nrl.navy.mil (chas@localhost) by cmf.nrl.navy.mil (8.14.3/8.14.3/Submit) with ESMTP id nB4FMHgq028277 for ; Fri, 4 Dec 2009 10:22:17 -0500 Message-Id: <200912041522.nB4FMHgq028277@cmf.nrl.navy.mil> To: netdev@vger.kernel.org Subject: [PATCH 2/2] atm: [he] adjust tests to account for sk_wmem_alloc changes Date: Fri, 04 Dec 2009 10:22:17 -0500 From: "chas williams - CONTRACTOR" X-NRLCMF-Spam-Score: () hits=-0.001 X-NRLCMF-Virus-Scanned: No virus found X-Scanned-By: MIMEDefang 2.64 on 134.207.12.162 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: chas williams - CONTRACTOR atm: [he] adjust tests to account for sk_wmem_alloc changes due to reference counting sk_wmem_alloc now has a value of 1 when all the outstanding data has been sent. Signed-off-by: Chas Williams - CONTRACTOR --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/atm/he.c b/drivers/atm/he.c index 7066703..d744d62 100644 --- a/drivers/atm/he.c +++ b/drivers/atm/he.c @@ -2505,7 +2505,7 @@ he_close(struct atm_vcc *vcc) * TBRQ, the host issues the close command to the adapter. */ - while (((tx_inuse = atomic_read(&sk_atm(vcc)->sk_wmem_alloc)) > 0) && + while (((tx_inuse = atomic_read(&sk_atm(vcc)->sk_wmem_alloc)) > 1) && (retry < MAX_RETRY)) { msleep(sleep); if (sleep < 250) @@ -2514,7 +2514,7 @@ he_close(struct atm_vcc *vcc) ++retry; } - if (tx_inuse) + if (tx_inuse > 1) hprintk("close tx cid 0x%x tx_inuse = %d\n", cid, tx_inuse); /* 2.3.1.1 generic close operations with flush */