mac80211: refresh regular mac80211 patches
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
--- a/local-symbols
|
--- a/local-symbols
|
||||||
+++ b/local-symbols
|
+++ b/local-symbols
|
||||||
@@ -341,6 +341,7 @@ RT2X00_LIB_FIRMWARE=
|
@@ -342,6 +342,7 @@ RT2X00_LIB_FIRMWARE=
|
||||||
RT2X00_LIB_CRYPTO=
|
RT2X00_LIB_CRYPTO=
|
||||||
RT2X00_LIB_LEDS=
|
RT2X00_LIB_LEDS=
|
||||||
RT2X00_LIB_DEBUGFS=
|
RT2X00_LIB_DEBUGFS=
|
||||||
|
|||||||
@@ -157,7 +157,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|||||||
return STA_STATS_RATE_INVALID;
|
return STA_STATS_RATE_INVALID;
|
||||||
--- a/net/mac80211/util.c
|
--- a/net/mac80211/util.c
|
||||||
+++ b/net/mac80211/util.c
|
+++ b/net/mac80211/util.c
|
||||||
@@ -3902,6 +3902,19 @@ u64 ieee80211_calculate_rx_timestamp(str
|
@@ -3896,6 +3896,19 @@ u64 ieee80211_calculate_rx_timestamp(str
|
||||||
|
|
||||||
/* Fill cfg80211 rate info */
|
/* Fill cfg80211 rate info */
|
||||||
switch (status->encoding) {
|
switch (status->encoding) {
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|||||||
|
|
||||||
--- a/net/mac80211/util.c
|
--- a/net/mac80211/util.c
|
||||||
+++ b/net/mac80211/util.c
|
+++ b/net/mac80211/util.c
|
||||||
@@ -2497,21 +2497,55 @@ int ieee80211_reconfig(struct ieee80211_
|
@@ -2491,21 +2491,55 @@ int ieee80211_reconfig(struct ieee80211_
|
||||||
|
|
||||||
/* Finally also reconfigure all the BSS information */
|
/* Finally also reconfigure all the BSS information */
|
||||||
list_for_each_entry(sdata, &local->interfaces, list) {
|
list_for_each_entry(sdata, &local->interfaces, list) {
|
||||||
@@ -77,7 +77,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|||||||
}
|
}
|
||||||
|
|
||||||
switch (sdata->vif.type) {
|
switch (sdata->vif.type) {
|
||||||
@@ -2531,42 +2565,42 @@ int ieee80211_reconfig(struct ieee80211_
|
@@ -2525,42 +2559,42 @@ int ieee80211_reconfig(struct ieee80211_
|
||||||
&sdata->deflink.tx_conf[i]);
|
&sdata->deflink.tx_conf[i]);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -150,7 +150,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|||||||
break;
|
break;
|
||||||
case NL80211_IFTYPE_OCB:
|
case NL80211_IFTYPE_OCB:
|
||||||
changed |= BSS_CHANGED_OCB;
|
changed |= BSS_CHANGED_OCB;
|
||||||
@@ -2601,6 +2635,7 @@ int ieee80211_reconfig(struct ieee80211_
|
@@ -2595,6 +2629,7 @@ int ieee80211_reconfig(struct ieee80211_
|
||||||
case NL80211_IFTYPE_NAN:
|
case NL80211_IFTYPE_NAN:
|
||||||
res = ieee80211_reconfig_nan(sdata);
|
res = ieee80211_reconfig_nan(sdata);
|
||||||
if (res < 0) {
|
if (res < 0) {
|
||||||
@@ -158,7 +158,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|||||||
ieee80211_handle_reconfig_failure(local);
|
ieee80211_handle_reconfig_failure(local);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
@@ -2618,6 +2653,10 @@ int ieee80211_reconfig(struct ieee80211_
|
@@ -2612,6 +2647,10 @@ int ieee80211_reconfig(struct ieee80211_
|
||||||
WARN_ON(1);
|
WARN_ON(1);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|||||||
|
|
||||||
--- a/net/mac80211/util.c
|
--- a/net/mac80211/util.c
|
||||||
+++ b/net/mac80211/util.c
|
+++ b/net/mac80211/util.c
|
||||||
@@ -2348,6 +2348,35 @@ static int ieee80211_reconfig_nan(struct
|
@@ -2342,6 +2342,35 @@ static int ieee80211_reconfig_nan(struct
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,7 +53,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|||||||
int ieee80211_reconfig(struct ieee80211_local *local)
|
int ieee80211_reconfig(struct ieee80211_local *local)
|
||||||
{
|
{
|
||||||
struct ieee80211_hw *hw = &local->hw;
|
struct ieee80211_hw *hw = &local->hw;
|
||||||
@@ -2610,7 +2639,13 @@ int ieee80211_reconfig(struct ieee80211_
|
@@ -2604,7 +2633,13 @@ int ieee80211_reconfig(struct ieee80211_
|
||||||
changed |= BSS_CHANGED_IBSS;
|
changed |= BSS_CHANGED_IBSS;
|
||||||
fallthrough;
|
fallthrough;
|
||||||
case NL80211_IFTYPE_AP:
|
case NL80211_IFTYPE_AP:
|
||||||
@@ -68,7 +68,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|||||||
|
|
||||||
if (sdata->vif.bss_conf.ftm_responder == 1 &&
|
if (sdata->vif.bss_conf.ftm_responder == 1 &&
|
||||||
wiphy_ext_feature_isset(sdata->local->hw.wiphy,
|
wiphy_ext_feature_isset(sdata->local->hw.wiphy,
|
||||||
@@ -2620,6 +2655,13 @@ int ieee80211_reconfig(struct ieee80211_
|
@@ -2614,6 +2649,13 @@ int ieee80211_reconfig(struct ieee80211_
|
||||||
if (sdata->vif.type == NL80211_IFTYPE_AP) {
|
if (sdata->vif.type == NL80211_IFTYPE_AP) {
|
||||||
changed |= BSS_CHANGED_AP_PROBE_RESP;
|
changed |= BSS_CHANGED_AP_PROBE_RESP;
|
||||||
|
|
||||||
|
|||||||
@@ -485,7 +485,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|||||||
struct {
|
struct {
|
||||||
u8 id;
|
u8 id;
|
||||||
u8 len;
|
u8 len;
|
||||||
@@ -2546,7 +2546,7 @@ int ieee80211_reconfig(struct ieee80211_
|
@@ -2540,7 +2540,7 @@ int ieee80211_reconfig(struct ieee80211_
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
sdata_lock(sdata);
|
sdata_lock(sdata);
|
||||||
@@ -494,7 +494,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|||||||
struct ieee80211_bss_conf *old[IEEE80211_MLD_MAX_NUM_LINKS] = {
|
struct ieee80211_bss_conf *old[IEEE80211_MLD_MAX_NUM_LINKS] = {
|
||||||
[0] = &sdata->vif.bss_conf,
|
[0] = &sdata->vif.bss_conf,
|
||||||
};
|
};
|
||||||
@@ -2566,7 +2566,7 @@ int ieee80211_reconfig(struct ieee80211_
|
@@ -2560,7 +2560,7 @@ int ieee80211_reconfig(struct ieee80211_
|
||||||
for (link_id = 0;
|
for (link_id = 0;
|
||||||
link_id < ARRAY_SIZE(sdata->vif.link_conf);
|
link_id < ARRAY_SIZE(sdata->vif.link_conf);
|
||||||
link_id++) {
|
link_id++) {
|
||||||
@@ -503,7 +503,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|||||||
!(sdata->vif.active_links & BIT(link_id)))
|
!(sdata->vif.active_links & BIT(link_id)))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
@@ -2598,12 +2598,12 @@ int ieee80211_reconfig(struct ieee80211_
|
@@ -2592,12 +2592,12 @@ int ieee80211_reconfig(struct ieee80211_
|
||||||
if (sdata->vif.bss_conf.mu_mimo_owner)
|
if (sdata->vif.bss_conf.mu_mimo_owner)
|
||||||
changed |= BSS_CHANGED_MU_GROUPS;
|
changed |= BSS_CHANGED_MU_GROUPS;
|
||||||
|
|
||||||
@@ -518,7 +518,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|||||||
changed |= BSS_CHANGED_ASSOC |
|
changed |= BSS_CHANGED_ASSOC |
|
||||||
BSS_CHANGED_ARP_FILTER |
|
BSS_CHANGED_ARP_FILTER |
|
||||||
BSS_CHANGED_PS;
|
BSS_CHANGED_PS;
|
||||||
@@ -2641,7 +2641,7 @@ int ieee80211_reconfig(struct ieee80211_
|
@@ -2635,7 +2635,7 @@ int ieee80211_reconfig(struct ieee80211_
|
||||||
case NL80211_IFTYPE_AP:
|
case NL80211_IFTYPE_AP:
|
||||||
changed |= BSS_CHANGED_P2P_PS;
|
changed |= BSS_CHANGED_P2P_PS;
|
||||||
|
|
||||||
@@ -527,7 +527,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|||||||
ieee80211_vif_cfg_change_notify(sdata,
|
ieee80211_vif_cfg_change_notify(sdata,
|
||||||
BSS_CHANGED_SSID);
|
BSS_CHANGED_SSID);
|
||||||
else
|
else
|
||||||
@@ -2655,7 +2655,7 @@ int ieee80211_reconfig(struct ieee80211_
|
@@ -2649,7 +2649,7 @@ int ieee80211_reconfig(struct ieee80211_
|
||||||
if (sdata->vif.type == NL80211_IFTYPE_AP) {
|
if (sdata->vif.type == NL80211_IFTYPE_AP) {
|
||||||
changed |= BSS_CHANGED_AP_PROBE_RESP;
|
changed |= BSS_CHANGED_AP_PROBE_RESP;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user