diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-08 10:49:42 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-08 10:49:42 -0300 |
| commit | e4a2946594228aec1c0e369d6544c7b971c1a5cc (patch) | |
| tree | df563d243b544729b2b50ff47b70cf0201014598 /net | |
| parent | 1f22d72becbd2dbab8a55ab9c00279aa28c05d48 (diff) | |
| parent | c68173b2012b8eba332cf9832f0ad23427d795b5 (diff) | |
Merge tag 'v5.15.72' into 5.15-2.1.x-imx
This is the 5.15.72 stable release
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/tx.c | 4 | ||||
| -rw-r--r-- | net/sched/act_ct.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index a499b07fee33..8f8dc2625d53 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -5719,6 +5719,9 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev, skb_reset_network_header(skb); skb_reset_mac_header(skb); + if (local->hw.queues < IEEE80211_NUM_ACS) + goto start_xmit; + /* update QoS header to prioritize control port frames if possible, * priorization also happens for control port frames send over * AF_PACKET @@ -5734,6 +5737,7 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev, rcu_read_unlock(); +start_xmit: /* mutex lock is only needed for incrementing the cookie counter */ mutex_lock(&local->mtx); diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c index 2cd0c8386d13..79017b240896 100644 --- a/net/sched/act_ct.c +++ b/net/sched/act_ct.c @@ -1306,7 +1306,7 @@ static int tcf_ct_init(struct net *net, struct nlattr *nla, err = tcf_ct_flow_table_get(params); if (err) - goto cleanup; + goto cleanup_params; spin_lock_bh(&c->tcf_lock); goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch); @@ -1321,6 +1321,9 @@ static int tcf_ct_init(struct net *net, struct nlattr *nla, return res; +cleanup_params: + if (params->tmpl) + nf_ct_put(params->tmpl); cleanup: if (goto_ch) tcf_chain_put_by_act(goto_ch); |