Documentation/networking/bonding.txt | 2 +- MAINTAINERS | 2 +- drivers/net/Kconfig | 18 ------------------ drivers/net/Makefile | 1 - net/Kconfig | 19 +++++++++++++++++++ net/Makefile | 1 + {drivers/net => net}/bonding/Makefile | 0 {drivers/net => net}/bonding/bond_3ad.c | 0 {drivers/net => net}/bonding/bond_3ad.h | 0 {drivers/net => net}/bonding/bond_alb.c | 0 {drivers/net => net}/bonding/bond_alb.h | 0 {drivers/net => net}/bonding/bond_debugfs.c | 0 {drivers/net => net}/bonding/bond_ipv6.c | 0 {drivers/net => net}/bonding/bond_main.c | 0 {drivers/net => net}/bonding/bond_procfs.c | 0 {drivers/net => net}/bonding/bond_sysfs.c | 0 {drivers/net => net}/bonding/bonding.h | 0 17 files changed, 22 insertions(+), 21 deletions(-) diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt index 1f45bd8..c1b3924 100644 --- a/Documentation/networking/bonding.txt +++ b/Documentation/networking/bonding.txt @@ -114,7 +114,7 @@ the following steps: ----------------------------------------------- The current version of the bonding driver is available in the -drivers/net/bonding subdirectory of the most recent kernel source +net/bonding subdirectory of the most recent kernel source (which is available on http://kernel.org). Most users "rolling their own" will want to use the most recent kernel from kernel.org. diff --git a/MAINTAINERS b/MAINTAINERS index 49a0bf3..2eb2e79 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1495,7 +1495,7 @@ M: Andy Gospodarek L: netdev@vger.kernel.org W: http://sourceforge.net/projects/bonding/ S: Supported -F: drivers/net/bonding/ +F: net/bonding/ F: include/linux/if_bonding.h BROADCOM B44 10/100 ETHERNET DRIVER diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 19f04a3..a8d39e3 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -60,24 +60,6 @@ config DUMMY Instead of 'dummy', the devices will then be called 'dummy0', 'dummy1' etc. -config BONDING - tristate "Bonding driver support" - depends on INET - depends on IPV6 || IPV6=n - ---help--- - Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet - Channels together. This is called 'Etherchannel' by Cisco, - 'Trunking' by Sun, 802.3ad by the IEEE, and 'Bonding' in Linux. - - The driver supports multiple bonding modes to allow for both high - performance and high availability operation. - - Refer to for more - information. - - To compile this driver as a module, choose M here: the module - will be called bonding. - config MACVLAN tristate "MAC-VLAN support (EXPERIMENTAL)" depends on EXPERIMENTAL diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 209fbb7..6f1a3ca 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -25,7 +25,6 @@ obj-$(CONFIG_CHELSIO_T4) += cxgb4/ obj-$(CONFIG_CHELSIO_T4VF) += cxgb4vf/ obj-$(CONFIG_EHEA) += ehea/ obj-$(CONFIG_CAN) += can/ -obj-$(CONFIG_BONDING) += bonding/ obj-$(CONFIG_ATL1) += atlx/ obj-$(CONFIG_ATL2) += atlx/ obj-$(CONFIG_ATL1E) += atl1e/ diff --git a/net/Kconfig b/net/Kconfig index 878151c..e963cde 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -191,6 +191,25 @@ source "net/bridge/netfilter/Kconfig" endif +config BONDING + tristate "Bonding driver support" + depends on INET + depends on IPV6 || IPV6=n + ---help--- + Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet + Channels together. This is called 'Etherchannel' by Cisco, + 'Trunking' by Sun, 802.3ad by the IEEE, and 'Bonding' in Linux. + + The driver supports multiple bonding modes to allow for both high + performance and high availability operation. + + Refer to for more + information. + + To compile this driver as a module, choose M here: the module + will be called bonding. + + source "net/dccp/Kconfig" source "net/sctp/Kconfig" source "net/rds/Kconfig" diff --git a/net/Makefile b/net/Makefile index a51d946..1e74030 100644 --- a/net/Makefile +++ b/net/Makefile @@ -23,6 +23,7 @@ obj-$(CONFIG_NET) += ipv6/ obj-$(CONFIG_PACKET) += packet/ obj-$(CONFIG_NET_KEY) += key/ obj-$(CONFIG_BRIDGE) += bridge/ +obj-$(CONFIG_BONDING) += bonding/ obj-$(CONFIG_NET_DSA) += dsa/ obj-$(CONFIG_IPX) += ipx/ obj-$(CONFIG_ATALK) += appletalk/ diff --git a/drivers/net/bonding/Makefile b/net/bonding/Makefile similarity index 100% rename from drivers/net/bonding/Makefile rename to net/bonding/Makefile diff --git a/drivers/net/bonding/bond_3ad.c b/net/bonding/bond_3ad.c similarity index 100% rename from drivers/net/bonding/bond_3ad.c rename to net/bonding/bond_3ad.c diff --git a/drivers/net/bonding/bond_3ad.h b/net/bonding/bond_3ad.h similarity index 100% rename from drivers/net/bonding/bond_3ad.h rename to net/bonding/bond_3ad.h diff --git a/drivers/net/bonding/bond_alb.c b/net/bonding/bond_alb.c similarity index 100% rename from drivers/net/bonding/bond_alb.c rename to net/bonding/bond_alb.c diff --git a/drivers/net/bonding/bond_alb.h b/net/bonding/bond_alb.h similarity index 100% rename from drivers/net/bonding/bond_alb.h rename to net/bonding/bond_alb.h diff --git a/drivers/net/bonding/bond_debugfs.c b/net/bonding/bond_debugfs.c similarity index 100% rename from drivers/net/bonding/bond_debugfs.c rename to net/bonding/bond_debugfs.c diff --git a/drivers/net/bonding/bond_ipv6.c b/net/bonding/bond_ipv6.c similarity index 100% rename from drivers/net/bonding/bond_ipv6.c rename to net/bonding/bond_ipv6.c diff --git a/drivers/net/bonding/bond_main.c b/net/bonding/bond_main.c similarity index 100% rename from drivers/net/bonding/bond_main.c rename to net/bonding/bond_main.c diff --git a/drivers/net/bonding/bond_procfs.c b/net/bonding/bond_procfs.c similarity index 100% rename from drivers/net/bonding/bond_procfs.c rename to net/bonding/bond_procfs.c diff --git a/drivers/net/bonding/bond_sysfs.c b/net/bonding/bond_sysfs.c similarity index 100% rename from drivers/net/bonding/bond_sysfs.c rename to net/bonding/bond_sysfs.c diff --git a/drivers/net/bonding/bonding.h b/net/bonding/bonding.h similarity index 100% rename from drivers/net/bonding/bonding.h rename to net/bonding/bonding.h