From 9b7b165ac1adf5169f0ee03d107423ce7f5805d9 Mon Sep 17 00:00:00 2001 From: "nikolay@redhat.com" Date: Mon, 2 Sep 2013 13:51:41 +0200 Subject: [PATCH] bonding: drop read_lock in bond_fix_features We're protected by RTNL so nothing can happen and we can safely drop the read bond->lock. Signed-off-by: Nikolay Aleksandrov Signed-off-by: David S. Miller --- drivers/net/bonding/bond_main.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 486e041..c5ebdc5 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -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; } -- 2.7.4