ath11k_nss: add missing NL80211_ATTR_HE_MUEDCA_PARAMS

Signed-off-by: Sean Khan <datapronix@protonmail.com>

ath11k_nss: fix missing semicolon ';'

Signed-off-by: Sean Khan <datapronix@protonmail.com>
This commit is contained in:
Sean Khan 2024-07-08 11:55:50 -04:00
parent e18383e9de
commit 9998af7141
5 changed files with 41 additions and 33 deletions

View File

@ -158,7 +158,15 @@ Signed-off-by: Muna Sinada <msinada@codeaurora.org>
#undef TRACE_INCLUDE_PATH
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -20211,6 +20211,42 @@ nla_put_failure:
@@ -812,6 +812,7 @@ static const struct nla_policy nl80211_p
[NL80211_ATTR_HW_TIMESTAMP_ENABLED] = { .type = NLA_FLAG },
[NL80211_ATTR_EMA_RNR_ELEMS] = { .type = NLA_NESTED },
[NL80211_ATTR_MLO_LINK_DISABLED] = { .type = NLA_FLAG },
+ [NL80211_ATTR_HE_MUEDCA_PARAMS] = NLA_POLICY_EXACT_LEN(sizeof(struct ieee80211_mu_edca_param_set)),
};
/* policy for the key attributes */
@@ -20211,6 +20212,42 @@ nla_put_failure:
}
EXPORT_SYMBOL(cfg80211_update_owe_info_event);
@ -229,19 +237,19 @@ Signed-off-by: Muna Sinada <msinada@codeaurora.org>
+ ),
+ TP_fast_assign(
+ WIPHY_ASSIGN;
+ __entry->mu_qos_info = params->mu_qos_info
+ __entry->be_aifsn = params->ac_be.aifsn
+ __entry->be_ecw_min_max = params->ac_be.ecw_min_max
+ __entry->be_mu_edca_timer = params->ac_be.mu_edca_timer
+ __entry->bk_aifsn = params->ac_bk.aifsn
+ __entry->bk_ecw_min_max = params->ac_bk.ecw_min_max
+ __entry->bk_mu_edca_timer = params->ac_bk.mu_edca_timer
+ __entry->vi_aifsn = params->ac_vi.aifsn
+ __entry->vi_ecw_min_max = params->ac_vi.ecw_min_max
+ __entry->vi_mu_edca_timer = params->ac_vi.mu_edca_timer
+ __entry->vo_aifsn = params->ac_vo.aifsn
+ __entry->vo_ecw_min_max = params->ac_vo.ecw_min_max
+ __entry->vo_mu_edca_timer = params->ac_vo.mu_edca_timer
+ __entry->mu_qos_info = params->mu_qos_info;
+ __entry->be_aifsn = params->ac_be.aifsn;
+ __entry->be_ecw_min_max = params->ac_be.ecw_min_max;
+ __entry->be_mu_edca_timer = params->ac_be.mu_edca_timer;
+ __entry->bk_aifsn = params->ac_bk.aifsn;
+ __entry->bk_ecw_min_max = params->ac_bk.ecw_min_max;
+ __entry->bk_mu_edca_timer = params->ac_bk.mu_edca_timer;
+ __entry->vi_aifsn = params->ac_vi.aifsn;
+ __entry->vi_ecw_min_max = params->ac_vi.ecw_min_max;
+ __entry->vi_mu_edca_timer = params->ac_vi.mu_edca_timer;
+ __entry->vo_aifsn = params->ac_vo.aifsn;
+ __entry->vo_ecw_min_max = params->ac_vo.ecw_min_max;
+ __entry->vo_mu_edca_timer = params->ac_vo.mu_edca_timer;
+ ),
+ TP_printk(WIPHY_PR_FMT ", MU QOS info: %u", WIPHY_PR_ARG,
+ __entry->mu_qos_info)

View File

