diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-11-17 05:16:04 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-18 20:54:59 +0100 |
| commit | 234a8fd49d086f5a3debb379bfdf4e6b51f0c0e2 (patch) | |
| tree | 4ce3c4becc8f6b5ec0dd690f27569b25741b6f90 | |
| parent | Phonet: set the pipe handle using setsockopt (diff) | |
| download | linux-234a8fd49d086f5a3debb379bfdf4e6b51f0c0e2.tar.xz linux-234a8fd49d086f5a3debb379bfdf4e6b51f0c0e2.zip | |
team: add fix_features
do fix features in similar way as bonding code does
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/team/team.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index f3092749b072..5b169c18aaf6 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -953,6 +953,27 @@ static int team_del_slave(struct net_device *dev, struct net_device *port_dev) return err; } +static netdev_features_t team_fix_features(struct net_device *dev, + netdev_features_t features) +{ + struct team_port *port; + struct team *team = netdev_priv(dev); + netdev_features_t mask; + + mask = features; + features &= ~NETIF_F_ONE_FOR_ALL; + features |= NETIF_F_ALL_FOR_ALL; + + rcu_read_lock(); + list_for_each_entry_rcu(port, &team->port_list, list) { + features = netdev_increment_features(features, + port->dev->features, + mask); + } + rcu_read_unlock(); + return features; +} + static const struct net_device_ops team_netdev_ops = { .ndo_init = team_init, .ndo_uninit = team_uninit, @@ -968,6 +989,7 @@ static const struct net_device_ops team_netdev_ops = { .ndo_vlan_rx_kill_vid = team_vlan_rx_kill_vid, .ndo_add_slave = team_add_slave, .ndo_del_slave = team_del_slave, + .ndo_fix_features = team_fix_features, }; |