ieee802154: rework cca setting

The current cca setting handle is a driver specific call. We need to
introduce some 802.15.4 specific layer and mapping 802.15.4 cca modes to
driver specific ones inside the 802.15.4 driver. This patch will add
such 802.15.4 layer and mapping the cca settings to driver specific ones.

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

5 files changed, 10 insertions, 9 deletions

diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c
index cd919493c976..3c902e9516fb 100644
--- a/net/ieee802154/nl-mac.c
+++ b/net/ieee802154/nl-mac.c
@@ -121,7 +121,7 @@ static int ieee802154_nl_fill_iface(struct sk_buff *msg, u32 portid,
                                params.transmit_power) ||
                     nla_put_u8(msg, IEEE802154_ATTR_LBT_ENABLED, params.lbt) ||
                     nla_put_u8(msg, IEEE802154_ATTR_CCA_MODE,
-                               params.cca_mode) ||
+                               params.cca.mode) ||
                     nla_put_s32(msg, IEEE802154_ATTR_CCA_ED_LEVEL,
                                 params.cca_ed_level) ||
                     nla_put_u8(msg, IEEE802154_ATTR_CSMA_RETRIES,
@@ -516,7 +516,7 @@ int ieee802154_set_macparams(struct sk_buff *skb, struct genl_info *info)
                 params.lbt = nla_get_u8(info->attrs[IEEE802154_ATTR_LBT_ENABLED]);
 
         if (info->attrs[IEEE802154_ATTR_CCA_MODE])
-                params.cca_mode = nla_get_u8(info->attrs[IEEE802154_ATTR_CCA_MODE]);
+                params.cca.mode = nla_get_u8(info->attrs[IEEE802154_ATTR_CCA_MODE]);
 
         if (info->attrs[IEEE802154_ATTR_CCA_ED_LEVEL])
                 params.cca_ed_level = nla_get_s32(info->attrs[IEEE802154_ATTR_CCA_ED_LEVEL]);
diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index 889647744697..1efbe4250024 100644
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -291,7 +291,7 @@ static int nl802154_send_wpan_phy(struct cfg802154_registered_device *rdev,
 
         /* cca mode */
         if (nla_put_u8(msg, NL802154_ATTR_CCA_MODE,
-                       rdev->wpan_phy.cca_mode))
+                       rdev->wpan_phy.cca.mode))
                 goto nla_put_failure;
 
         if (nla_put_s8(msg, NL802154_ATTR_TX_POWER,
diff --git a/net/ieee802154/sysfs.c b/net/ieee802154/sysfs.c
index 1613b9c65dfa..dff55c2d87f3 100644
--- a/net/ieee802154/sysfs.c
+++ b/net/ieee802154/sysfs.c
@@ -68,7 +68,7 @@ static DEVICE_ATTR_RO(name)
 MASTER_SHOW(current_channel, "%d");
 MASTER_SHOW(current_page, "%d");
 MASTER_SHOW(transmit_power, "%d +- 1 dB");
-MASTER_SHOW(cca_mode, "%d");
+MASTER_SHOW_COMPLEX(cca_mode, "%d", phy->cca.mode);
 
 static ssize_t channels_supported_show(struct device *dev,
                                        struct device_attribute *attr,
diff --git a/net/mac802154/driver-ops.h b/net/mac802154/driver-ops.h
index f21e864613d0..98180a9fff4a 100644
--- a/net/mac802154/driver-ops.h
+++ b/net/mac802154/driver-ops.h
@@ -70,7 +70,8 @@ static inline int drv_set_tx_power(struct ieee802154_local *local, s8 dbm)
         return local->ops->set_txpower(&local->hw, dbm);
 }
 
-static inline int drv_set_cca_mode(struct ieee802154_local *local, u8 cca_mode)
+static inline int drv_set_cca_mode(struct ieee802154_local *local,
+                                   const struct wpan_phy_cca *cca)
 {
         might_sleep();
 
@@ -79,7 +80,7 @@ static inline int drv_set_cca_mode(struct ieee802154_local *local, u8 cca_mode)
                 return -EOPNOTSUPP;
         }
 
-        return local->ops->set_cca_mode(&local->hw, cca_mode);
+        return local->ops->set_cca_mode(&local->hw, cca);
 }
 
 static inline int drv_set_lbt_mode(struct ieee802154_local *local, bool mode)
diff --git a/net/mac802154/mac_cmd.c b/net/mac802154/mac_cmd.c
index 6aacb1816889..bdccb4ecd30f 100644
--- a/net/mac802154/mac_cmd.c
+++ b/net/mac802154/mac_cmd.c
@@ -81,7 +81,7 @@ static int mac802154_set_mac_params(struct net_device *dev,
 
         /* PHY */
         wpan_dev->wpan_phy->transmit_power = params->transmit_power;
-        wpan_dev->wpan_phy->cca_mode = params->cca_mode;
+        wpan_dev->wpan_phy->cca = params->cca;
         wpan_dev->wpan_phy->cca_ed_level = params->cca_ed_level;
 
         /* MAC */
@@ -98,7 +98,7 @@ static int mac802154_set_mac_params(struct net_device *dev,
         }
 
         if (local->hw.flags & IEEE802154_HW_CCA_MODE) {
-                ret = drv_set_cca_mode(local, params->cca_mode);
+                ret = drv_set_cca_mode(local, &params->cca);
                 if (ret < 0)
                         return ret;
         }
@@ -122,7 +122,7 @@ static void mac802154_get_mac_params(struct net_device *dev,
 
         /* PHY */
         params->transmit_power = wpan_dev->wpan_phy->transmit_power;
-        params->cca_mode = wpan_dev->wpan_phy->cca_mode;
+        params->cca = wpan_dev->wpan_phy->cca;
         params->cca_ed_level = wpan_dev->wpan_phy->cca_ed_level;
 
         /* MAC */