Commit b465c0dc authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'ieee802154-for-net-2022-02-15' of... 

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 525b108e bdc120a2

drivers/net/ieee802154/ca8210.c

+2 −2
Original line number Diff line number Diff line
@@ -2975,8 +2975,8 @@ static void ca8210_hw_setup(struct ieee802154_hw *ca8210_hw) 
	ca8210_hw->phy->cca.opt = NL802154_CCA_OPT_ENERGY_CARRIER_AND;

	ca8210_hw->phy->cca_ed_level = -9800;

	ca8210_hw->phy->symbol_duration = 16;

	ca8210_hw->phy->lifs_period = 40;

	ca8210_hw->phy->sifs_period = 12;

	ca8210_hw->phy->lifs_period = 40 * ca8210_hw->phy->symbol_duration;

	ca8210_hw->phy->sifs_period = 12 * ca8210_hw->phy->symbol_duration;

	ca8210_hw->flags =

		IEEE802154_HW_AFILT |

		IEEE802154_HW_OMIT_CKSUM |