A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 10:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge tag 'LA.UM.9.14.r1-23300-LAHAINA.QSSI14.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4 into android13-5.4-lahaina

Browse source 
"LA.UM.9.14.r1-23300-LAHAINA.QSSI14.0"

* tag 'LA.UM.9.14.r1-23300-LAHAINA.QSSI14.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4:
  coresight: Fix duplicate and abnormal stop issues of PCIE sw path
  nl80211: fix beacon tx rate mask validation
  msm_ipa: Add flag to enable ipv6 option header
  soc:qcom: trivial fix
  soc: qcom: socinfo: Add sku sysfs support
  soc: qcom: socinfo: Add revision 16 support in socinfo structure
  mtd: msm_qpic_nand: Add mutex lock in system suspend/resume functions

 Conflicts:
	drivers/firmware/qcom_scm.c
	drivers/md/dm-verity-target.c
	drivers/usb/dwc3/core.c
	drivers/usb/dwc3/debugfs.c
	drivers/usb/gadget/function/f_fs.c

Change-Id: If237dbcd440d72c0a56ed7ca57f1d55a777973a5
This commit is contained in:
Michael Bestas 2023-12-11 20:34:10 +02:00
commit 0013ddf520
No known key found for this signature in database
GPG key ID: CC95044519BE6669
11 changed files with 2344 additions and 2171 deletions
Download patch file Download diff file Expand all files Collapse all files

12
net/wireless/nl80211.c
View file

@ -4408,7 +4408,8 @@ static const struct nla_policy nl80211_txattr_policy[NL80211_TXRATE_MAX + 1] = {
};
static int nl80211_parse_tx_bitrate_mask(struct genl_info *info,
struct cfg80211_bitrate_mask *mask)
struct cfg80211_bitrate_mask *mask,
bool default_all_enabled)
{
struct nlattr *tb[NL80211_TXRATE_MAX + 1];
struct cfg80211_registered_device *rdev = info->user_ptr[0];
@ -4420,6 +4421,9 @@ static int nl80211_parse_tx_bitrate_mask(struct genl_info *info,
memset(mask, 0, sizeof(*mask));
/* Default to all rates enabled */
for (i = 0; i < NUM_NL80211_BANDS; i++) {
if (!default_all_enabled)
break;
sband = rdev->wiphy.bands[i];
if (!sband)
@ -4943,7 +4947,7 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
return -EINVAL;
if (info->attrs[NL80211_ATTR_TX_RATES]) {
err = nl80211_parse_tx_bitrate_mask(info, &params.beacon_rate);
err = nl80211_parse_tx_bitrate_mask(info, &params.beacon_rate, false);
if (err)
return err;
@ -10725,7 +10729,7 @@ static int nl80211_set_tx_bitrate_mask(struct sk_buff *skb,
if (!rdev->ops->set_bitrate_mask)
return -EOPNOTSUPP;
err = nl80211_parse_tx_bitrate_mask(info, &mask);
err = nl80211_parse_tx_bitrate_mask(info, &mask, true);
if (err)
return err;
@ -11321,7 +11325,7 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info)
}
if (info->attrs[NL80211_ATTR_TX_RATES]) {
err = nl80211_parse_tx_bitrate_mask(info, &setup.beacon_rate);
err = nl80211_parse_tx_bitrate_mask(info, &setup.beacon_rate, false);
if (err)
return err;