From: Adrian Bunk <bunk@stusta.de>
To: shemminger@osdl.org, bridge@osdl.org, chas@cmf.nrl.navy.mil
Cc: linux-atm-general@lists.sourceforge.net,
linux-kernel@vger.kernel.org, netdev@oss.sgi.co
Subject: [Bridge] [2.6 patch] fix bridge <-> ATM compile error
Date: Tue, 15 Mar 2005 13:19:30 +0100 [thread overview]
Message-ID: <20050315121930.GE3189@stusta.de> (raw)
This patch fixes the following compile error with CONFIG_BRIDGE=y and
CONFIG_ATM_LANE=m:
<-- snip -->
...
LD .tmp_vmlinux1
net/built-in.o(.init.text+0x3ad1): In function `br_init':
: undefined reference to `br_fdb_get_hook'
net/built-in.o(.init.text+0x3adb): In function `br_init':
: undefined reference to `br_fdb_put_hook'
net/built-in.o(.exit.text+0xa2): In function `br_deinit':
: undefined reference to `br_fdb_get_hook'
net/built-in.o(.exit.text+0xac): In function `br_deinit':
: undefined reference to `br_fdb_put_hook'
make: *** [.tmp_vmlinux1] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
net/bridge/br.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
--- linux-2.6.11-mm3-modular/net/bridge/br.c.old 2005-03-15 03:23:10.000000000 +0100
+++ linux-2.6.11-mm3-modular/net/bridge/br.c 2005-03-15 03:24:05.000000000 +0100
@@ -22,7 +22,7 @@
#include "br_private.h"
-#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
+#if defined(CONFIG_ATM_LANE) || (defined(CONFIG_ATM_LANE_MODULE) && defined(MODULE))
#include "../atm/lec.h"
#endif
@@ -39,7 +39,7 @@
brioctl_set(br_ioctl_deviceless_stub);
br_handle_frame_hook = br_handle_frame;
-#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
+#if defined(CONFIG_ATM_LANE) || (defined(CONFIG_ATM_LANE_MODULE) && defined(MODULE))
br_fdb_get_hook = br_fdb_get;
br_fdb_put_hook = br_fdb_put;
#endif
@@ -60,7 +60,7 @@
synchronize_net();
-#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
+#if defined(CONFIG_ATM_LANE) || (defined(CONFIG_ATM_LANE_MODULE) && defined(MODULE))
br_fdb_get_hook = NULL;
br_fdb_put_hook = NULL;
#endif
WARNING: multiple messages have this Message-ID (diff)
From: Adrian Bunk <bunk@stusta.de>
To: shemminger@osdl.org, bridge@osdl.org, chas@cmf.nrl.navy.mil
Cc: linux-atm-general@lists.sourceforge.net, netdev@oss.sgi.co,
linux-kernel@vger.kernel.org
Subject: [2.6 patch] fix bridge <-> ATM compile error
Date: Tue, 15 Mar 2005 13:19:30 +0100 [thread overview]
Message-ID: <20050315121930.GE3189@stusta.de> (raw)
This patch fixes the following compile error with CONFIG_BRIDGE=y and
CONFIG_ATM_LANE=m:
<-- snip -->
...
LD .tmp_vmlinux1
net/built-in.o(.init.text+0x3ad1): In function `br_init':
: undefined reference to `br_fdb_get_hook'
net/built-in.o(.init.text+0x3adb): In function `br_init':
: undefined reference to `br_fdb_put_hook'
net/built-in.o(.exit.text+0xa2): In function `br_deinit':
: undefined reference to `br_fdb_get_hook'
net/built-in.o(.exit.text+0xac): In function `br_deinit':
: undefined reference to `br_fdb_put_hook'
make: *** [.tmp_vmlinux1] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
net/bridge/br.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
--- linux-2.6.11-mm3-modular/net/bridge/br.c.old 2005-03-15 03:23:10.000000000 +0100
+++ linux-2.6.11-mm3-modular/net/bridge/br.c 2005-03-15 03:24:05.000000000 +0100
@@ -22,7 +22,7 @@
#include "br_private.h"
-#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
+#if defined(CONFIG_ATM_LANE) || (defined(CONFIG_ATM_LANE_MODULE) && defined(MODULE))
#include "../atm/lec.h"
#endif
@@ -39,7 +39,7 @@
brioctl_set(br_ioctl_deviceless_stub);
br_handle_frame_hook = br_handle_frame;
-#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
+#if defined(CONFIG_ATM_LANE) || (defined(CONFIG_ATM_LANE_MODULE) && defined(MODULE))
br_fdb_get_hook = br_fdb_get;
br_fdb_put_hook = br_fdb_put;
#endif
@@ -60,7 +60,7 @@
synchronize_net();
-#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
+#if defined(CONFIG_ATM_LANE) || (defined(CONFIG_ATM_LANE_MODULE) && defined(MODULE))
br_fdb_get_hook = NULL;
br_fdb_put_hook = NULL;
#endif
next reply other threads:[~2005-03-15 12:19 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-15 12:19 Adrian Bunk [this message]
2005-03-15 12:19 ` [2.6 patch] fix bridge <-> ATM compile error Adrian Bunk
2005-03-15 17:13 ` [Bridge] " Stephen Hemminger
2005-03-15 17:13 ` Stephen Hemminger
2005-03-15 17:25 ` Adrian Bunk
2005-03-15 17:25 ` [Bridge] " Adrian Bunk
2005-03-15 17:25 ` Adrian Bunk
2005-03-16 16:11 ` [Bridge] " chas williams - CONTRACTOR
2005-03-16 16:11 ` chas williams - CONTRACTOR
2005-03-16 18:15 ` [Bridge] " Adrian Bunk
2005-03-16 18:15 ` Adrian Bunk
2005-03-16 18:24 ` [Bridge] " chas williams - CONTRACTOR
2005-03-16 18:24 ` chas williams - CONTRACTOR
2005-03-17 20:36 ` [Bridge] " chas williams - CONTRACTOR
2005-03-17 20:36 ` chas williams - CONTRACTOR
2005-03-19 23:04 ` [Bridge] " Adrian Bunk
2005-03-19 23:04 ` Adrian Bunk
2005-03-28 19:11 ` [Bridge] " Stephen Hemminger
2005-03-28 19:11 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050315121930.GE3189@stusta.de \
--to=bunk@stusta.de \
--cc=bridge@osdl.org \
--cc=chas@cmf.nrl.navy.mil \
--cc=linux-atm-general@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@oss.sgi.co \
--cc=shemminger@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.