mac80211: refresh brcmfmac patches

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

15 files changed, 42 insertions, 42 deletions

diff --git a/package/kernel/mac80211/patches/350-0001-brcmfmac-add-fallback-for-devices-that-do-not-report.patch b/package/kernel/mac80211/patches/350-0001-brcmfmac-add-fallback-for-devices-that-do-not-report.patch
index 7b299d54d2..62e9e26913 100644
--- a/package/kernel/mac80211/patches/350-0001-brcmfmac-add-fallback-for-devices-that-do-not-report.patch
+++ b/package/kernel/mac80211/patches/350-0001-brcmfmac-add-fallback-for-devices-that-do-not-report.patch
@@ -14,7 +14,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -2480,12 +2480,14 @@ brcmf_cfg80211_get_station(struct wiphy
+@@ -2540,12 +2540,14 @@ brcmf_cfg80211_get_station(struct wiphy
  			   const u8 *mac, struct station_info *sinfo)
  {
  	struct brcmf_if *ifp = netdev_priv(ndev);
@@ -29,7 +29,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  	u32 i;
  
  	brcmf_dbg(TRACE, "Enter, MAC %pM\n", mac);
-@@ -2569,6 +2571,20 @@ brcmf_cfg80211_get_station(struct wiphy
+@@ -2629,6 +2631,20 @@ brcmf_cfg80211_get_station(struct wiphy
  			sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
  			total_rssi /= count_rssi;
  			sinfo->signal = total_rssi;
diff --git a/package/kernel/mac80211/patches/351-0004-brcmfmac-Fix-did-not-remove-int-handler-warning.patch b/package/kernel/mac80211/patches/351-0004-brcmfmac-Fix-did-not-remove-int-handler-warning.patch
index 3aabf590bb..17f3dbc561 100644
--- a/package/kernel/mac80211/patches/351-0004-brcmfmac-Fix-did-not-remove-int-handler-warning.patch
+++ b/package/kernel/mac80211/patches/351-0004-brcmfmac-Fix-did-not-remove-int-handler-warning.patch
@@ -49,7 +49,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  }
  
  void brcmf_sdiod_change_state(struct brcmf_sdio_dev *sdiodev,
-@@ -1200,12 +1200,17 @@ static void brcmf_ops_sdio_remove(struct
+@@ -1201,12 +1201,17 @@ static void brcmf_ops_sdio_remove(struct
  	brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func->device);
  	brcmf_dbg(SDIO, "Function: %d\n", func->num);
  
diff --git a/package/kernel/mac80211/patches/351-0005-brcmfmac-rework-function-picking-free-BSS-index.patch b/package/kernel/mac80211/patches/351-0005-brcmfmac-rework-function-picking-free-BSS-index.patch
index c602f2272a..19d6bb92ae 100644
--- a/package/kernel/mac80211/patches/351-0005-brcmfmac-rework-function-picking-free-BSS-index.patch
+++ b/package/kernel/mac80211/patches/351-0005-brcmfmac-rework-function-picking-free-BSS-index.patch
@@ -43,7 +43,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -527,6 +527,21 @@ brcmf_cfg80211_update_proto_addr_mode(st
+@@ -541,6 +541,21 @@ brcmf_cfg80211_update_proto_addr_mode(st
  						ADDR_INDIRECT);
  }
  
@@ -65,7 +65,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  static int brcmf_cfg80211_request_ap_if(struct brcmf_if *ifp)
  {
  	struct brcmf_mbss_ssid_le mbss_ssid_le;
-@@ -534,7 +549,7 @@ static int brcmf_cfg80211_request_ap_if(
+@@ -548,7 +563,7 @@ static int brcmf_cfg80211_request_ap_if(
  	int err;
  
  	memset(&mbss_ssid_le, 0, sizeof(mbss_ssid_le));
diff --git a/package/kernel/mac80211/patches/351-0006-brcmfmac-use-kmemdup.patch b/package/kernel/mac80211/patches/351-0006-brcmfmac-use-kmemdup.patch
index 913752c19d..fa93265684 100644
--- a/package/kernel/mac80211/patches/351-0006-brcmfmac-use-kmemdup.patch
+++ b/package/kernel/mac80211/patches/351-0006-brcmfmac-use-kmemdup.patch
@@ -13,7 +13,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -6666,11 +6666,10 @@ struct brcmf_cfg80211_info *brcmf_cfg802
+@@ -6730,11 +6730,10 @@ struct brcmf_cfg80211_info *brcmf_cfg802
  		return NULL;
  	}
  
diff --git a/package/kernel/mac80211/patches/351-0007-brcmutil-add-field-storing-control-channel-to-the-st.patch b/package/kernel/mac80211/patches/351-0007-brcmutil-add-field-storing-control-channel-to-the-st.patch
index 8b284f0b2f..b15da326eb 100644
--- a/package/kernel/mac80211/patches/351-0007-brcmutil-add-field-storing-control-channel-to-the-st.patch
+++ b/package/kernel/mac80211/patches/351-0007-brcmutil-add-field-storing-control-channel-to-the-st.patch
@@ -27,7 +27,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -2705,7 +2705,7 @@ static s32 brcmf_inform_single_bss(struc
+@@ -2765,7 +2765,7 @@ static s32 brcmf_inform_single_bss(struc
  	if (!bi->ctl_ch) {
  		ch.chspec = le16_to_cpu(bi->chanspec);
  		cfg->d11inf.decchspec(&ch);
@@ -36,16 +36,16 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  	}
  	channel = bi->ctl_ch;
  
-@@ -2823,7 +2823,7 @@ static s32 brcmf_inform_ibss(struct brcm
+@@ -2883,7 +2883,7 @@ static s32 brcmf_inform_ibss(struct brcm
  	else
- 		band = wiphy->bands[IEEE80211_BAND_5GHZ];
+ 		band = wiphy->bands[NL80211_BAND_5GHZ];
  
 -	freq = ieee80211_channel_to_frequency(ch.chnum, band->band);
 +	freq = ieee80211_channel_to_frequency(ch.control_ch_num, band->band);
  	cfg->channel = freq;
  	notify_channel = ieee80211_get_channel(wiphy, freq);
  
-@@ -2833,7 +2833,7 @@ static s32 brcmf_inform_ibss(struct brcm
+@@ -2893,7 +2893,7 @@ static s32 brcmf_inform_ibss(struct brcm
  	notify_ielen = le32_to_cpu(bi->ie_length);
  	notify_signal = (s16)le16_to_cpu(bi->RSSI) * 100;
  
@@ -54,16 +54,16 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  	brcmf_dbg(CONN, "capability: %X\n", notify_capability);
  	brcmf_dbg(CONN, "beacon interval: %d\n", notify_interval);
  	brcmf_dbg(CONN, "signal: %d\n", notify_signal);
-@@ -5251,7 +5251,7 @@ brcmf_bss_roaming_done(struct brcmf_cfg8
+@@ -5311,7 +5311,7 @@ brcmf_bss_roaming_done(struct brcmf_cfg8
  	else
- 		band = wiphy->bands[IEEE80211_BAND_5GHZ];
+ 		band = wiphy->bands[NL80211_BAND_5GHZ];
  
 -	freq = ieee80211_channel_to_frequency(ch.chnum, band->band);
 +	freq = ieee80211_channel_to_frequency(ch.control_ch_num, band->band);
  	notify_channel = ieee80211_get_channel(wiphy, freq);
  
  done:
-@@ -5773,14 +5773,15 @@ static int brcmf_construct_chaninfo(stru
+@@ -5833,14 +5833,15 @@ static int brcmf_construct_chaninfo(stru
  		channel = band->channels;
  		index = band->n_channels;
  		for (j = 0; j < band->n_channels; j++) {
@@ -82,7 +82,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  
  		/* assuming the chanspecs order is HT20,
  		 * HT40 upper, HT40 lower, and VHT80.
-@@ -5882,7 +5883,7 @@ static int brcmf_enable_bw40_2g(struct b
+@@ -5942,7 +5943,7 @@ static int brcmf_enable_bw40_2g(struct b
  			if (WARN_ON(ch.bw != BRCMU_CHAN_BW_40))
  				continue;
  			for (j = 0; j < band->n_channels; j++) {
@@ -118,8 +118,8 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 -	freq = ieee80211_channel_to_frequency(ch.chnum,
 +	freq = ieee80211_channel_to_frequency(ch.control_ch_num,
  					      ch.band == BRCMU_CHAN_BAND_2G ?
- 					      IEEE80211_BAND_2GHZ :
- 					      IEEE80211_BAND_5GHZ);
+ 					      NL80211_BAND_2GHZ :
+ 					      NL80211_BAND_5GHZ);
 @@ -1873,7 +1873,7 @@ s32 brcmf_p2p_notify_rx_mgmt_p2p_probere
  
  	if (test_bit(BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL, &p2p->status) &&
@@ -136,8 +136,8 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 -	freq = ieee80211_channel_to_frequency(ch.chnum,
 +	freq = ieee80211_channel_to_frequency(ch.control_ch_num,
  					      ch.band == BRCMU_CHAN_BAND_2G ?
- 					      IEEE80211_BAND_2GHZ :
- 					      IEEE80211_BAND_5GHZ);
+ 					      NL80211_BAND_2GHZ :
+ 					      NL80211_BAND_5GHZ);
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c
 @@ -107,6 +107,7 @@ static void brcmu_d11n_decchspec(struct
diff --git a/package/kernel/mac80211/patches/351-0008-brcmfmac-support-get_channel-cfg80211-callback.patch b/package/kernel/mac80211/patches/351-0008-brcmfmac-support-get_channel-cfg80211-callback.patch
index cea4975735..2583c78d3c 100644
--- a/package/kernel/mac80211/patches/351-0008-brcmfmac-support-get_channel-cfg80211-callback.patch
+++ b/package/kernel/mac80211/patches/351-0008-brcmfmac-support-get_channel-cfg80211-callback.patch
@@ -15,7 +15,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -4863,6 +4863,68 @@ exit:
+@@ -4923,6 +4923,68 @@ exit:
  	return err;
  }
  
@@ -84,7 +84,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  static int brcmf_cfg80211_crit_proto_start(struct wiphy *wiphy,
  					   struct wireless_dev *wdev,
  					   enum nl80211_crit_proto_id proto,
-@@ -5025,6 +5087,7 @@ static struct cfg80211_ops brcmf_cfg8021
+@@ -5085,6 +5147,7 @@ static struct cfg80211_ops brcmf_cfg8021
  	.mgmt_tx = brcmf_cfg80211_mgmt_tx,
  	.remain_on_channel = brcmf_p2p_remain_on_channel,
  	.cancel_remain_on_channel = brcmf_cfg80211_cancel_remain_on_channel,
diff --git a/package/kernel/mac80211/patches/351-0009-brcmfmac-print-errors-if-creating-interface-fails.patch b/package/kernel/mac80211/patches/351-0009-brcmfmac-print-errors-if-creating-interface-fails.patch
index 1b119b2c85..81fbff4d14 100644
--- a/package/kernel/mac80211/patches/351-0009-brcmfmac-print-errors-if-creating-interface-fails.patch
+++ b/package/kernel/mac80211/patches/351-0009-brcmfmac-print-errors-if-creating-interface-fails.patch
@@ -15,7 +15,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -670,20 +670,24 @@ static struct wireless_dev *brcmf_cfg802
+@@ -684,20 +684,24 @@ static struct wireless_dev *brcmf_cfg802
  		return ERR_PTR(-EOPNOTSUPP);
  	case NL80211_IFTYPE_AP:
  		wdev = brcmf_ap_add_vif(wiphy, name, flags, params);
diff --git a/package/kernel/mac80211/patches/351-0010-brcmfmac-fix-setting-AP-channel-with-new-firmwares.patch b/package/kernel/mac80211/patches/351-0010-brcmfmac-fix-setting-AP-channel-with-new-firmwares.patch
index 970b48f977..90055f2839 100644
--- a/package/kernel/mac80211/patches/351-0010-brcmfmac-fix-setting-AP-channel-with-new-firmwares.patch
+++ b/package/kernel/mac80211/patches/351-0010-brcmfmac-fix-setting-AP-channel-with-new-firmwares.patch
@@ -32,7 +32,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -4398,7 +4398,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
+@@ -4458,7 +4458,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
  	struct brcmf_join_params join_params;
  	enum nl80211_iftype dev_role;
  	struct brcmf_fil_bss_enable_le bss_enable;
@@ -41,7 +41,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  	bool mbss;
  	int is_11d;
  
-@@ -4474,16 +4474,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
+@@ -4534,16 +4534,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
  
  	brcmf_config_ap_mgmt_ie(ifp->vif, &settings->beacon);
  
@@ -59,7 +59,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  		if (is_11d != ifp->vif->is_11d) {
  			err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_REGULATORY,
  						    is_11d);
-@@ -4531,6 +4523,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
+@@ -4591,6 +4583,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
  		err = -EINVAL;
  		goto exit;
  	}
@@ -68,7 +68,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  	if (dev_role == NL80211_IFTYPE_AP) {
  		if ((brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS)) && (!mbss))
  			brcmf_fil_iovar_int_set(ifp, "mbss", 1);
-@@ -4540,6 +4534,17 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
+@@ -4600,6 +4594,17 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
  			brcmf_err("setting AP mode failed %d\n", err);
  			goto exit;
  		}
@@ -86,7 +86,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  		err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 1);
  		if (err < 0) {
  			brcmf_err("BRCMF_C_UP error (%d)\n", err);
-@@ -4561,7 +4566,13 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
+@@ -4621,7 +4626,13 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
  			goto exit;
  		}
  		brcmf_dbg(TRACE, "AP mode configuration complete\n");
@@ -101,7 +101,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  		err = brcmf_fil_bsscfg_data_set(ifp, "ssid", &ssid_le,
  						sizeof(ssid_le));
  		if (err < 0) {
-@@ -4578,7 +4589,10 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
+@@ -4638,7 +4649,10 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
  		}
  
  		brcmf_dbg(TRACE, "GO mode configuration complete\n");
diff --git a/package/kernel/mac80211/patches/351-0011-brcmfmac-don-t-remove-interface-on-link-down-firmwar.patch b/package/kernel/mac80211/patches/351-0011-brcmfmac-don-t-remove-interface-on-link-down-firmwar.patch
index c9a5541d82..97fdff766a 100644
--- a/package/kernel/mac80211/patches/351-0011-brcmfmac-don-t-remove-interface-on-link-down-firmwar.patch
+++ b/package/kernel/mac80211/patches/351-0011-brcmfmac-don-t-remove-interface-on-link-down-firmwar.patch
@@ -41,7 +41,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -5388,7 +5388,6 @@ brcmf_notify_connect_status_ap(struct br
+@@ -5448,7 +5448,6 @@ brcmf_notify_connect_status_ap(struct br
  			       struct net_device *ndev,
  			       const struct brcmf_event_msg *e, void *data)
  {
@@ -49,7 +49,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  	static int generation;
  	u32 event = e->event_code;
  	u32 reason = e->reason;
-@@ -5399,8 +5398,6 @@ brcmf_notify_connect_status_ap(struct br
+@@ -5459,8 +5458,6 @@ brcmf_notify_connect_status_ap(struct br
  	    ndev != cfg_to_ndev(cfg)) {
  		brcmf_dbg(CONN, "AP mode link down\n");
  		complete(&cfg->vif_disabled);
diff --git a/package/kernel/mac80211/patches/351-0013-brcmfmac-revise-SDIO-error-message-in-brcmf_sdio_dri.patch b/package/kernel/mac80211/patches/351-0013-brcmfmac-revise-SDIO-error-message-in-brcmf_sdio_dri.patch
index 91dd7edaee..a2b2e43c0f 100644
--- a/package/kernel/mac80211/patches/351-0013-brcmfmac-revise-SDIO-error-message-in-brcmf_sdio_dri.patch
+++ b/package/kernel/mac80211/patches/351-0013-brcmfmac-revise-SDIO-error-message-in-brcmf_sdio_dri.patch
@@ -16,7 +16,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-@@ -3664,7 +3664,7 @@ brcmf_sdio_drivestrengthinit(struct brcm
+@@ -3666,7 +3666,7 @@ brcmf_sdio_drivestrengthinit(struct brcm
  		str_shift = 11;
  		break;
  	default:
diff --git a/package/kernel/mac80211/patches/351-0016-brcmfmac-change-rx_seq-check-log-from-error-print-to.patch b/package/kernel/mac80211/patches/351-0016-brcmfmac-change-rx_seq-check-log-from-error-print-to.patch
index 249cfe0bb3..b26f4b9703 100644
--- a/package/kernel/mac80211/patches/351-0016-brcmfmac-change-rx_seq-check-log-from-error-print-to.patch
+++ b/package/kernel/mac80211/patches/351-0016-brcmfmac-change-rx_seq-check-log-from-error-print-to.patch
@@ -18,7 +18,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-@@ -1382,8 +1382,7 @@ static int brcmf_sdio_hdparse(struct brc
+@@ -1384,8 +1384,7 @@ static int brcmf_sdio_hdparse(struct brc
  		return -ENXIO;
  	}
  	if (rd->seq_num != rx_seq) {
diff --git a/package/kernel/mac80211/patches/351-0017-brcmfmac-drop-unused-pm_block-vif-attribute.patch b/package/kernel/mac80211/patches/351-0017-brcmfmac-drop-unused-pm_block-vif-attribute.patch
index 467026d899..9a865072e8 100644
--- a/package/kernel/mac80211/patches/351-0017-brcmfmac-drop-unused-pm_block-vif-attribute.patch
+++ b/package/kernel/mac80211/patches/351-0017-brcmfmac-drop-unused-pm_block-vif-attribute.patch
@@ -15,7 +15,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -587,7 +587,7 @@ struct wireless_dev *brcmf_ap_add_vif(st
+@@ -601,7 +601,7 @@ struct wireless_dev *brcmf_ap_add_vif(st
  
  	brcmf_dbg(INFO, "Adding vif \"%s\"\n", name);
  
@@ -24,7 +24,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  	if (IS_ERR(vif))
  		return (struct wireless_dev *)vif;
  
-@@ -5114,8 +5114,7 @@ static struct cfg80211_ops brcmf_cfg8021
+@@ -5174,8 +5174,7 @@ static struct cfg80211_ops brcmf_cfg8021
  };
  
  struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,
@@ -34,7 +34,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  {
  	struct brcmf_cfg80211_vif *vif_walk;
  	struct brcmf_cfg80211_vif *vif;
-@@ -5130,8 +5129,6 @@ struct brcmf_cfg80211_vif *brcmf_alloc_v
+@@ -5190,8 +5189,6 @@ struct brcmf_cfg80211_vif *brcmf_alloc_v
  	vif->wdev.wiphy = cfg->wiphy;
  	vif->wdev.iftype = type;
  
@@ -43,7 +43,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  	brcmf_init_prof(&vif->profile);
  
  	if (type == NL80211_IFTYPE_AP) {
-@@ -6769,7 +6766,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
+@@ -6833,7 +6830,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
  	init_vif_event(&cfg->vif_event);
  	INIT_LIST_HEAD(&cfg->vif_list);
  
diff --git a/package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch b/package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch
index 8bf6d1be3a..d946ecce19 100644
--- a/package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch
+++ b/package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch
@@ -23,7 +23,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -6224,29 +6224,15 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6284,29 +6284,15 @@ static int brcmf_setup_ifmodes(struct wi
  	if (!combo)
  		goto err;
  
@@ -56,7 +56,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  	c0_limits[i].max = 1;
  	c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION);
  	if (p2p) {
-@@ -6264,6 +6250,7 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6324,6 +6310,7 @@ static int brcmf_setup_ifmodes(struct wi
  		c0_limits[i].max = 1;
  		c0_limits[i++].types = BIT(NL80211_IFTYPE_AP);
  	}
@@ -64,7 +64,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  	combo[c].max_interfaces = i;
  	combo[c].n_limits = i;
  	combo[c].limits = c0_limits;
-@@ -6271,7 +6258,9 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6331,7 +6318,9 @@ static int brcmf_setup_ifmodes(struct wi
  	if (p2p) {
  		c++;
  		i = 0;
@@ -75,7 +75,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  		p2p_limits[i].max = 1;
  		p2p_limits[i++].types = BIT(NL80211_IFTYPE_STATION);
  		p2p_limits[i].max = 1;
-@@ -6280,6 +6269,7 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6340,6 +6329,7 @@ static int brcmf_setup_ifmodes(struct wi
  		p2p_limits[i++].types = BIT(NL80211_IFTYPE_P2P_CLIENT);
  		p2p_limits[i].max = 1;
  		p2p_limits[i++].types = BIT(NL80211_IFTYPE_P2P_DEVICE);
@@ -83,7 +83,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  		combo[c].max_interfaces = i;
  		combo[c].n_limits = i;
  		combo[c].limits = p2p_limits;
-@@ -6287,14 +6277,19 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6347,14 +6337,19 @@ static int brcmf_setup_ifmodes(struct wi
  
  	if (mbss) {
  		c++;
diff --git a/package/kernel/mac80211/patches/862-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch b/package/kernel/mac80211/patches/862-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
index c5445cf81d..a3a6bc44d6 100644
--- a/package/kernel/mac80211/patches/862-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
+++ b/package/kernel/mac80211/patches/862-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
@@ -10,7 +10,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -651,9 +651,37 @@ static struct wireless_dev *brcmf_cfg802
+@@ -665,9 +665,37 @@ static struct wireless_dev *brcmf_cfg802
  						     u32 *flags,
  						     struct vif_params *params)
  {
diff --git a/package/kernel/mac80211/patches/863-brcmfmac-Disable-power-management.patch b/package/kernel/mac80211/patches/863-brcmfmac-Disable-power-management.patch
index 5bc1a2e6ed..104438a951 100644
--- a/package/kernel/mac80211/patches/863-brcmfmac-Disable-power-management.patch
+++ b/package/kernel/mac80211/patches/863-brcmfmac-Disable-power-management.patch
@@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -2686,6 +2686,10 @@ brcmf_cfg80211_set_power_mgmt(struct wip
+@@ -2746,6 +2746,10 @@ brcmf_cfg80211_set_power_mgmt(struct wip
  	 * preference in cfg struct to apply this to
  	 * FW later while initializing the dongle
  	 */