@ -663,7 +663,7 @@
static inline const void *choose_neigh_daddr(const struct in6_addr *p,
struct sk_buff *skb,
const void *daddr)
@@ -3866,6 +3869,10 @@ int ip6_route_add(struct fib6_config *cf
@@ -3868,6 +3871,10 @@ int ip6_route_add(struct fib6_config *cf
return PTR_ERR(rt);
err = __ip6_ins_rt(rt, &cfg->fc_nlinfo, extack);
@ -674,7 +674,7 @@
fib6_info_release(rt);
return err;
@@ -3887,6 +3894,9 @@ static int __ip6_del_rt(struct fib6_info
@@ -3889,6 +3896,9 @@ static int __ip6_del_rt(struct fib6_info
err = fib6_del(rt, info);
spin_unlock_bh(&table->tb6_lock);
@ -684,7 +684,7 @@
out:
fib6_info_release(rt);
return err;
@@ -6334,6 +6344,20 @@ static int ip6_route_dev_notify(struct n
@@ -6336,6 +6346,20 @@ static int ip6_route_dev_notify(struct n
return NOTIFY_OK;
}
@ -842,7 +842,7 @@
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -633,6 +633,7 @@ enum nf_ct_sysctl_index {
@@ -630,6 +630,7 @@ enum nf_ct_sysctl_index {
#endif
NF_SYSCTL_CT_PROTO_TCP_LOOSE,
NF_SYSCTL_CT_PROTO_TCP_LIBERAL,
@ -850,7 +850,7 @@
NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST,
NF_SYSCTL_CT_PROTO_TCP_MAX_RETRANS,
NF_SYSCTL_CT_PROTO_TIMEOUT_UDP,
@@ -840,6 +841,14 @@ static struct ctl_table nf_ct_sysctl_tab
@@ -834,6 +835,14 @@ static struct ctl_table nf_ct_sysctl_tab
.extra1 = SYSCTL_ZERO,
.extra2 = SYSCTL_ONE,
},
@ -865,7 +865,7 @@
[NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST] = {
.procname = "nf_conntrack_tcp_ignore_invalid_rst",
.maxlen = sizeof(u8),
@@ -1050,6 +1059,7 @@ static void nf_conntrack_standalone_init
@@ -1035,6 +1044,7 @@ static void nf_conntrack_standalone_init
XASSIGN(LOOSE, &tn->tcp_loose);
XASSIGN(LIBERAL, &tn->tcp_be_liberal);

View File

@ -15,7 +15,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -3869,10 +3869,6 @@ int ip6_route_add(struct fib6_config *cf
@@ -3871,10 +3871,6 @@ int ip6_route_add(struct fib6_config *cf
return PTR_ERR(rt);
err = __ip6_ins_rt(rt, &cfg->fc_nlinfo, extack);
@ -26,7 +26,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
fib6_info_release(rt);
return err;
@@ -3894,9 +3890,6 @@ static int __ip6_del_rt(struct fib6_info
@@ -3896,9 +3892,6 @@ static int __ip6_del_rt(struct fib6_info
err = fib6_del(rt, info);
spin_unlock_bh(&table->tb6_lock);
@ -36,7 +36,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
out:
fib6_info_release(rt);
return err;
@@ -4505,6 +4498,10 @@ int ipv6_route_ioctl(struct net *net, un
@@ -4507,6 +4500,10 @@ int ipv6_route_ioctl(struct net *net, un
break;
}
rtnl_unlock();
@ -47,7 +47,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
return err;
}
@@ -5523,11 +5520,17 @@ static int inet6_rtm_delroute(struct sk_
@@ -5525,11 +5522,17 @@ static int inet6_rtm_delroute(struct sk_
}
if (cfg.fc_mp)
@ -67,7 +67,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
}
static int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh,
@@ -5544,9 +5547,15 @@ static int inet6_rtm_newroute(struct sk_
@@ -5546,9 +5549,15 @@ static int inet6_rtm_newroute(struct sk_
cfg.fc_metric = IP6_RT_PRIO_USER;
if (cfg.fc_mp)

View File

@ -341,7 +341,7 @@
struct Qdisc *qdisc_lookup_rcu(struct net_device *dev, u32 handle)
{
@@ -2389,4 +2390,26 @@ static int __init pktsched_init(void)
@@ -2390,4 +2391,26 @@ static int __init pktsched_init(void)
return 0;
}
@ -370,7 +370,7 @@
subsys_initcall(pktsched_init);
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -1069,6 +1069,7 @@ static void __qdisc_destroy(struct Qdisc
@@ -1073,6 +1073,7 @@ static void __qdisc_destroy(struct Qdisc
call_rcu(&qdisc->rcu, qdisc_free_cb);
}
@ -388,7 +388,7 @@
u32 limit;
const struct Qdisc_ops *ops;
struct qdisc_size_table __rcu *stab;
@@ -751,6 +752,42 @@ static inline bool skb_skip_tc_classify(
@@ -752,6 +753,42 @@ static inline bool skb_skip_tc_classify(
return false;
}
@ -431,7 +431,7 @@
/* Reset all TX qdiscs greater than index of a device. */
static inline void qdisc_reset_all_tx_gt(struct net_device *dev, unsigned int i)
{
@@ -1323,4 +1360,9 @@ static inline void qdisc_synchronize(con
@@ -1324,4 +1361,9 @@ static inline void qdisc_synchronize(con
msleep(1);
}

View File

@ -345,7 +345,7 @@
data = kmalloc_reserve(&size, gfp_mask, NUMA_NO_NODE, NULL);
if (!data)
goto nodata;
@@ -4869,6 +4957,10 @@ static void skb_extensions_init(void) {}
@@ -4865,6 +4953,10 @@ static void skb_extensions_init(void) {}
void __init skb_init(void)
{
@ -356,7 +356,7 @@
skbuff_cache = kmem_cache_create_usercopy("skbuff_head_cache",
sizeof(struct sk_buff),
0,
@@ -4894,6 +4986,7 @@ void __init skb_init(void)
@@ -4890,6 +4982,7 @@ void __init skb_init(void)
SKB_SMALL_HEAD_HEADROOM,
NULL);
skb_extensions_init();
@ -364,7 +364,7 @@
}
static int
@@ -6397,6 +6490,8 @@ static int pskb_carve_inside_header(stru
@@ -6393,6 +6486,8 @@ static int pskb_carve_inside_header(stru
if (skb_pfmemalloc(skb))
gfp_mask |= __GFP_MEMALLOC;
@ -373,7 +373,7 @@
data = kmalloc_reserve(&size, gfp_mask, NUMA_NO_NODE, NULL);
if (!data)
return -ENOMEM;
@@ -6513,6 +6608,8 @@ static int pskb_carve_inside_nonlinear(s
@@ -6509,6 +6604,8 @@ static int pskb_carve_inside_nonlinear(s
if (skb_pfmemalloc(skb))
gfp_mask |= __GFP_MEMALLOC;