Home » Mailing list archives » linux-netdev » 2008 » September » 5

[PATCH -mm] Fix dev_load() compilation again

Previous thread: include/linux/skbuff.h: checksumming documentation by Ben Dooks on Friday, September 5, 2008 - 12:47 pm. (3 messages)

Next thread: [patch for 2.6.27? 3/6] e1000: prevent corruption of EEPROM/NVM by akpm on Friday, September 5, 2008 - 5:04 pm. (3 messages)
[view original message]
From: Alexey Dobriyan <adobriyan@...>
To: Andrew Morton <akpm@...>
Cc: <linux-kernel@...>, <h-shimamoto@...>, <netdev@...>
Subject: [PATCH -mm] Fix dev_load() compilation again
Date: Friday, September 5, 2008 - 3:32 pm

dev_load() doesn't exist if MODULES=n.


Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

---


 include/linux/netdevice.h |    6 ++++++

 1 file changed, 6 insertions(+)


--- a/include/linux/netdevice.h

+++ b/include/linux/netdevice.h

@@ -1639,7 +1639,13 @@ extern int		dev_set_allmulti(struct net_device *dev, int inc);

 extern void		netdev_state_change(struct net_device *dev);

 extern void		netdev_bonding_change(struct net_device *dev);

 extern void		netdev_features_change(struct net_device *dev);

+#ifdef CONFIG_MODULES

 extern void		dev_load(struct net *net, const char *name);

+#else

+static inline void dev_load(struct net *net, const char *name)

+{

+}

+#endif

 extern void		dev_mcast_init(void);

 extern int		netdev_max_backlog;

 extern int		weight_p;


--
[view original message]
From: Hiroshi Shimamoto <h-shimamoto@...>
To: Alexey Dobriyan <adobriyan@...>
Cc: Andrew Morton <akpm@...>, <linux-kernel@...>, <netdev@...>, Stephen Rothwell <sfr@...>
Subject: Re: [PATCH -mm] Fix dev_load() compilation again
Date: Friday, September 5, 2008 - 3:54 pm

Hi,


in -next tree, this patch fixes the compilation error instead of

my patch. So, there is a conflict.


commit 9b90dc7bc3079376567fc501e2e84751fa4040fd

Author: Stephen Rothwell <sfr@canb.auug.org.au>

Date:   Wed Aug 27 14:45:37 2008 +1000


    rr: build fix for remove CONFIG_KMOD from net


    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>


thanks,

Hiroshi Shimamoto

--
[view original message]
From: Andrew Morton <akpm@...>
To: Hiroshi Shimamoto <h-shimamoto@...>
Cc: <adobriyan@...>, <linux-kernel@...>, <netdev@...>, <sfr@...>, Johannes Berg <johannes@...>, Rusty Russell <rusty@...>
Subject: Re: [PATCH -mm] Fix dev_load() compilation again
Date: Monday, September 8, 2008 - 6:17 pm

On Fri, 05 Sep 2008 12:54:51 -0700


Give that there's already a fix in linux-next, I can't do anything here.


Rusty, the regression was introduced by


commit 4cb9da6ecc2b0e25056b45981239475f8509d59d

Author:     Johannes Berg <johannes@sipsolutions.net>

AuthorDate: Wed Jul 9 10:28:42 2008 +0200

Commit:     Stephen Rothwell <sfr@canb.auug.org.au>

CommitDate: Tue Aug 26 10:19:47 2008 +1000


    remove CONFIG_KMOD from net


    Some code here depends on CONFIG_KMOD to not try to load

    protocol modules or similar, replace by CONFIG_MODULES

    where more than just request_module depends on CONFIG_KMOD

    and and also use try_then_request_module in ebtables.


    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

    Cc: netdev@vger.kernel.org

    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>


Could you please take care of getting it fixed up?


Thanks.

--
[view original message]
From: Johannes Berg <johannes@...>
To: Andrew Morton <akpm@...>
Cc: Hiroshi Shimamoto <h-shimamoto@...>, <adobriyan@...>, <linux-kernel@...>, <netdev@...>, <sfr@...>, Rusty Russell <rusty@...>
Subject: Re: [PATCH -mm] Fix dev_load() compilation again
Date: Tuesday, September 9, 2008 - 2:27 am

Hi,


I think I like this patch better than Stephen's, but despite causing the


Rusty, can you take

http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.27-rc...

.6.27-rc5-mm1/broken-out/net-fix-compilation-ng-when-config_module.patch


(although I'd rather see the blank line stay) and fold it into that

patch or put it into the tree that Stephen pulls?


johannes
[view original message]
From: Stephen Rothwell <sfr@...>
To: Hiroshi Shimamoto <h-shimamoto@...>
Cc: Alexey Dobriyan <adobriyan@...>, Andrew Morton <akpm@...>, <linux-kernel@...>, <netdev@...>
Subject: Re: [PATCH -mm] Fix dev_load() compilation again
Date: Sunday, September 7, 2008 - 12:08 am

Hi Hiroshi,


On Fri, 05 Sep 2008 12:54:51 -0700 Hiroshi Shimamoto <h-shimamoto@ct.jp.nec=


My patch is a temporary work around and will be dropped if the fix turns

up in any of the trees that I merge.


--=20

Cheers,

Stephen Rothwell                    sfr@canb.auug.org.au

http://www.canb.auug.org.au/~sfr/
Previous thread: include/linux/skbuff.h: checksumming documentation by Ben Dooks on Friday, September 5, 2008 - 12:47 pm. (3 messages)

Next thread: [patch for 2.6.27? 3/6] e1000: prevent corruption of EEPROM/NVM by akpm on Friday, September 5, 2008 - 5:04 pm. (3 messages)