aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/team/Kconfig
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2012-08-17 04:00:48 +0000
committerDavid S. Miller <davem@davemloft.net>2012-08-20 02:40:48 -0700
commit1d76efe1577b4323609b1bcbfafa8b731eda071a (patch)
treeddf6fddeee02ad33f304dd5479f57208245a3f88 /drivers/net/team/Kconfig
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net-next (diff)
downloadlinux-dev-1d76efe1577b4323609b1bcbfafa8b731eda071a.tar.xz
linux-dev-1d76efe1577b4323609b1bcbfafa8b731eda071a.zip
team: add support for non-ethernet devices
This is resolved by two things: 1) allow dev_addr of different length than ETH_ALEN 2) during port add, check for dev->type and change it if necessary Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/team/Kconfig')
-rw-r--r--drivers/net/team/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/team/Kconfig b/drivers/net/team/Kconfig
index 6a7260b03a1e..6b08bd419fba 100644
--- a/drivers/net/team/Kconfig
+++ b/drivers/net/team/Kconfig
@@ -21,7 +21,7 @@ config NET_TEAM_MODE_BROADCAST
---help---
Basic mode where packets are transmitted always by all suitable ports.
- All added ports are setup to have team's mac address.
+ All added ports are setup to have team's device address.
To compile this team mode as a module, choose M here: the module
will be called team_mode_broadcast.
@@ -33,7 +33,7 @@ config NET_TEAM_MODE_ROUNDROBIN
Basic mode where port used for transmitting packets is selected in
round-robin fashion using packet counter.
- All added ports are setup to have team's mac address.
+ All added ports are setup to have team's device address.
To compile this team mode as a module, choose M here: the module
will be called team_mode_roundrobin.