Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bf9538a authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann
Browse files

mac802154: cleanup concurrent check 



This patch cleanups the checking of different mac phy depended values by
handling depended mac settings per hw support flag in one condition.

Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent fdf51784

net/mac802154/iface.c

+6 −14
Original line number Diff line number Diff line
@@ -174,24 +174,16 @@ ieee802154_check_mac_settings(struct ieee802154_local *local, 
	}



	if (local->hw.flags & IEEE802154_HW_AFILT) {

		if (wpan_dev->pan_id != nwpan_dev->pan_id)

			return -EBUSY;



		if (wpan_dev->short_addr != nwpan_dev->short_addr)

			return -EBUSY;



		if (wpan_dev->extended_addr != nwpan_dev->extended_addr)

		if (wpan_dev->pan_id != nwpan_dev->pan_id ||

		    wpan_dev->short_addr != nwpan_dev->short_addr ||

		    wpan_dev->extended_addr != nwpan_dev->extended_addr)

			return -EBUSY;

	}



	if (local->hw.flags & IEEE802154_HW_CSMA_PARAMS) {

		if (wpan_dev->min_be != nwpan_dev->min_be)

			return -EBUSY;



		if (wpan_dev->max_be != nwpan_dev->max_be)

			return -EBUSY;



		if (wpan_dev->csma_retries != nwpan_dev->csma_retries)

		if (wpan_dev->min_be != nwpan_dev->min_be ||

		    wpan_dev->max_be != nwpan_dev->max_be ||

		    wpan_dev->csma_retries != nwpan_dev->csma_retries)

			return -EBUSY;

	}