Skip to content

Commit 613c869

Browse files
committed
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/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 4a4ce82 + ffd7bdd commit 613c869

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

drivers/net/ieee802154/adf7242.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1310,10 +1310,11 @@ static void adf7242_remove(struct spi_device *spi)
13101310

13111311
debugfs_remove_recursive(lp->debugfs_root);
13121312

1313+
ieee802154_unregister_hw(lp->hw);
1314+
13131315
cancel_delayed_work_sync(&lp->work);
13141316
destroy_workqueue(lp->wqueue);
13151317

1316-
ieee802154_unregister_hw(lp->hw);
13171318
mutex_destroy(&lp->bmux);
13181319
ieee802154_free_hw(lp->hw);
13191320
}

drivers/net/ieee802154/ca8210.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2293,7 +2293,7 @@ static int ca8210_set_csma_params(
22932293
* @retries: Number of retries
22942294
*
22952295
* Sets the number of times to retry a transmission if no acknowledgment was
2296-
* was received from the other end when one was requested.
2296+
* received from the other end when one was requested.
22972297
*
22982298
* Return: 0 or linux error code
22992299
*/

drivers/net/ieee802154/cc2520.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,7 @@ cc2520_tx(struct ieee802154_hw *hw, struct sk_buff *skb)
504504
goto err_tx;
505505

506506
if (status & CC2520_STATUS_TX_UNDERFLOW) {
507+
rc = -EINVAL;
507508
dev_err(&priv->spi->dev, "cc2520 tx underflow exception\n");
508509
goto err_tx;
509510
}

net/mac802154/rx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ieee802154_subif_frame(struct ieee802154_sub_if_data *sdata,
4444

4545
switch (mac_cb(skb)->dest.mode) {
4646
case IEEE802154_ADDR_NONE:
47-
if (mac_cb(skb)->dest.mode != IEEE802154_ADDR_NONE)
47+
if (hdr->source.mode != IEEE802154_ADDR_NONE)
4848
/* FIXME: check if we are PAN coordinator */
4949
skb->pkt_type = PACKET_OTHERHOST;
5050
else

0 commit comments

Comments
 (0)