mac802154: check for really changes

This patch adds check if the value is really changed inside pib/mib.
If a transceiver do support only one value for e.g. max_be then this
will also handle that the driver layer doesn't need to care about
handling to set one value only.

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

diff --git a/include/net/cfg802154.h b/include/net/cfg802154.h
index 23abd08a310a0dadbae2da5a6fce0f78f2b76dae..37abc16032858c70a97147e9fc26dd50b103f5dd 100644 (file)
--- a/include/net/cfg802154.h
+++ b/include/net/cfg802154.h
@@ -94,6 +94,18 @@ struct wpan_phy_cca {
        enum nl802154_cca_opts opt;
 };
 
+static inline bool
+wpan_phy_cca_cmp(const struct wpan_phy_cca *a, const struct wpan_phy_cca *b)
+{
+       if (a->mode != b->mode)
+               return false;
+
+       if (a->mode == NL802154_CCA_ENERGY_CARRIER)
+               return a->opt == b->opt;
+
+       return true;
+}
+
 struct wpan_phy {
        struct mutex pib_lock;
 

diff --git a/net/mac802154/cfg.c b/net/mac802154/cfg.c
index c63601582c71c3d482afab3d25bbc7bfe4de0b10..45c4dc39766e20cc222bb695ff28f979511f0dfc 100644 (file)
--- a/net/mac802154/cfg.c
+++ b/net/mac802154/cfg.c
@@ -73,6 +73,10 @@ ieee802154_set_channel(struct wpan_phy *wpan_phy, u8 page, u8 channel)
 
        ASSERT_RTNL();
 
+       if (wpan_phy->current_page == page &&
+           wpan_phy->current_channel == channel)
+               return 0;
+
        ret = drv_set_channel(local, page, channel);
        if (!ret) {
                wpan_phy->current_page = page;
@@ -91,6 +95,9 @@ ieee802154_set_cca_mode(struct wpan_phy *wpan_phy,
 
        ASSERT_RTNL();
 
+       if (wpan_phy_cca_cmp(&wpan_phy->cca, cca))
+               return 0;
+
        /* check if phy support this setting */
        if (!(local->hw.flags & IEEE802154_HW_CCA_MODE))
                return -EOPNOTSUPP;
@@ -108,6 +115,9 @@ ieee802154_set_pan_id(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,
 {
        ASSERT_RTNL();
 
+       if (wpan_dev->pan_id == pan_id)
+               return 0;
+
        wpan_dev->pan_id = pan_id;
        return 0;
 }
@@ -121,6 +131,10 @@ ieee802154_set_backoff_exponent(struct wpan_phy *wpan_phy,
 
        ASSERT_RTNL();
 
+       if (wpan_dev->min_be == min_be &&
+           wpan_dev->max_be == max_be)
+               return 0;
+
        if (!(local->hw.flags & IEEE802154_HW_CSMA_PARAMS))
                return -EOPNOTSUPP;
 
@@ -135,6 +149,9 @@ ieee802154_set_short_addr(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,
 {
        ASSERT_RTNL();
 
+       if (wpan_dev->short_addr == short_addr)
+               return 0;
+
        wpan_dev->short_addr = short_addr;
        return 0;
 }
@@ -148,6 +165,9 @@ ieee802154_set_max_csma_backoffs(struct wpan_phy *wpan_phy,
 
        ASSERT_RTNL();
 
+       if (wpan_dev->csma_retries == max_csma_backoffs)
+               return 0;
+
        if (!(local->hw.flags & IEEE802154_HW_CSMA_PARAMS))
                return -EOPNOTSUPP;
 
@@ -164,6 +184,9 @@ ieee802154_set_max_frame_retries(struct wpan_phy *wpan_phy,
 
        ASSERT_RTNL();
 
+       if (wpan_dev->frame_retries == max_frame_retries)
+               return 0;
+
        if (!(local->hw.flags & IEEE802154_HW_FRAME_RETRIES))
                return -EOPNOTSUPP;
 
@@ -179,6 +202,9 @@ ieee802154_set_lbt_mode(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,
 
        ASSERT_RTNL();
 
+       if (wpan_dev->lbt == mode)
+               return 0;
+
        if (!(local->hw.flags & IEEE802154_HW_LBT))
                return -EOPNOTSUPP;