diff options
| author | Roopa Prabhu <roopa@cumulusnetworks.com> | 2015-01-29 22:40:17 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-01 23:16:34 -0800 |
| commit | a16a8ee7f60327086a35b688c78b555a8b4ac363 (patch) | |
| tree | 8d3ada6f1604dff4639c41c87f11513b4df2f224 /drivers/net/team | |
| parent | c158cba38ccd6e7c7787a6ec904d97b9d22537f5 (diff) | |
| download | blackbird-op-linux-a16a8ee7f60327086a35b688c78b555a8b4ac363.tar.gz blackbird-op-linux-a16a8ee7f60327086a35b688c78b555a8b4ac363.zip | |
team: handle NETIF_F_HW_SWITCH_OFFLOAD flag and add ndo_bridge_setlink/dellink handlers
Currently ndo_bridge_setlink and ndo_bridge_dellink handlers point
to the default switchdev handlers
This follows my bonding driver changes.
I have only compile tested this patch. However similar
bonding code has been tested.
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/team')
| -rw-r--r-- | drivers/net/team/team.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 4b2bfc52c52f..0e62274e884a 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -28,6 +28,7 @@ #include <net/genetlink.h> #include <net/netlink.h> #include <net/sch_generic.h> +#include <net/switchdev.h> #include <generated/utsrelease.h> #include <linux/if_team.h> @@ -1925,7 +1926,7 @@ static netdev_features_t team_fix_features(struct net_device *dev, struct team *team = netdev_priv(dev); netdev_features_t mask; - mask = features; + mask = features | NETIF_F_HW_SWITCH_OFFLOAD; features &= ~NETIF_F_ONE_FOR_ALL; features |= NETIF_F_ALL_FOR_ALL; @@ -1975,6 +1976,8 @@ static const struct net_device_ops team_netdev_ops = { .ndo_del_slave = team_del_slave, .ndo_fix_features = team_fix_features, .ndo_change_carrier = team_change_carrier, + .ndo_bridge_setlink = ndo_dflt_netdev_switch_port_bridge_setlink, + .ndo_bridge_dellink = ndo_dflt_netdev_switch_port_bridge_dellink, }; /*********************** |
