diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2018-07-29 11:34:51 +0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2018-08-03 05:19:41 +0300 |
| commit | 577e07ffbad9960551a6821b74af90a216ac10e2 (patch) | |
| tree | e9129a517153179534895bb7092d29817e7cf1e1 /drivers/infiniband/ulp/ipoib/ipoib_vlan.c | |
| parent | 94245f4ad9e10c161affaa4763136d29fbe91cb9 (diff) | |
| download | linux-577e07ffbad9960551a6821b74af90a216ac10e2.tar.xz | |
IB/ipoib: Get rid of IPOIB_FLAG_GOING_DOWN
This essentially duplicates the netdev's reg_state, so just use that
directly. The reg_state is updated under the rntl_lock, and all places
using GOING_DOWN already acquire the rtnl_lock so checking is safe.
Since the only place we use GOING_DOWN is for the parent device this
does not fix any bugs, but it is a step to tidy up the unregister flow
so that after later patches the flow is uniform and sane.
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib_vlan.c')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c index b067ad5e4c7e..1b7bfd500893 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c @@ -127,9 +127,6 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey) ppriv = ipoib_priv(pdev); - if (test_bit(IPOIB_FLAG_GOING_DOWN, &ppriv->flags)) - return -EPERM; - snprintf(intf_name, sizeof(intf_name), "%s.%04x", ppriv->dev->name, pkey); @@ -141,6 +138,12 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey) return restart_syscall(); } + if (pdev->reg_state != NETREG_REGISTERED) { + rtnl_unlock(); + mutex_unlock(&ppriv->sysfs_mutex); + return -EPERM; + } + if (!down_write_trylock(&ppriv->vlan_rwsem)) { rtnl_unlock(); mutex_unlock(&ppriv->sysfs_mutex); @@ -199,9 +202,6 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey) ppriv = ipoib_priv(pdev); - if (test_bit(IPOIB_FLAG_GOING_DOWN, &ppriv->flags)) - return -EPERM; - if (!mutex_trylock(&ppriv->sysfs_mutex)) return restart_syscall(); @@ -210,6 +210,12 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey) return restart_syscall(); } + if (pdev->reg_state != NETREG_REGISTERED) { + rtnl_unlock(); + mutex_unlock(&ppriv->sysfs_mutex); + return -EPERM; + } + if (!down_write_trylock(&ppriv->vlan_rwsem)) { rtnl_unlock(); mutex_unlock(&ppriv->sysfs_mutex); |