lkml.org 
[lkml]   [2008]   [Aug]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH -next] net: fix compilation NG when !CONFIG_MODULE
    From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>

    CC net/core/dev.o
    net/core/dev.c:1001: error: redefinition of 'dev_load'
    include/linux/netdevice.h:1645: error: previous definition of 'dev_load' was here
    make[2]: *** [net/core/dev.o] Error 1

    dev_load() is not used when CONFIG_MODULE disabled.

    Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
    ---
    net/core/dev.c | 3 ++-
    1 files changed, 2 insertions(+), 1 deletions(-)

    diff --git a/net/core/dev.c b/net/core/dev.c
    index b0a1ee8..bde9790 100644
    --- a/net/core/dev.c
    +++ b/net/core/dev.c
    @@ -996,7 +996,7 @@ EXPORT_SYMBOL(netdev_bonding_change);
    * privileges this function loads the module. If module loading is not
    * available in this kernel then it becomes a nop.
    */
    -
    +#ifdef CONFIG_MODULES
    void dev_load(struct net *net, const char *name)
    {
    struct net_device *dev;
    @@ -1008,6 +1008,7 @@ void dev_load(struct net *net, const char *name)
    if (!dev && capable(CAP_SYS_MODULE))
    request_module("%s", name);
    }
    +#endif

    /**
    * dev_open - prepare an interface for use.
    --
    1.5.6



    \
     
     \ /
      Last update: 2008-08-27 01:53    [W:0.021 / U:29.684 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site