diff options
author | Arik Nemtsov <arik@wizery.com> | 2014-05-26 14:40:51 +0300 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2014-07-11 13:33:43 +0100 |
commit | 37543a4eb018efe38c35612b4666d92014812563 (patch) | |
tree | a5c0a1d081057ccacba0c157fcbac080a91a376f /net | |
parent | e4a0cc2688a0d43d54eac22b731a79b6917d138d (diff) | |
download | kernel_samsung_smdk4412-37543a4eb018efe38c35612b4666d92014812563.zip kernel_samsung_smdk4412-37543a4eb018efe38c35612b4666d92014812563.tar.gz kernel_samsung_smdk4412-37543a4eb018efe38c35612b4666d92014812563.tar.bz2 |
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: Ben Hutchings <ben@decadent.org.uk>
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 9352819..880a55d 100644 --- a/net/mac80211/debugfs_netdev.c +++ b/net/mac80211/debugfs_netdev.c @@ -33,8 +33,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(); freebuf: |