--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -4547,7 +4547,7 @@ struct ieee80211_ops {
 				  u64 changed);
 	void (*nss_bss_info_changed)(struct ieee80211_hw *hw,
 				     struct ieee80211_vif *vif,
-				     u32 changed);
+				     u64 changed);
 	int (*start_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 			struct ieee80211_bss_conf *link_conf);
 	void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -4857,7 +4857,7 @@ struct ieee80211_ops {
 	int (*reset_tid_config)(struct ieee80211_hw *hw,
 				struct ieee80211_vif *vif,
 				struct ieee80211_sta *sta, u8 tids);
-	int (*update_vif_offload)(struct ieee80211_hw *hw,
+	void (*update_vif_offload)(struct ieee80211_hw *hw,
 				   struct ieee80211_vif *vif);
 	void (*sta_set_4addr)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 			      struct ieee80211_sta *sta, bool enabled);
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2767,7 +2767,7 @@ static int ieee80211_change_bss(struct w
 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 	struct ieee80211_link_data *link;
 	struct ieee80211_supported_band *sband;
-	u32 changed = 0, nss_changed = 0;
+	u64 changed = 0, nss_changed = 0;
 
 	link = ieee80211_link_or_deflink(sdata, params->link_id, true);
 	if (IS_ERR(link))
