diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 23:29:16 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 23:29:16 +0300 |
commit | 6adc19fd13f11883c44df67b551cf8201e6bba1d (patch) | |
tree | 455e80aca7b57b17069fab252261c4dcae44374d /drivers/net/team/Kconfig | |
parent | 3df83e164f1f39c614a3f31e39164756945ae2ea (diff) | |
parent | a7f7f6248d9740d710fd6bd190293fe5e16410ac (diff) | |
download | linux-6adc19fd13f11883c44df67b551cf8201e6bba1d.tar.xz |
Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild updates from Masahiro Yamada:
- fix build rules in binderfs sample
- fix build errors when Kbuild recurses to the top Makefile
- covert '---help---' in Kconfig to 'help'
* tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
treewide: replace '---help---' in Kconfig files with 'help'
kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
samples: binderfs: really compile this sample and fix build issues
Diffstat (limited to 'drivers/net/team/Kconfig')
-rw-r--r-- | drivers/net/team/Kconfig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/team/Kconfig b/drivers/net/team/Kconfig index 2aa9fd7b57df..4d449845dac7 100644 --- a/drivers/net/team/Kconfig +++ b/drivers/net/team/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only menuconfig NET_TEAM tristate "Ethernet team driver support" - ---help--- + help This allows one to create virtual interfaces that teams together multiple ethernet devices. @@ -18,7 +18,7 @@ if NET_TEAM config NET_TEAM_MODE_BROADCAST tristate "Broadcast mode support" depends on NET_TEAM - ---help--- + help Basic mode where packets are transmitted always by all suitable ports. All added ports are setup to have team's device address. @@ -29,7 +29,7 @@ config NET_TEAM_MODE_BROADCAST config NET_TEAM_MODE_ROUNDROBIN tristate "Round-robin mode support" depends on NET_TEAM - ---help--- + help Basic mode where port used for transmitting packets is selected in round-robin fashion using packet counter. @@ -41,7 +41,7 @@ config NET_TEAM_MODE_ROUNDROBIN config NET_TEAM_MODE_RANDOM tristate "Random mode support" depends on NET_TEAM - ---help--- + help Basic mode where port used for transmitting packets is selected randomly. @@ -53,7 +53,7 @@ config NET_TEAM_MODE_RANDOM config NET_TEAM_MODE_ACTIVEBACKUP tristate "Active-backup mode support" depends on NET_TEAM - ---help--- + help Only one port is active at a time and the rest of ports are used for backup. @@ -66,7 +66,7 @@ config NET_TEAM_MODE_ACTIVEBACKUP config NET_TEAM_MODE_LOADBALANCE tristate "Load-balance mode support" depends on NET_TEAM - ---help--- + help This mode provides load balancing functionality. Tx port selection is done using BPF function set up from userspace (bpf_hash_func option) |