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: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index 6fb6bdf9868c7684b63635a23c2a8b45ae07e4d8..38b56f9d9386a4821e50cfdd6059fa115c5e4358 100644 (file)
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -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;
        }