Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 17:22:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mac802154: fix time calculation in ieee802154_configure_durations()

Browse Source 
Since 'symbol_duration' of 'struct wpan_phy' is in nanoseconds but
'lifs_period' and 'sifs_period' are both in microseconds, fix time
calculation in 'ieee802154_configure_durations()' and use convenient
'NSEC_PER_USEC' in 'ieee802154_setup_wpan_phy_pib()' as well.
Compile tested only.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 781830c800 ("net: mac802154: Set durations automatically")
Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
Message-ID: <20240508114010.219527-1-dmantipov@yandex.ru>
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
This commit is contained in:
Dmitry Antipov 2024-05-08 14:40:10 +03:00 committed by Stefan Schmidt
parent 4b377b4868
commit 07aa33988a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/mac802154/main.c
View File

@ -161,8 +161,10 @@ void ieee802154_configure_durations(struct wpan_phy *phy,
} }
phy->symbol_duration = duration; phy->symbol_duration = duration;
phy->lifs_period = (IEEE802154_LIFS_PERIOD * phy->symbol_duration) / NSEC_PER_SEC; phy->lifs_period =
phy->sifs_period = (IEEE802154_SIFS_PERIOD * phy->symbol_duration) / NSEC_PER_SEC; (IEEE802154_LIFS_PERIOD * phy->symbol_duration) / NSEC_PER_USEC;
phy->sifs_period =
(IEEE802154_SIFS_PERIOD * phy->symbol_duration) / NSEC_PER_USEC;
} }
EXPORT_SYMBOL(ieee802154_configure_durations); EXPORT_SYMBOL(ieee802154_configure_durations);
@ -184,10 +186,10 @@ static void ieee802154_setup_wpan_phy_pib(struct wpan_phy *wpan_phy)
* Should be done when all drivers sets this value. * Should be done when all drivers sets this value.
*/ */
wpan_phy->lifs_period = wpan_phy->lifs_period = (IEEE802154_LIFS_PERIOD *
(IEEE802154_LIFS_PERIOD * wpan_phy->symbol_duration) / 1000; wpan_phy->symbol_duration) / NSEC_PER_USEC;
wpan_phy->sifs_period = wpan_phy->sifs_period = (IEEE802154_SIFS_PERIOD *
(IEEE802154_SIFS_PERIOD * wpan_phy->symbol_duration) / 1000; wpan_phy->symbol_duration) / NSEC_PER_USEC;
} }
int ieee802154_register_hw(struct ieee802154_hw *hw) int ieee802154_register_hw(struct ieee802154_hw *hw)