mac80211: implement hardware offload for remain-on-channel

[deliverable/linux.git] / net / mac80211 / main.c

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 4b088b3c25e8a61eec733547ba72686fc4df082e..485d36bc9a460bdd9a67ab63a1b5ce1f12d53c54 100644 (file)
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -609,6 +609,8 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
 
        ieee80211_led_names(local);
 
+       ieee80211_hw_roc_setup(local);
+
        return local_to_hw(local);
 }
 EXPORT_SYMBOL(ieee80211_alloc_hw);
@@ -753,7 +755,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
                }
        }
 
-       local->hw.wiphy->max_remain_on_channel_duration = 5000;
+       if (!local->ops->remain_on_channel)
+               local->hw.wiphy->max_remain_on_channel_duration = 5000;
 
        result = wiphy_register(local->hw.wiphy);
        if (result < 0)