Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[karo-tx-linux.git] / net / wireless / core.h

diff --git a/net/wireless/core.h b/net/wireless/core.h
index 74beff1e926f732bf11679e802638ab20467ed2b..af10e59af2d86f418bd7cc4e69914c9bb31831c7 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);
 }