Merge tag 'v6.4-rc4' into wpan-next/staging

Linux 6.4-rc4
This commit is contained in:
Miquel Raynal
2023-06-06 10:42:42 +02:00
13518 changed files with 799834 additions and 404916 deletions

View File

@@ -2499,8 +2499,7 @@ static int nl802154_del_llsec_seclevel(struct sk_buff *skb,
if (wpan_dev->iftype == NL802154_IFTYPE_MONITOR)
return -EOPNOTSUPP;
if (!info->attrs[NL802154_ATTR_SEC_LEVEL] ||
llsec_parse_seclevel(info->attrs[NL802154_ATTR_SEC_LEVEL],
if (llsec_parse_seclevel(info->attrs[NL802154_ATTR_SEC_LEVEL],
&sl) < 0)
return -EINVAL;