diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-10-14 21:22:59 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-10-14 21:22:59 +0400 |
| commit | 4db89e149cde12f9390bfe90807cf4c5de74fcde (patch) | |
| tree | 0c43ca509fa55ffcad187a8f52f59d64f1d941a0 /net/wireless/core.c | |
| parent | 4978705d26149a629b9f50ff221caed6f1ae3048 (diff) | |
| parent | d86aa4f8ca58898ec6a94c0635da20b948171ed7 (diff) | |
| download | linux-4db89e149cde12f9390bfe90807cf4c5de74fcde.tar.xz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index fe8d4f2be49b..aff959e5a1b3 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -958,8 +958,6 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, case NETDEV_PRE_UP: if (!(wdev->wiphy->interface_modes & BIT(wdev->iftype))) return notifier_from_errno(-EOPNOTSUPP); - if (rfkill_blocked(rdev->rfkill)) - return notifier_from_errno(-ERFKILL); ret = cfg80211_can_add_interface(rdev, wdev->iftype); if (ret) return notifier_from_errno(ret); |