Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

[~andy/linux] / net / wireless / core.h

diff --git a/net/wireless/core.h b/net/wireless/core.h
index b43efac4efca786d3078c45220747e88eea168e2..eb0f7a3a25a96ed7f635993d67dd13d1dc27ea16 100644 (file)
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -402,6 +402,9 @@ static inline int
 cfg80211_can_add_interface(struct cfg80211_registered_device *rdev,
                           enum nl80211_iftype iftype)
 {
+       if (rfkill_blocked(rdev->rfkill))
+               return -ERFKILL;
+
        return cfg80211_can_change_interface(rdev, NULL, iftype);
 }