Skip to content

Commit a4d7108

Browse files
committed
Merge tag 'ieee802154-for-net-2023-03-29' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan
Stefan Schmidt says: ==================== ieee802154 for net 2023-03-29 Two small fixes this time. Dongliang Mu removed an unnecessary null pointer check. Harshit Mogalapalli fixed an int comparison unsigned against signed from a recent other fix in the ca8210 driver. * tag 'ieee802154-for-net-2023-03-29' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan: net: ieee802154: remove an unnecessary null pointer check ca8210: Fix unsigned mac_len comparison with zero in ca8210_skb_tx() ==================== Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 8c49527 + 984cfd5 commit a4d7108

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

drivers/net/ieee802154/ca8210.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1902,10 +1902,9 @@ static int ca8210_skb_tx(
19021902
struct ca8210_priv *priv
19031903
)
19041904
{
1905-
int status;
19061905
struct ieee802154_hdr header = { };
19071906
struct secspec secspec;
1908-
unsigned int mac_len;
1907+
int mac_len, status;
19091908

19101909
dev_dbg(&priv->spi->dev, "%s called\n", __func__);
19111910

net/ieee802154/nl802154.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2488,8 +2488,7 @@ static int nl802154_del_llsec_seclevel(struct sk_buff *skb,
24882488
if (wpan_dev->iftype == NL802154_IFTYPE_MONITOR)
24892489
return -EOPNOTSUPP;
24902490

2491-
if (!info->attrs[NL802154_ATTR_SEC_LEVEL] ||
2492-
llsec_parse_seclevel(info->attrs[NL802154_ATTR_SEC_LEVEL],
2491+
if (llsec_parse_seclevel(info->attrs[NL802154_ATTR_SEC_LEVEL],
24932492
&sl) < 0)
24942493
return -EINVAL;
24952494

0 commit comments

Comments
 (0)