summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorEdward Cree <ecree@solarflare.com>2017-06-20 13:08:51 +0100
committerDavid S. Miller <davem@davemloft.net>2017-06-20 15:40:00 -0400
commit57f0c9cf58ff7fe479137ab847a886d0eed3ad1d (patch)
treeb51ba26f7cb76538a0261cb5577c66287b4880b3 /drivers/net
parentdb833d40ad3263b2ee3b59a1ba168bb3cfed8137 (diff)
downloadlinux-stable-57f0c9cf58ff7fe479137ab847a886d0eed3ad1d.tar.gz
linux-stable-57f0c9cf58ff7fe479137ab847a886d0eed3ad1d.tar.bz2
linux-stable-57f0c9cf58ff7fe479137ab847a886d0eed3ad1d.zip
sfc: remove duplicate up_write on VF filter_sem
Somehow two copies of the line 'up_write(&vf->efx->filter_sem);' got into efx_ef10_sriov_set_vf_vlan(). This would put the mutex in a bad state and cause all subsequent down attempts to hang. Fixes: 671b53eec2ed ("sfc: Ensure down_write(&filter_sem) and up_write() are matched before calling efx_net_open()") Signed-off-by: Edward Cree <ecree@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/sfc/ef10_sriov.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/ef10_sriov.c b/drivers/net/ethernet/sfc/ef10_sriov.c
index b7e4345c990d..019cef1d3cf7 100644
--- a/drivers/net/ethernet/sfc/ef10_sriov.c
+++ b/drivers/net/ethernet/sfc/ef10_sriov.c
@@ -661,8 +661,6 @@ restore_filters:
up_write(&vf->efx->filter_sem);
mutex_unlock(&vf->efx->mac_lock);
- up_write(&vf->efx->filter_sem);
-
rc2 = efx_net_open(vf->efx->net_dev);
if (rc2)
goto reset_nic;