From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from blaine.gmane.org ([80.91.229.8]:50192 "EHLO hugh.gmane.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753226AbZDHVOJ (ORCPT ); Wed, 8 Apr 2009 17:14:09 -0400 Received: from public by hugh.gmane.org with local (Exim 4.63) (envelope-from ) id 1Lrf5p-0005GB-LO for linux-wireless@vger.kernel.org; Wed, 08 Apr 2009 23:13:57 +0200 Message-ID: <49DD136B.50300@lwfinger.net> (sfid-20090408_231858_064681_E0AA7EBA) Date: Wed, 08 Apr 2009 16:13:15 -0500 From: Larry Finger MIME-Version: 1.0 To: Andreas Schwab CC: public-alan-jenkins-cCz0Lq7MMjm9FHfhHBbuYA@hugh.gmane.org, Larry Finger , Rusty Russell , Arjan van de Ven , LKML , "Rafael J. Wysocki" , wireless Subject: Re: Regression in 2.6.30-rc1 since commit acae0515 - wireless broken References: <49DC2DF5.3010603@lwfinger.net> <49DC31EA.8050208@linux.intel.com> <200904081631.09150.rusty@rustcorp.com.au> <49DCB976.4020200@lwfinger.net> <9b2b86520904081006m6e6b5276v834c3565b0f6f4c7@mail.gmail.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-wireless-owner@vger.kernel.org List-ID: Andreas Schwab wrote: > > > Alan Jenkins > writes: > >> I agree that commit looks like it should be a no-op though :-). > > But it isn't. > > Andreas. > > --- > Fix try_then_request_module to use waiting __request_module again. > > Signed-off-by: Andreas Schwab > --- > include/linux/kmod.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > Index: linux-2.6.30-rc1/include/linux/kmod.h > =================================================================== > --- linux-2.6.30-rc1.orig/include/linux/kmod.h 2009-04-08 12:47:54.000000000 +0200 > +++ linux-2.6.30-rc1/include/linux/kmod.h 2009-04-08 17:39:35.000000000 +0200 > @@ -34,7 +34,7 @@ extern int __request_module(bool wait, c > #define request_module(mod...) __request_module(true, mod) > #define request_module_nowait(mod...) __request_module(false, mod) > #define try_then_request_module(x, mod...) \ > - ((x) ?: (__request_module(false, mod), (x))) > + ((x) ?: (__request_module(true, mod), (x))) > #else > static inline int request_module(const char *name, ...) { return -ENOSYS; } > static inline int request_module_nowait(const char *name, ...) { return -ENOSYS; } > Bingo. The above patch fixes my system. Andreas, you have a much sharper eye than I do. Feel free to add a Tested-by: Larry Finger if you wish. Larry