Commit 1229df4b authored by Miquel Raynal's avatar Miquel Raynal Committed by Stefan Schmidt
Browse files

net: mac802154: Fix symbol durations 



There are two major issues in the logic calculating the symbol durations
based on the page/channel:
- The page number is used in place of the channel value.
- The BIT() macro is missing because we want to check the channel
  value against a bitmask.

Fix these two errors and apologize loudly for this mistake.

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Acked-by: default avatarAlexander Aring <aahringo@redhat.com>
Link: https://lore.kernel.org/r/20220428164140.251965-1-miquel.raynal@bootlin.com


Signed-off-by: default avatarStefan Schmidt <stefan@datenfreihafen.org>
parent 510ce586

net/mac802154/main.c

+6 −6
Original line number Diff line number Diff line
@@ -119,26 +119,26 @@ void ieee802154_configure_durations(struct wpan_phy *phy) 


	switch (phy->current_page) {

	case 0:

		if (BIT(phy->current_page) & 0x1)

		if (BIT(phy->current_channel) & 0x1)

			/* 868 MHz BPSK 802.15.4-2003: 20 ksym/s */

			duration = 50 * NSEC_PER_USEC;

		else if (phy->current_page & 0x7FE)

		else if (BIT(phy->current_channel) & 0x7FE)

			/* 915 MHz BPSK	802.15.4-2003: 40 ksym/s */

			duration = 25 * NSEC_PER_USEC;

		else if (phy->current_page & 0x7FFF800)

		else if (BIT(phy->current_channel) & 0x7FFF800)

			/* 2400 MHz O-QPSK 802.15.4-2006: 62.5 ksym/s */

			duration = 16 * NSEC_PER_USEC;

		break;

	case 2:

		if (BIT(phy->current_page) & 0x1)

		if (BIT(phy->current_channel) & 0x1)

			/* 868 MHz O-QPSK 802.15.4-2006: 25 ksym/s */

			duration = 40 * NSEC_PER_USEC;

		else if (phy->current_page & 0x7FE)

		else if (BIT(phy->current_channel) & 0x7FE)

			/* 915 MHz O-QPSK 802.15.4-2006: 62.5 ksym/s */

			duration = 16 * NSEC_PER_USEC;

		break;

	case 3:

		if (BIT(phy->current_page) & 0x3FFF)

		if (BIT(phy->current_channel) & 0x3FFF)

			/* 2.4 GHz CSS 802.15.4a-2007: 1/6 Msym/s */

			duration = 6 * NSEC_PER_USEC;

		break;