]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
bonding: drop read_lock in bond_fix_features
authornikolay@redhat.com <nikolay@redhat.com>
Mon, 2 Sep 2013 11:51:41 +0000 (13:51 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Sep 2013 04:27:25 +0000 (00:27 -0400)
We're protected by RTNL so nothing can happen and we can safely drop the
read bond->lock.

Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_main.c

index 486e04159bc314af77cd9df2d28005fb08ed287b..c5ebdc57948fe06fd0f5435ab4b6012bba955a6c 100644 (file)
@@ -1084,18 +1084,16 @@ static void bond_netpoll_cleanup(struct net_device *bond_dev)
 /*---------------------------------- IOCTL ----------------------------------*/
 
 static netdev_features_t bond_fix_features(struct net_device *dev,
-       netdev_features_t features)
+                                          netdev_features_t features)
 {
-       struct slave *slave;
        struct bonding *bond = netdev_priv(dev);
        netdev_features_t mask;
-
-       read_lock(&bond->lock);
+       struct slave *slave;
 
        if (list_empty(&bond->slave_list)) {
                /* Disable adding VLANs to empty bond. But why? --mq */
                features |= NETIF_F_VLAN_CHALLENGED;
-               goto out;
+               return features;
        }
 
        mask = features;
@@ -1109,8 +1107,6 @@ static netdev_features_t bond_fix_features(struct net_device *dev,
        }
        features = netdev_add_tso_features(features, mask);
 
-out:
-       read_unlock(&bond->lock);
        return features;
 }