1 files changed, 19 insertions, 2 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index d767cfb9b45f..b055f6a55c68 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -893,10 +893,15 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
         /* mac80211 supports control port protocol changing */
         local->hw.wiphy->flags |= WIPHY_FLAG_CONTROL_PORT_PROTOCOL;
 
-        if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM)
+        if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM) {
                 local->hw.wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
-        else if (local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)
+        } else if (local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC) {
                 local->hw.wiphy->signal_type = CFG80211_SIGNAL_TYPE_UNSPEC;
+                if (hw->max_signal <= 0) {
+                        result = -EINVAL;
+                        goto fail_wiphy_register;
+                }
+        }
 
         WARN((local->hw.flags & IEEE80211_HW_SUPPORTS_UAPSD)
              && (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK),
@@ -1071,6 +1076,18 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
 }
 EXPORT_SYMBOL(ieee80211_register_hw);
 
+void ieee80211_napi_add(struct ieee80211_hw *hw, struct napi_struct *napi,
+                        struct net_device *napi_dev,
+                        int (*poll)(struct napi_struct *, int),
+                        int weight)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
+
+        netif_napi_add(napi_dev, napi, poll, weight);
+        local->napi = napi;
+}
+EXPORT_SYMBOL_GPL(ieee80211_napi_add);
+
 void ieee80211_unregister_hw(struct ieee80211_hw *hw)
 {
         struct ieee80211_local *local = hw_to_local(hw);