55 lines
1.5 KiB
Diff
55 lines
1.5 KiB
Diff
From: Jiri Pirko <jpirko@redhat.com>
|
|
Date: Thu, 17 Nov 2011 04:16:04 +0000
|
|
Subject: [05/23] team: add fix_features
|
|
|
|
commit 234a8fd49d086f5a3debb379bfdf4e6b51f0c0e2 upstream.
|
|
|
|
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>
|
|
---
|
|
drivers/net/team/team.c | 22 ++++++++++++++++++++++
|
|
1 file changed, 22 insertions(+)
|
|
|
|
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
|
|
index f309274..5b169c1 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,
|
|
};
|
|
|
|
|