summaryrefslogtreecommitdiffstats
path: root/drivers/net/team/team_mode_broadcast.c
diff options
context:
space:
mode:
authorJiri Pirko2012-08-17 06:00:48 +0200
committerDavid S. Miller2012-08-20 11:40:48 +0200
commit1d76efe1577b4323609b1bcbfafa8b731eda071a (patch)
treeddf6fddeee02ad33f304dd5479f57208245a3f88 /drivers/net/team/team_mode_broadcast.c
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/ppwask... (diff)
downloadkernel-qcow2-linux-1d76efe1577b4323609b1bcbfafa8b731eda071a.tar.gz
kernel-qcow2-linux-1d76efe1577b4323609b1bcbfafa8b731eda071a.tar.xz
kernel-qcow2-linux-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/team_mode_broadcast.c')
-rw-r--r--drivers/net/team/team_mode_broadcast.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/team/team_mode_broadcast.c b/drivers/net/team/team_mode_broadcast.c
index c96e4d2967f0..9db0171e9366 100644
--- a/drivers/net/team/team_mode_broadcast.c
+++ b/drivers/net/team/team_mode_broadcast.c
@@ -48,18 +48,18 @@ static bool bc_transmit(struct team *team, struct sk_buff *skb)
static int bc_port_enter(struct team *team, struct team_port *port)
{
- return team_port_set_team_mac(port);
+ return team_port_set_team_dev_addr(port);
}
-static void bc_port_change_mac(struct team *team, struct team_port *port)
+static void bc_port_change_dev_addr(struct team *team, struct team_port *port)
{
- team_port_set_team_mac(port);
+ team_port_set_team_dev_addr(port);
}
static const struct team_mode_ops bc_mode_ops = {
.transmit = bc_transmit,
.port_enter = bc_port_enter,
- .port_change_mac = bc_port_change_mac,
+ .port_change_dev_addr = bc_port_change_dev_addr,
};
static const struct team_mode bc_mode = {