Author: hselasky
Date: Tue Mar 10 21:17:10 2015
New Revision: 279865
URL: https://svnweb.freebsd.org/changeset/base/279865
Log:
Ensure setting promiscious mode when a network interface is up, is
always non-blocking by not locking a SX type of mutex.
Sponsored by: Mellanox Technologies
MFC after: 3 days
Modified:
head/sys/ofed/drivers/net/mlx4/en_netdev.c
Modified: head/sys/ofed/drivers/net/mlx4/en_netdev.c
==============================================================================
--- head/sys/ofed/drivers/net/mlx4/en_netdev.c Tue Mar 10 21:08:58 2015
(r279864)
+++ head/sys/ofed/drivers/net/mlx4/en_netdev.c Tue Mar 10 21:17:10 2015
(r279865)
@@ -1916,19 +1916,22 @@ static int mlx4_en_ioctl(struct ifnet *d
error = -mlx4_en_change_mtu(dev, ifr->ifr_mtu);
break;
case SIOCSIFFLAGS:
- mutex_lock(&mdev->state_lock);
if (dev->if_flags & IFF_UP) {
- if ((dev->if_drv_flags & IFF_DRV_RUNNING) == 0)
+ if ((dev->if_drv_flags & IFF_DRV_RUNNING) == 0) {
+ mutex_lock(&mdev->state_lock);
mlx4_en_start_port(dev);
- else
+ mutex_unlock(&mdev->state_lock);
+ } else {
mlx4_en_set_rx_mode(dev);
+ }
} else {
+ mutex_lock(&mdev->state_lock);
if (dev->if_drv_flags & IFF_DRV_RUNNING) {
mlx4_en_stop_port(dev);
- if_link_state_change(dev, LINK_STATE_DOWN);
+ if_link_state_change(dev, LINK_STATE_DOWN);
}
+ mutex_unlock(&mdev->state_lock);
}
- mutex_unlock(&mdev->state_lock);
break;
case SIOCADDMULTI:
case SIOCDELMULTI:
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
