Commit a4d7108c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'ieee802154-for-net-2023-03-29' of... 

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/20230329064541.2147400-1-stefan@datenfreihafen.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 8c495270 984cfd55

drivers/net/ieee802154/ca8210.c

+1 −2
Original line number Diff line number Diff line
@@ -1902,10 +1902,9 @@ static int ca8210_skb_tx( 
	struct ca8210_priv  *priv

)

{

	int status;

	struct ieee802154_hdr header = { };

	struct secspec secspec;

	unsigned int mac_len;

	int mac_len, status;



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

net/ieee802154/nl802154.c

+1 −2
Original line number Diff line number Diff line
@@ -2488,8 +2488,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;