Received: with ECARTIS (v1.0.0; list netdev); Mon, 19 Jul 2004 14:36:19 -0700 (PDT) Received: from ginger.cmf.nrl.navy.mil (ginger.cmf.nrl.navy.mil [134.207.10.161]) by oss.sgi.com (8.13.0/8.13.0) with ESMTP id i6JLaDqm029366 for ; Mon, 19 Jul 2004 14:36:14 -0700 Received: from cmf.nrl.navy.mil (thirdoffive.cmf.nrl.navy.mil [134.207.10.180]) by ginger.cmf.nrl.navy.mil (8.12.11/8.12.11) with ESMTP id i6JLa4QO028602; Mon, 19 Jul 2004 17:36:04 -0400 (EDT) Message-Id: <200407192136.i6JLa4QO028602@ginger.cmf.nrl.navy.mil> To: davem@redhat.com Cc: netdev@oss.sgi.com, Stephen Hemminger Subject: Re: [PATCH] br2684 - use try_module_get appropriately In-Reply-To: Message from Stephen Hemminger of "Mon, 28 Jun 2004 09:33:17 PDT." <20040628093317.218220fe@dell_ss3.pdx.osdl.net> Date: Mon, 19 Jul 2004 17:36:05 -0400 From: "chas williams (contractor)" X-Virus-Scanned: NAI Completed X-Scanned-By: MIMEDefang 2.30 (www . roaringpenguin . com / mimedefang) X-archive-position: 7043 X-ecartis-version: Ecartis v1.0.0 Sender: netdev-bounce@oss.sgi.com Errors-to: netdev-bounce@oss.sgi.com X-original-sender: chas@cmf.nrl.navy.mil Precedence: bulk X-list: netdev In message <20040628093317.218220fe@dell_ss3.pdx.osdl.net>,Stephen Hemminger wr ites: >Either way, just an (void) try_module_get() is WRONG. dave, please apply to 2.6 --thanks # This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1819 -> 1.1820 # net/atm/pppoatm.c 1.12 -> 1.13 # net/atm/br2684.c 1.12 -> 1.13 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 04/07/19 chas@relax.cmf.nrl.navy.mil 1.1820 # [ATM]: use try_module_get appropriately (from Stephen Hemminger ) # -------------------------------------------- # diff -Nru a/net/atm/br2684.c b/net/atm/br2684.c --- a/net/atm/br2684.c Mon Jul 19 17:33:00 2004 +++ b/net/atm/br2684.c Mon Jul 19 17:33:00 2004 @@ -563,7 +563,7 @@ BRPRIV(skb->dev)->stats.rx_packets--; br2684_push(atmvcc, skb); } - (void) try_module_get(THIS_MODULE); + __module_get(THIS_MODULE); return 0; error: write_unlock_irq(&devs_lock); diff -Nru a/net/atm/pppoatm.c b/net/atm/pppoatm.c --- a/net/atm/pppoatm.c Mon Jul 19 17:33:00 2004 +++ b/net/atm/pppoatm.c Mon Jul 19 17:33:00 2004 @@ -307,7 +307,7 @@ atmvcc->user_back = pvcc; atmvcc->push = pppoatm_push; atmvcc->pop = pppoatm_pop; - (void) try_module_get(THIS_MODULE); + __module_get(THIS_MODULE); return 0; }