mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
BACKPORT: nl80211: Add NL command to support TID speicific configurations
Add the new NL80211_CMD_SET_TID_CONFIG command to support data TID specific configuration. Per TID configuration is passed in the nested NL80211_ATTR_TID_CONFIG attribute. This patch adds support to configure per TID noack policy through the NL80211_TID_CONFIG_ATTR_NOACK attribute. Bug: 154782456 Signed-off-by: Tamizh chelvam <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Johannes Berg <[email protected]> Change-Id: Ia2e2c125aaba64571453838baac052014e386cd6 (cherry picked from commit 77f576deaa393b54a0f2ca8ab1ab5b2d3c6b971b) Signed-off-by: Vamsi Krishna <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Tamizh chelvam
Greg Kroah-Hartman
parent
02d9f7e316
commit
7a59f8cab6
5 changed files with 320 additions and 0 deletions
|
|
@ -328,6 +328,14 @@ he_bss_color_policy[NL80211_HE_BSS_COLOR_ATTR_MAX + 1] = {
|
|||
[NL80211_HE_BSS_COLOR_ATTR_PARTIAL] = { .type = NLA_FLAG },
|
||||
};
|
||||
|
||||
static const struct nla_policy
|
||||
nl80211_tid_config_attr_policy[NL80211_TID_CONFIG_ATTR_MAX + 1] = {
|
||||
[NL80211_TID_CONFIG_ATTR_OVERRIDE] = { .type = NLA_FLAG },
|
||||
[NL80211_TID_CONFIG_ATTR_TIDS] = { .type = NLA_U8 },
|
||||
[NL80211_TID_CONFIG_ATTR_NOACK] =
|
||||
NLA_POLICY_MAX(NLA_U8, NL80211_TID_CONFIG_DISABLE),
|
||||
};
|
||||
|
||||
const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
|
||||
[0] = { .strict_start_type = NL80211_ATTR_HE_OBSS_PD },
|
||||
[NL80211_ATTR_WIPHY] = { .type = NLA_U32 },
|
||||
|
|
@ -637,6 +645,8 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
|
|||
[NL80211_ATTR_HE_OBSS_PD] = NLA_POLICY_NESTED(he_obss_pd_policy),
|
||||
[NL80211_ATTR_VLAN_ID] = NLA_POLICY_RANGE(NLA_U16, 1, VLAN_N_VID - 2),
|
||||
[NL80211_ATTR_HE_BSS_COLOR] = NLA_POLICY_NESTED(he_bss_color_policy),
|
||||
[NL80211_ATTR_TID_CONFIG] =
|
||||
NLA_POLICY_NESTED_ARRAY(nl80211_tid_config_attr_policy),
|
||||
};
|
||||
|
||||
/* policy for the key attributes */
|
||||
|
|
@ -13936,6 +13946,137 @@ static int nl80211_probe_mesh_link(struct sk_buff *skb, struct genl_info *info)
|
|||
return rdev_probe_mesh_link(rdev, dev, dest, buf, len);
|
||||
}
|
||||
|
||||
static int
|
||||
__nl80211_check_tid_conf_support(struct cfg80211_registered_device *rdev,
|
||||
struct netlink_ext_ack *extack,
|
||||
const u8 *peer, struct nlattr *attrs[],
|
||||
struct ieee80211_tid_cfg *tid_conf,
|
||||
enum nl80211_tid_config_attr attr,
|
||||
enum nl80211_ext_feature_index per_tid_config,
|
||||
enum nl80211_ext_feature_index per_sta_config)
|
||||
{
|
||||
if (!wiphy_ext_feature_isset(&rdev->wiphy, per_tid_config)) {
|
||||
NL_SET_ERR_MSG_ATTR(extack, attrs[attr],
|
||||
"TID specific configuration not supported");
|
||||
return -ENOTSUPP;
|
||||
}
|
||||
|
||||
if (peer && !wiphy_ext_feature_isset(&rdev->wiphy, per_sta_config)) {
|
||||
NL_SET_ERR_MSG_ATTR(extack, attrs[attr],
|
||||
"peer specific TID configuration not supported");
|
||||
return -ENOTSUPP;
|
||||
}
|
||||
|
||||
tid_conf->tid_conf_mask |= BIT(attr);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define nl80211_check_tid_config_support(rdev, extack, peer, attrs, tid_conf, \
|
||||
conf) \
|
||||
__nl80211_check_tid_conf_support(rdev, extack, peer, attrs, tid_conf, \
|
||||
NL80211_TID_CONFIG_ATTR_##conf, \
|
||||
NL80211_EXT_FEATURE_PER_TID_##conf##_CONFIG, \
|
||||
NL80211_EXT_FEATURE_PER_STA_##conf##_CONFIG)
|
||||
|
||||
static int parse_tid_conf(struct cfg80211_registered_device *rdev,
|
||||
struct nlattr *attrs[], struct net_device *dev,
|
||||
struct ieee80211_tid_cfg *tid_conf,
|
||||
struct genl_info *info, const u8 *peer)
|
||||
{
|
||||
struct netlink_ext_ack *extack = info->extack;
|
||||
int err;
|
||||
|
||||
if (!attrs[NL80211_TID_CONFIG_ATTR_TIDS])
|
||||
return -EINVAL;
|
||||
|
||||
tid_conf->config_override =
|
||||
nla_get_flag(attrs[NL80211_TID_CONFIG_ATTR_OVERRIDE]);
|
||||
tid_conf->tid = nla_get_u8(attrs[NL80211_TID_CONFIG_ATTR_TIDS]);
|
||||
|
||||
if (tid_conf->config_override) {
|
||||
if (rdev->ops->reset_tid_config) {
|
||||
err = rdev_reset_tid_config(rdev, dev, peer,
|
||||
tid_conf->tid);
|
||||
/* If peer is there no other configuration will be
|
||||
* allowed
|
||||
*/
|
||||
if (err || peer)
|
||||
return err;
|
||||
} else {
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
if (attrs[NL80211_TID_CONFIG_ATTR_NOACK]) {
|
||||
err = nl80211_check_tid_config_support(rdev, extack, peer,
|
||||
attrs, tid_conf,
|
||||
NOACK);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
tid_conf->noack =
|
||||
nla_get_u8(attrs[NL80211_TID_CONFIG_ATTR_NOACK]);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int nl80211_set_tid_config(struct sk_buff *skb,
|
||||
struct genl_info *info)
|
||||
{
|
||||
struct cfg80211_registered_device *rdev = info->user_ptr[0];
|
||||
struct nlattr *attrs[NL80211_TID_CONFIG_ATTR_MAX + 1];
|
||||
struct net_device *dev = info->user_ptr[1];
|
||||
struct ieee80211_tid_config *tid_config;
|
||||
struct nlattr *tid;
|
||||
int conf_idx = 0, rem_conf;
|
||||
int ret = -EINVAL;
|
||||
u32 num_conf = 0;
|
||||
|
||||
if (!info->attrs[NL80211_ATTR_TID_CONFIG])
|
||||
return -EINVAL;
|
||||
|
||||
if (!rdev->ops->set_tid_config)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
nla_for_each_nested(tid, info->attrs[NL80211_ATTR_TID_CONFIG],
|
||||
rem_conf)
|
||||
num_conf++;
|
||||
|
||||
tid_config = kzalloc(struct_size(tid_config, tid_conf, num_conf),
|
||||
GFP_KERNEL);
|
||||
if (!tid_config)
|
||||
return -ENOMEM;
|
||||
|
||||
tid_config->n_tid_conf = num_conf;
|
||||
|
||||
if (info->attrs[NL80211_ATTR_MAC])
|
||||
tid_config->peer = nla_data(info->attrs[NL80211_ATTR_MAC]);
|
||||
|
||||
nla_for_each_nested(tid, info->attrs[NL80211_ATTR_TID_CONFIG],
|
||||
rem_conf) {
|
||||
ret = nla_parse_nested(attrs, NL80211_TID_CONFIG_ATTR_MAX,
|
||||
tid, NULL, NULL);
|
||||
|
||||
if (ret)
|
||||
goto bad_tid_conf;
|
||||
|
||||
ret = parse_tid_conf(rdev, attrs, dev,
|
||||
&tid_config->tid_conf[conf_idx],
|
||||
info, tid_config->peer);
|
||||
if (ret)
|
||||
goto bad_tid_conf;
|
||||
|
||||
conf_idx++;
|
||||
}
|
||||
|
||||
ret = rdev_set_tid_config(rdev, dev, tid_config);
|
||||
|
||||
bad_tid_conf:
|
||||
kfree(tid_config);
|
||||
return ret;
|
||||
}
|
||||
|
||||
#define NL80211_FLAG_NEED_WIPHY 0x01
|
||||
#define NL80211_FLAG_NEED_NETDEV 0x02
|
||||
#define NL80211_FLAG_NEED_RTNL 0x04
|
||||
|
|
@ -14890,6 +15031,13 @@ static const struct genl_ops nl80211_ops[] = {
|
|||
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
|
||||
NL80211_FLAG_NEED_RTNL,
|
||||
},
|
||||
{
|
||||
.cmd = NL80211_CMD_SET_TID_CONFIG,
|
||||
.doit = nl80211_set_tid_config,
|
||||
.flags = GENL_UNS_ADMIN_PERM,
|
||||
.internal_flags = NL80211_FLAG_NEED_NETDEV |
|
||||
NL80211_FLAG_NEED_RTNL,
|
||||
},
|
||||
};
|
||||
|
||||
static struct genl_family nl80211_fam __ro_after_init = {
|
||||
|
|
|
|||
|
|
@ -1326,4 +1326,28 @@ rdev_probe_mesh_link(struct cfg80211_registered_device *rdev,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static inline int rdev_set_tid_config(struct cfg80211_registered_device *rdev,
|
||||
struct net_device *dev,
|
||||
struct ieee80211_tid_config *tid_conf)
|
||||
{
|
||||
int ret;
|
||||
|
||||
trace_rdev_set_tid_config(&rdev->wiphy, dev, tid_conf);
|
||||
ret = rdev->ops->set_tid_config(&rdev->wiphy, dev, tid_conf);
|
||||
trace_rdev_return_int(&rdev->wiphy, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static inline int rdev_reset_tid_config(struct cfg80211_registered_device *rdev,
|
||||
struct net_device *dev, const u8 *peer,
|
||||
u8 tid)
|
||||
{
|
||||
int ret;
|
||||
|
||||
trace_rdev_reset_tid_config(&rdev->wiphy, dev, peer, tid);
|
||||
ret = rdev->ops->reset_tid_config(&rdev->wiphy, dev, peer, tid);
|
||||
trace_rdev_return_int(&rdev->wiphy, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
#endif /* __CFG80211_RDEV_OPS */
|
||||
|
|
|
|||
|
|
@ -3480,6 +3480,43 @@ TRACE_EVENT(rdev_probe_mesh_link,
|
|||
WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(dest))
|
||||
);
|
||||
|
||||
TRACE_EVENT(rdev_set_tid_config,
|
||||
TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
|
||||
struct ieee80211_tid_config *tid_conf),
|
||||
TP_ARGS(wiphy, netdev, tid_conf),
|
||||
TP_STRUCT__entry(
|
||||
WIPHY_ENTRY
|
||||
NETDEV_ENTRY
|
||||
MAC_ENTRY(peer)
|
||||
),
|
||||
TP_fast_assign(
|
||||
WIPHY_ASSIGN;
|
||||
NETDEV_ASSIGN;
|
||||
MAC_ASSIGN(peer, tid_conf->peer);
|
||||
),
|
||||
TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", peer: " MAC_PR_FMT,
|
||||
WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(peer))
|
||||
);
|
||||
|
||||
TRACE_EVENT(rdev_reset_tid_config,
|
||||
TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
|
||||
const u8 *peer, u8 tid),
|
||||
TP_ARGS(wiphy, netdev, peer, tid),
|
||||
TP_STRUCT__entry(
|
||||
WIPHY_ENTRY
|
||||
NETDEV_ENTRY
|
||||
MAC_ENTRY(peer)
|
||||
__field(u8, tid)
|
||||
),
|
||||
TP_fast_assign(
|
||||
WIPHY_ASSIGN;
|
||||
NETDEV_ASSIGN;
|
||||
MAC_ASSIGN(peer, peer);
|
||||
__entry->tid = tid;
|
||||
),
|
||||
TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", peer: " MAC_PR_FMT ", tid: %u",
|
||||
WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(peer), __entry->tid)
|
||||
);
|
||||
#endif /* !__RDEV_OPS_TRACE || TRACE_HEADER_MULTI_READ */
|
||||
|
||||
#undef TRACE_INCLUDE_PATH
|
||||
|
|
|
|||
Loading…
Reference in a new issue