diff options
| author | Arik Nemtsov <arik@wizery.com> | 2014-05-26 14:40:51 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-09 11:14:01 -0700 |
| commit | ec19d1e30e66095c1d6977c067b70359e824c4bf (patch) | |
| tree | 6010c07f59ad7f85b5416df54da57323ebb085fc /net | |
| parent | 172a9e9a5fa2ee9db57769a7be4f11eec27437ee (diff) | |
| download | linux-3.10-ec19d1e30e66095c1d6977c067b70359e824c4bf.tar.gz linux-3.10-ec19d1e30e66095c1d6977c067b70359e824c4bf.tar.bz2 linux-3.10-ec19d1e30e66095c1d6977c067b70359e824c4bf.zip | |
mac80211: don't check netdev state for debugfs read/write
commit 923eaf367206e01f22c97aee22300e332d071916 upstream.
Doing so will lead to an oops for a p2p-dev interface, since it has
no netdev.
Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/debugfs_netdev.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c index 14abcf44f97..2d5b4f65c51 100644 --- a/net/mac80211/debugfs_netdev.c +++ b/net/mac80211/debugfs_netdev.c @@ -34,8 +34,7 @@ static ssize_t ieee80211_if_read( ssize_t ret = -EINVAL; read_lock(&dev_base_lock); - if (sdata->dev->reg_state == NETREG_REGISTERED) - ret = (*format)(sdata, buf, sizeof(buf)); + ret = (*format)(sdata, buf, sizeof(buf)); read_unlock(&dev_base_lock); if (ret >= 0) @@ -62,8 +61,7 @@ static ssize_t ieee80211_if_write( ret = -ENODEV; rtnl_lock(); - if (sdata->dev->reg_state == NETREG_REGISTERED) - ret = (*write)(sdata, buf, count); + ret = (*write)(sdata, buf, count); rtnl_unlock(); return ret; |