| From: Arik Nemtsov <arik@wizery.com> |
| Date: Mon, 26 May 2014 14:40:51 +0300 |
| Subject: 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> |
| --- |
| net/mac80211/debugfs_netdev.c | 6 ++---- |
| 1 file changed, 2 insertions(+), 4 deletions(-) |
| |
| --- 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: |
