diff options
author | Jiri Pirko <jpirko@redhat.com> | 2011-09-02 23:34:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-09-15 17:32:26 -0400 |
commit | 4bc71cb983fd2844e603bf633df2bb53385182d2 (patch) | |
tree | 067b6df32fda6c554b2b9263a94a585c2e5a832d /drivers/scsi/fcoe | |
parent | c5dac7c9984d8a034eb7ae149cedf23ec9259f98 (diff) |
net: consolidate and fix ethtool_ops->get_settings calling
This patch does several things:
- introduces __ethtool_get_settings which is called from ethtool code and
from drivers as well. Put ASSERT_RTNL there.
- dev_ethtool_get_settings() is replaced by __ethtool_get_settings()
- changes calling in drivers so rtnl locking is respected. In
iboe_get_rate was previously ->get_settings() called unlocked. This
fixes it. Also prb_calc_retire_blk_tmo() in af_packet.c had the same
problem. Also fixed by calling __dev_get_by_index() instead of
dev_get_by_index() and holding rtnl_lock for both calls.
- introduces rtnl_lock in bnx2fc_vport_create() and fcoe_vport_create()
so bnx2fc_if_create() and fcoe_if_create() are called locked as they
are from other places.
- use __ethtool_get_settings() in bonding code
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
v2->v3:
-removed dev_ethtool_get_settings()
-added ASSERT_RTNL into __ethtool_get_settings()
-prb_calc_retire_blk_tmo - use __dev_get_by_index() and lock
around it and __ethtool_get_settings() call
v1->v2:
add missing export_symbol
Reviewed-by: Ben Hutchings <bhutchings@solarflare.com> [except FCoE bits]
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/fcoe')
-rw-r--r-- | drivers/scsi/fcoe/fcoe.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index 3416ab673814..83aa3ac52c40 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c | |||
@@ -2043,7 +2043,7 @@ int fcoe_link_speed_update(struct fc_lport *lport) | |||
2043 | struct net_device *netdev = fcoe_netdev(lport); | 2043 | struct net_device *netdev = fcoe_netdev(lport); |
2044 | struct ethtool_cmd ecmd; | 2044 | struct ethtool_cmd ecmd; |
2045 | 2045 | ||
2046 | if (!dev_ethtool_get_settings(netdev, &ecmd)) { | 2046 | if (!__ethtool_get_settings(netdev, &ecmd)) { |
2047 | lport->link_supported_speeds &= | 2047 | lport->link_supported_speeds &= |
2048 | ~(FC_PORTSPEED_1GBIT | FC_PORTSPEED_10GBIT); | 2048 | ~(FC_PORTSPEED_1GBIT | FC_PORTSPEED_10GBIT); |
2049 | if (ecmd.supported & (SUPPORTED_1000baseT_Half | | 2049 | if (ecmd.supported & (SUPPORTED_1000baseT_Half | |
@@ -2452,7 +2452,9 @@ static int fcoe_vport_create(struct fc_vport *vport, bool disabled) | |||
2452 | } | 2452 | } |
2453 | 2453 | ||
2454 | mutex_lock(&fcoe_config_mutex); | 2454 | mutex_lock(&fcoe_config_mutex); |
2455 | rtnl_lock(); | ||
2455 | vn_port = fcoe_if_create(fcoe, &vport->dev, 1); | 2456 | vn_port = fcoe_if_create(fcoe, &vport->dev, 1); |
2457 | rtnl_unlock(); | ||
2456 | mutex_unlock(&fcoe_config_mutex); | 2458 | mutex_unlock(&fcoe_config_mutex); |
2457 | 2459 | ||
2458 | if (IS_ERR(vn_port)) { | 2460 | if (IS_ERR(vn_port)) { |