Skip to content

Commit b465c0d

Browse files
committed
Merge tag 'ieee802154-for-net-2022-02-15' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan
Stefan Schmidt says: ==================== Only a single fix this time. Miquel Raynal fixed the lifs/sifs periods in the ca82010 to take the actual symbol duration time into account. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents 525b108 + bdc120a commit b465c0d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/ieee802154/ca8210.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2975,8 +2975,8 @@ static void ca8210_hw_setup(struct ieee802154_hw *ca8210_hw)
29752975
ca8210_hw->phy->cca.opt = NL802154_CCA_OPT_ENERGY_CARRIER_AND;
29762976
ca8210_hw->phy->cca_ed_level = -9800;
29772977
ca8210_hw->phy->symbol_duration = 16;
2978-
ca8210_hw->phy->lifs_period = 40;
2979-
ca8210_hw->phy->sifs_period = 12;
2978+
ca8210_hw->phy->lifs_period = 40 * ca8210_hw->phy->symbol_duration;
2979+
ca8210_hw->phy->sifs_period = 12 * ca8210_hw->phy->symbol_duration;
29802980
ca8210_hw->flags =
29812981
IEEE802154_HW_AFILT |
29822982
IEEE802154_HW_OMIT_CKSUM |

0 commit comments

Comments
 (0)