1 files changed, 18 insertions, 2 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index e323d4e6647b..dddedfad5404 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -558,6 +558,19 @@ ieee80211_default_mgmt_stypes[NUM_NL80211_IFTYPES] = {
         },
 };
 
+static const struct ieee80211_ht_cap mac80211_ht_capa_mod_mask = {
+        .ampdu_params_info = IEEE80211_HT_AMPDU_PARM_FACTOR |
+                             IEEE80211_HT_AMPDU_PARM_DENSITY,
+
+        .cap_info = cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH_20_40 |
+                                IEEE80211_HT_CAP_MAX_AMSDU |
+                                IEEE80211_HT_CAP_SGI_40),
+        .mcs = {
+                .rx_mask = { 0xff, 0xff, 0xff, 0xff, 0xff,
+                             0xff, 0xff, 0xff, 0xff, 0xff, },
+        },
+};
+
 struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
                                         const struct ieee80211_ops *ops)
 {
@@ -594,7 +607,9 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
         wiphy->flags |= WIPHY_FLAG_NETNS_OK |
                         WIPHY_FLAG_4ADDR_AP |
                         WIPHY_FLAG_4ADDR_STATION |
-                        WIPHY_FLAG_REPORTS_OBSS;
+                        WIPHY_FLAG_REPORTS_OBSS |
+                        WIPHY_FLAG_OFFCHAN_TX |
+                        WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
 
         wiphy->features = NL80211_FEATURE_SK_TX_STATUS;
 
@@ -609,7 +624,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
 
         local->hw.priv = (char *)local + ALIGN(sizeof(*local), NETDEV_ALIGN);
 
-        BUG_ON(!ops->tx);
+        BUG_ON(!ops->tx && !ops->tx_frags);
         BUG_ON(!ops->start);
         BUG_ON(!ops->stop);
         BUG_ON(!ops->config);
@@ -629,6 +644,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
         local->user_power_level = -1;
         local->uapsd_queues = IEEE80211_DEFAULT_UAPSD_QUEUES;
         local->uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN;
+        wiphy->ht_capa_mod_mask = &mac80211_ht_capa_mod_mask;
 
         INIT_LIST_HEAD(&local->interfaces);