diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-10 21:24:14 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-24 00:08:38 +0200 |
commit | cfe0eb7485d82dd3acf2ba2b95a31e63557d59bd (patch) | |
tree | 943d55354b2e75a32c66e238e9e1bdd50916b0e6 /package/kernel/mac80211/patches/subsys/388-mac80211-add-support-for-BSS-color-change.patch | |
parent | 1c0d5ee8e695ce63310259a7cf3107d9f77206ea (diff) | |
download | upstream-cfe0eb7485d82dd3acf2ba2b95a31e63557d59bd.tar.gz upstream-cfe0eb7485d82dd3acf2ba2b95a31e63557d59bd.tar.bz2 upstream-cfe0eb7485d82dd3acf2ba2b95a31e63557d59bd.zip |
mac80211: Update to version 5.14.13-1
The removed patches were applied upstream.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/subsys/388-mac80211-add-support-for-BSS-color-change.patch')
-rw-r--r-- | package/kernel/mac80211/patches/subsys/388-mac80211-add-support-for-BSS-color-change.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/package/kernel/mac80211/patches/subsys/388-mac80211-add-support-for-BSS-color-change.patch b/package/kernel/mac80211/patches/subsys/388-mac80211-add-support-for-BSS-color-change.patch index 320570d034..196c8e10af 100644 --- a/package/kernel/mac80211/patches/subsys/388-mac80211-add-support-for-BSS-color-change.patch +++ b/package/kernel/mac80211/patches/subsys/388-mac80211-add-support-for-BSS-color-change.patch @@ -19,7 +19,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -1713,6 +1713,10 @@ enum ieee80211_offload_flags { +@@ -1715,6 +1715,10 @@ enum ieee80211_offload_flags { * protected by fq->lock. * @offload_flags: 802.3 -> 802.11 enapsulation offload flags, see * &enum ieee80211_offload_flags. @@ -30,7 +30,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> */ struct ieee80211_vif { enum nl80211_iftype type; -@@ -1741,6 +1745,9 @@ struct ieee80211_vif { +@@ -1743,6 +1747,9 @@ struct ieee80211_vif { bool txqs_stopped[IEEE80211_NUM_ACS]; @@ -40,7 +40,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> /* must be last */ u8 drv_priv[] __aligned(sizeof(void *)); }; -@@ -4992,6 +4999,16 @@ void ieee80211_csa_finish(struct ieee802 +@@ -5016,6 +5023,16 @@ void ieee80211_csa_finish(struct ieee802 bool ieee80211_beacon_cntdwn_is_complete(struct ieee80211_vif *vif); /** @@ -57,7 +57,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> * ieee80211_proberesp_get - retrieve a Probe Response template * @hw: pointer obtained from ieee80211_alloc_hw(). * @vif: &struct ieee80211_vif pointer from the add_interface callback. -@@ -6756,6 +6773,18 @@ ieee80211_get_unsol_bcast_probe_resp_tmp +@@ -6780,6 +6797,18 @@ ieee80211_get_unsol_bcast_probe_resp_tmp struct ieee80211_vif *vif); /** @@ -161,7 +161,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> if (err < 0) return err; ieee80211_bss_info_change_notify(sdata, err); -@@ -3163,7 +3171,7 @@ static int ieee80211_set_after_csa_beaco +@@ -3155,7 +3163,7 @@ static int ieee80211_set_after_csa_beaco switch (sdata->vif.type) { case NL80211_IFTYPE_AP: err = ieee80211_assign_beacon(sdata, sdata->u.ap.next_beacon, @@ -170,7 +170,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> kfree(sdata->u.ap.next_beacon); sdata->u.ap.next_beacon = NULL; -@@ -3329,7 +3337,7 @@ static int ieee80211_set_csa_beacon(stru +@@ -3321,7 +3329,7 @@ static int ieee80211_set_csa_beacon(stru csa.n_counter_offsets_presp = params->n_counter_offsets_presp; csa.count = params->count; @@ -179,7 +179,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> if (err < 0) { kfree(sdata->u.ap.next_beacon); return err; -@@ -3418,6 +3426,15 @@ static int ieee80211_set_csa_beacon(stru +@@ -3410,6 +3418,15 @@ static int ieee80211_set_csa_beacon(stru return 0; } @@ -195,7 +195,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> static int __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_csa_settings *params) -@@ -3486,6 +3503,10 @@ __ieee80211_channel_switch(struct wiphy +@@ -3478,6 +3495,10 @@ __ieee80211_channel_switch(struct wiphy goto out; } @@ -206,7 +206,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> err = ieee80211_set_csa_beacon(sdata, params, &changed); if (err) { ieee80211_vif_unreserve_chanctx(sdata); -@@ -4137,6 +4158,196 @@ static int ieee80211_set_sar_specs(struc +@@ -4129,6 +4150,196 @@ static int ieee80211_set_sar_specs(struc return local->ops->set_sar_specs(&local->hw, sar); } @@ -403,7 +403,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> const struct cfg80211_ops mac80211_config_ops = { .add_virtual_intf = ieee80211_add_iface, .del_virtual_intf = ieee80211_del_iface, -@@ -4240,4 +4451,5 @@ const struct cfg80211_ops mac80211_confi +@@ -4232,4 +4443,5 @@ const struct cfg80211_ops mac80211_confi .set_tid_config = ieee80211_set_tid_config, .reset_tid_config = ieee80211_reset_tid_config, .set_sar_specs = ieee80211_set_sar_specs, @@ -433,7 +433,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> struct list_head assigned_chanctx_list; /* protected by chanctx_mtx */ struct list_head reserved_chanctx_list; /* protected by chanctx_mtx */ -@@ -1895,6 +1903,9 @@ void ieee80211_csa_finalize_work(struct +@@ -1891,6 +1899,9 @@ void ieee80211_csa_finalize_work(struct int ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_csa_settings *params); @@ -453,7 +453,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> cancel_delayed_work_sync(&sdata->dfs_cac_timer_work); -@@ -1595,6 +1596,7 @@ static void ieee80211_setup_sdata(struct +@@ -1608,6 +1609,7 @@ static void ieee80211_setup_sdata(struct INIT_WORK(&sdata->work, ieee80211_iface_work); INIT_WORK(&sdata->recalc_smps, ieee80211_recalc_smps_work); INIT_WORK(&sdata->csa_finalize_work, ieee80211_csa_finalize_work); @@ -463,7 +463,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4784,11 +4784,11 @@ static int ieee80211_beacon_add_tim(stru +@@ -4796,11 +4796,11 @@ static int ieee80211_beacon_add_tim(stru static void ieee80211_set_beacon_cntdwn(struct ieee80211_sub_if_data *sdata, struct beacon_data *beacon) { @@ -477,7 +477,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> switch (sdata->vif.type) { case NL80211_IFTYPE_AP: -@@ -4808,21 +4808,27 @@ static void ieee80211_set_beacon_cntdwn( +@@ -4820,21 +4820,27 @@ static void ieee80211_set_beacon_cntdwn( } rcu_read_lock(); @@ -514,7 +514,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> } rcu_read_unlock(); } -@@ -5032,6 +5038,7 @@ __ieee80211_beacon_get(struct ieee80211_ +@@ -5044,6 +5050,7 @@ __ieee80211_beacon_get(struct ieee80211_ if (offs) { offs->tim_offset = beacon->head_len; offs->tim_length = skb->len - beacon->head_len; |