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

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.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 4a4ce822 ffd7bddd
...@@ -1310,10 +1310,11 @@ static void adf7242_remove(struct spi_device *spi) ...@@ -1310,10 +1310,11 @@ static void adf7242_remove(struct spi_device *spi)
debugfs_remove_recursive(lp->debugfs_root); debugfs_remove_recursive(lp->debugfs_root);
ieee802154_unregister_hw(lp->hw);
cancel_delayed_work_sync(&lp->work); cancel_delayed_work_sync(&lp->work);
destroy_workqueue(lp->wqueue); destroy_workqueue(lp->wqueue);
ieee802154_unregister_hw(lp->hw);
mutex_destroy(&lp->bmux); mutex_destroy(&lp->bmux);
ieee802154_free_hw(lp->hw); ieee802154_free_hw(lp->hw);
} }
......
...@@ -2293,7 +2293,7 @@ static int ca8210_set_csma_params( ...@@ -2293,7 +2293,7 @@ static int ca8210_set_csma_params(
* @retries: Number of retries * @retries: Number of retries
* *
* Sets the number of times to retry a transmission if no acknowledgment was * 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 * Return: 0 or linux error code
*/ */
......
...@@ -504,6 +504,7 @@ cc2520_tx(struct ieee802154_hw *hw, struct sk_buff *skb) ...@@ -504,6 +504,7 @@ cc2520_tx(struct ieee802154_hw *hw, struct sk_buff *skb)
goto err_tx; goto err_tx;
if (status & CC2520_STATUS_TX_UNDERFLOW) { if (status & CC2520_STATUS_TX_UNDERFLOW) {
rc = -EINVAL;
dev_err(&priv->spi->dev, "cc2520 tx underflow exception\n"); dev_err(&priv->spi->dev, "cc2520 tx underflow exception\n");
goto err_tx; goto err_tx;
} }
......
...@@ -44,7 +44,7 @@ ieee802154_subif_frame(struct ieee802154_sub_if_data *sdata, ...@@ -44,7 +44,7 @@ ieee802154_subif_frame(struct ieee802154_sub_if_data *sdata,
switch (mac_cb(skb)->dest.mode) { switch (mac_cb(skb)->dest.mode) {
case IEEE802154_ADDR_NONE: 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 */ /* FIXME: check if we are PAN coordinator */
skb->pkt_type = PACKET_OTHERHOST; skb->pkt_type = PACKET_OTHERHOST;
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment