diff options
| author | davem <davem> | 2001-12-24 00:56:41 +0000 |
|---|---|---|
| committer | davem <davem> | 2001-12-24 00:56:41 +0000 |
| commit | 8e415ed15437f6c879fd3c04b3d3b1bbdbb3b5da (patch) | |
| tree | 25e6c5325404cef3ccdb4a0d208aa93caa64ef65 | |
| parent | 17b23e5bd0c72b4b3946a8c9ed9d4b8a650fb303 (diff) | |
| download | netdev-vger-cvs-8e415ed15437f6c879fd3c04b3d3b1bbdbb3b5da.tar.gz | |
Make bridge dep_tristate on CONFIG_INET.
Remove CONFIG_INET ifdefs from bridging code.
From Lennert Buytenhek.
| -rw-r--r-- | net/Config.in | 2 | ||||
| -rw-r--r-- | net/bridge/br.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/net/Config.in b/net/Config.in index 2c1b04f4b..d111df17c 100644 --- a/net/Config.in +++ b/net/Config.in @@ -59,7 +59,7 @@ tristate 'DECnet Support' CONFIG_DECNET if [ "$CONFIG_DECNET" != "n" ]; then source net/decnet/Config.in fi -tristate '802.1d Ethernet Bridging' CONFIG_BRIDGE +dep_tristate '802.1d Ethernet Bridging' CONFIG_BRIDGE $CONFIG_INET if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then tristate 'CCITT X.25 Packet Layer (EXPERIMENTAL)' CONFIG_X25 tristate 'LAPB Data Link Driver (EXPERIMENTAL)' CONFIG_LAPB diff --git a/net/bridge/br.c b/net/bridge/br.c index 0e505d573..d9d0f5008 100644 --- a/net/bridge/br.c +++ b/net/bridge/br.c @@ -5,7 +5,7 @@ * Authors: * Lennert Buytenhek <buytenh@gnu.org> * - * $Id: br.c,v 1.46 2001-10-02 02:22:36 davem Exp $ + * $Id: br.c,v 1.47 2001-12-24 00:56:41 davem Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -43,9 +43,7 @@ static int __init br_init(void) printk(KERN_INFO "NET4: Ethernet Bridge 008 for NET4.0\n"); br_handle_frame_hook = br_handle_frame; -#ifdef CONFIG_INET br_ioctl_hook = br_ioctl_deviceless_stub; -#endif #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE) br_fdb_get_hook = br_fdb_get; br_fdb_put_hook = br_fdb_put; @@ -62,9 +60,7 @@ static void __br_clear_frame_hook(void) static void __br_clear_ioctl_hook(void) { -#ifdef CONFIG_INET br_ioctl_hook = NULL; -#endif } static void __exit br_deinit(void) |