Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
bbd4866e
Commit
bbd4866e
authored
Aug 03, 2003
by
Bart De Schuymer
Committed by
David S. Miller
Aug 03, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[BRIDGE]: Only build br_netfilter when INET is enabled.
parent
26e4bddd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
net/Kconfig
net/Kconfig
+0
-1
net/bridge/Makefile
net/bridge/Makefile
+3
-0
net/bridge/br.c
net/bridge/br.c
+2
-2
No files found.
net/Kconfig
View file @
bbd4866e
...
@@ -175,7 +175,6 @@ source "net/decnet/Kconfig"
...
@@ -175,7 +175,6 @@ source "net/decnet/Kconfig"
config BRIDGE
config BRIDGE
tristate "802.1d Ethernet Bridging"
tristate "802.1d Ethernet Bridging"
depends on INET
---help---
---help---
If you say Y here, then your Linux box will be able to act as an
If you say Y here, then your Linux box will be able to act as an
Ethernet bridge, which means that the different Ethernet segments it
Ethernet bridge, which means that the different Ethernet segments it
...
...
net/bridge/Makefile
View file @
bbd4866e
...
@@ -8,6 +8,9 @@ bridge-y := br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \
...
@@ -8,6 +8,9 @@ bridge-y := br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \
br_ioctl.o br_notify.o br_stp.o br_stp_bpdu.o
\
br_ioctl.o br_notify.o br_stp.o br_stp_bpdu.o
\
br_stp_if.o br_stp_timer.o
br_stp_if.o br_stp_timer.o
# br_netfilter only deals with IPv4 and ARP filtering, both are INET protocols
ifeq
($(CONFIG_INET),y)
bridge-$(CONFIG_NETFILTER)
+=
br_netfilter.o
bridge-$(CONFIG_NETFILTER)
+=
br_netfilter.o
endif
obj-$(CONFIG_BRIDGE_NF_EBTABLES)
+=
netfilter/
obj-$(CONFIG_BRIDGE_NF_EBTABLES)
+=
netfilter/
net/bridge/br.c
View file @
bbd4866e
...
@@ -34,7 +34,7 @@ static int __init br_init(void)
...
@@ -34,7 +34,7 @@ static int __init br_init(void)
{
{
printk
(
KERN_INFO
"NET4: Ethernet Bridge 008 for NET4.0
\n
"
);
printk
(
KERN_INFO
"NET4: Ethernet Bridge 008 for NET4.0
\n
"
);
#if
def CONFIG_NETFILTER
#if
defined(CONFIG_INET) && defined(CONFIG_NETFILTER)
if
(
br_netfilter_init
())
if
(
br_netfilter_init
())
return
1
;
return
1
;
#endif
#endif
...
@@ -52,7 +52,7 @@ static int __init br_init(void)
...
@@ -52,7 +52,7 @@ static int __init br_init(void)
static
void
__exit
br_deinit
(
void
)
static
void
__exit
br_deinit
(
void
)
{
{
#if
def CONFIG_NETFILTER
#if
defined(CONFIG_INET) && defined(CONFIG_NETFILTER)
br_netfilter_fini
();
br_netfilter_fini
();
#endif
#endif
unregister_netdevice_notifier
(
&
br_device_notifier
);
unregister_netdevice_notifier
(
&
br_device_notifier
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment