bonding: drop read_lock in bond_compute_features
authornikolay@redhat.com <nikolay@redhat.com>
Mon, 2 Sep 2013 11:51:42 +0000 (13:51 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Sep 2013 04:27:25 +0000 (00:27 -0400)
bond_compute_features is always called with RTNL held, so 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 c5ebdc57948fe06fd0f5435ab4b6012bba955a6c..39e5b1c7ffe21e09273ea3d7ddb17dff9ec02d27 100644 (file)
@@ -1116,15 +1116,13 @@ static netdev_features_t bond_fix_features(struct net_device *dev,
 
 static void bond_compute_features(struct bonding *bond)
 {
-       struct slave *slave;
-       struct net_device *bond_dev = bond->dev;
+       unsigned int flags, dst_release_flag = IFF_XMIT_DST_RELEASE;
        netdev_features_t vlan_features = BOND_VLAN_FEATURES;
        unsigned short max_hard_header_len = ETH_HLEN;
        unsigned int gso_max_size = GSO_MAX_SIZE;
+       struct net_device *bond_dev = bond->dev;
        u16 gso_max_segs = GSO_MAX_SEGS;
-       unsigned int flags, dst_release_flag = IFF_XMIT_DST_RELEASE;
-
-       read_lock(&bond->lock);
+       struct slave *slave;
 
        if (list_empty(&bond->slave_list))
                goto done;
@@ -1150,8 +1148,6 @@ done:
        flags = bond_dev->priv_flags & ~IFF_XMIT_DST_RELEASE;
        bond_dev->priv_flags = flags | dst_release_flag;
 
-       read_unlock(&bond->lock);
-
        netdev_change_features(bond_dev);
 }