Commit 613c8697 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'ieee802154-for-net-2022-08-29' of... 

Merge tag 'ieee802154-for-net-2022-08-29' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan

Stefan Schmidt says:

====================
ieee802154 for net 2022-08-29

 - repeated word fix from Jilin Yuan.
 - missed return code setting in the cc2520 driver by Li Qiong.
 - fixing a potential race in by defering the workqueue destroy
   in the adf7242 driver by Lin Ma.
 - fixing a long standing problem in the mac802154 rx path to match
   corretcly by Miquel Raynal.

* tag 'ieee802154-for-net-2022-08-29' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan:
  ieee802154: cc2520: add rc code in cc2520_tx()
  net: mac802154: Fix a condition in the receive path
  net/ieee802154: fix repeated words in comments
  ieee802154/adf7242: defer destroy_workqueue call
====================

Link: https://lore.kernel.org/r/20220829100308.2802578-1-stefan@datenfreihafen.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 4a4ce822 ffd7bddd

drivers/net/ieee802154/adf7242.c

+2 −1
Original line number Diff line number Diff line
@@ -1310,10 +1310,11 @@ static void adf7242_remove(struct spi_device *spi) 


	debugfs_remove_recursive(lp->debugfs_root);



	ieee802154_unregister_hw(lp->hw);



	cancel_delayed_work_sync(&lp->work);

	destroy_workqueue(lp->wqueue);



	ieee802154_unregister_hw(lp->hw);

	mutex_destroy(&lp->bmux);

	ieee802154_free_hw(lp->hw);

}

drivers/net/ieee802154/ca8210.c

+1 −1
Original line number Diff line number Diff line
@@ -2293,7 +2293,7 @@ static int ca8210_set_csma_params( 
 * @retries:  Number of retries

 *

 * Sets the number of times to retry a transmission if no acknowledgment was

 * was received from the other end when one was requested.

 * received from the other end when one was requested.

 *

 * Return: 0 or linux error code

 */

drivers/net/ieee802154/cc2520.c

+1 −0
Original line number Diff line number Diff line
@@ -504,6 +504,7 @@ cc2520_tx(struct ieee802154_hw *hw, struct sk_buff *skb) 
		goto err_tx;



	if (status & CC2520_STATUS_TX_UNDERFLOW) {

		rc = -EINVAL;

		dev_err(&priv->spi->dev, "cc2520 tx underflow exception\n");

		goto err_tx;

	}

net/mac802154/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ ieee802154_subif_frame(struct ieee802154_sub_if_data *sdata, 


	switch (mac_cb(skb)->dest.mode) {

	case IEEE802154_ADDR_NONE:

		if (mac_cb(skb)->dest.mode != IEEE802154_ADDR_NONE)

		if (hdr->source.mode != IEEE802154_ADDR_NONE)

			/* FIXME: check if we are PAN coordinator */

			skb->pkt_type = PACKET_OTHERHOST;

		else