The standard describes four modes of clear channel assesment: "energy
above threshold", "carrier found", and the logical and/or of these two.
Support for CCA mode setting is included in the at86rf230 driver,
predicated for RF212 chips.
Signed-off-by: Phoebe Buckheister <phoebe.buckheis...@itwm.fraunhofer.de>
---
drivers/net/ieee802154/at86rf230.c | 15 +++++++++++++++
include/linux/nl802154.h | 1 +
include/net/mac802154.h | 5 +++++
include/net/wpan-phy.h | 1 +
net/ieee802154/nl-phy.c | 30 +++++++++++++++++++++++++++---
net/ieee802154/nl_policy.c | 1 +
net/mac802154/ieee802154_dev.c | 8 ++++++++
7 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ieee802154/at86rf230.c
b/drivers/net/ieee802154/at86rf230.c
index 319b0e6..f3f6ecb 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -734,6 +734,20 @@ at86rf230_set_lbt(struct ieee802154_dev *dev, u8 on)
return rc;
}
+static int
+at86rf230_set_cca_mode(struct ieee802154_dev *dev, u8 mode)
+{
+ struct at86rf230_local *lp = dev->priv;
+ int rc;
+
+ if (!is_rf212(lp))
+ return -ENOTSUPP;
+
+ rc = at86rf230_write_subreg(lp, SR_CCA_MODE, mode);
+
+ return rc;
+}
+
static struct ieee802154_ops at86rf230_ops = {
.owner = THIS_MODULE,
.xmit = at86rf230_xmit,
@@ -744,6 +758,7 @@ static struct ieee802154_ops at86rf230_ops = {
.set_hw_addr_filt = at86rf230_set_hw_addr_filt,
.set_txpower = at86rf230_set_txpower,
.set_lbt = at86rf230_set_lbt,
+ .set_cca_mode = at86rf230_set_cca_mode,
};
static void at86rf230_irqwork(struct work_struct *work)
diff --git a/include/linux/nl802154.h b/include/linux/nl802154.h
index 326baee..5edefc1 100644
--- a/include/linux/nl802154.h
+++ b/include/linux/nl802154.h
@@ -72,6 +72,7 @@ enum {
IEEE802154_ATTR_TXPOWER,
IEEE802154_ATTR_LBT_ENABLED,
+ IEEE802154_ATTR_CCA_MODE,
__IEEE802154_ATTR_MAX,
};
diff --git a/include/net/mac802154.h b/include/net/mac802154.h
index c0bfdd4..44b6129 100644
--- a/include/net/mac802154.h
+++ b/include/net/mac802154.h
@@ -121,6 +121,10 @@ struct ieee802154_dev {
* set_lbt
* Enables or disables listen before talk on the device.
* Returns either zero, or negative errno.
+ *
+ * set_cca_mode
+ * Sets the CCA mode used by the device.
+ * Returns either zero, or negative errno.
*/
struct ieee802154_ops {
struct module *owner;
@@ -139,6 +143,7 @@ struct ieee802154_ops {
u8 addr[IEEE802154_ADDR_LEN]);
int (*set_txpower)(struct ieee802154_dev *dev, int db);
int (*set_lbt)(struct ieee802154_dev *dev, u8 on);
+ int (*set_cca_mode)(struct ieee802154_dev *dev, u8 mode);
};
/* Basic interface to register ieee802154 device */
diff --git a/include/net/wpan-phy.h b/include/net/wpan-phy.h
index 30cdae6..ffc5f6e 100644
--- a/include/net/wpan-phy.h
+++ b/include/net/wpan-phy.h
@@ -58,6 +58,7 @@ struct wpan_phy {
int (*set_txpower)(struct wpan_phy *phy, int txpower);
int (*set_lbt)(struct wpan_phy *phy, u8 on);
+ int (*set_cca_mode)(struct wpan_phy *phy, u8 cca_mode);
char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
};
diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c
index cda6e0d..b34dfae 100644
--- a/net/ieee802154/nl-phy.c
+++ b/net/ieee802154/nl-phy.c
@@ -58,7 +58,8 @@ static int ieee802154_nl_fill_phy(struct sk_buff *msg, u32
portid,
nla_put_u8(msg, IEEE802154_ATTR_CHANNEL, phy->current_channel) ||
nla_put_s32(msg, IEEE802154_ATTR_TXPOWER,
((signed char) (phy->transmit_power << 2)) >> 2) ||
- nla_put_u8(msg, IEEE802154_ATTR_LBT_ENABLED, phy->lbt))
+ nla_put_u8(msg, IEEE802154_ATTR_LBT_ENABLED, phy->lbt) ||
+ nla_put_u8(msg, IEEE802154_ATTR_CCA_MODE, phy->cca_mode))
goto nla_put_failure;
for (i = 0; i < 32; i++) {
if (phy->channels_supported[i])
@@ -392,6 +393,23 @@ static int phy_set_lbt(struct wpan_phy *phy, struct
genl_info *info)
return 0;
}
+static int phy_set_cca_mode(struct wpan_phy *phy, struct genl_info *info)
+{
+ u8 mode = nla_get_u8(info->attrs[IEEE802154_ATTR_CCA_MODE]);
+ int rc;
+
+ if (mode > 3)
+ return -EINVAL;
+
+ rc = phy->set_cca_mode(phy, mode);
+ if (rc < 0)
+ return rc;
+
+ phy->cca_mode = mode;
+
+ return 0;
+}
+
int ieee802154_set_phyparams(struct sk_buff *skb, struct genl_info *info)
{
struct wpan_phy *phy;
@@ -401,7 +419,8 @@ int ieee802154_set_phyparams(struct sk_buff *skb, struct
genl_info *info)
pr_debug("%s\n", __func__);
if (!info->attrs[IEEE802154_ATTR_PHY_NAME] &&
- !info->attrs[IEEE802154_ATTR_LBT_ENABLED])
+ !info->attrs[IEEE802154_ATTR_LBT_ENABLED] &&
+ !info->attrs[IEEE802154_ATTR_CCA_MODE])
return -EINVAL;
name = nla_data(info->attrs[IEEE802154_ATTR_PHY_NAME]);
@@ -413,7 +432,8 @@ int ieee802154_set_phyparams(struct sk_buff *skb, struct
genl_info *info)
return -ENODEV;
if ((!phy->set_txpower && info->attrs[IEEE802154_ATTR_TXPOWER]) ||
- (!phy->set_lbt && info->attrs[IEEE802154_ATTR_LBT_ENABLED]))
+ (!phy->set_lbt && info->attrs[IEEE802154_ATTR_LBT_ENABLED]) ||
+ (!phy->set_cca_mode && info->attrs[IEEE802154_ATTR_CCA_MODE]))
goto out;
if (info->attrs[IEEE802154_ATTR_TXPOWER] &&
@@ -424,6 +444,10 @@ int ieee802154_set_phyparams(struct sk_buff *skb, struct
genl_info *info)
(rc = phy_set_lbt(phy, info)) < 0)
goto out;
+ if (info->attrs[IEEE802154_ATTR_CCA_MODE] &&
+ (rc = phy_set_cca_mode(phy, info)) < 0)
+ goto out;
+
wpan_phy_put(phy);
return 0;
diff --git a/net/ieee802154/nl_policy.c b/net/ieee802154/nl_policy.c
index ab88033..86e59d0 100644
--- a/net/ieee802154/nl_policy.c
+++ b/net/ieee802154/nl_policy.c
@@ -55,5 +55,6 @@ const struct nla_policy ieee802154_policy[IEEE802154_ATTR_MAX
+ 1] = {
[IEEE802154_ATTR_TXPOWER] = { .type = NLA_S32, },
[IEEE802154_ATTR_LBT_ENABLED] = { .type = NLA_U8, },
+ [IEEE802154_ATTR_CCA_MODE] = { .type = NLA_U8, },
};
diff --git a/net/mac802154/ieee802154_dev.c b/net/mac802154/ieee802154_dev.c
index 762a452..56d0e71 100644
--- a/net/mac802154/ieee802154_dev.c
+++ b/net/mac802154/ieee802154_dev.c
@@ -179,6 +179,13 @@ static int mac802154_set_lbt(struct wpan_phy *phy, u8 on)
return priv->ops->set_lbt(&priv->hw, on);
}
+static int mac802154_set_cca_mode(struct wpan_phy *phy, u8 mode)
+{
+ struct mac802154_priv *priv = wpan_phy_priv(phy);
+
+ return priv->ops->set_cca_mode(&priv->hw, mode);
+}
+
struct ieee802154_dev *
ieee802154_alloc_device(size_t priv_data_len, struct ieee802154_ops *ops)
{
@@ -258,6 +265,7 @@ int ieee802154_register_device(struct ieee802154_dev *dev)
priv->phy->del_iface = mac802154_del_iface;
priv->phy->set_txpower = mac802154_set_txpower;
priv->phy->set_lbt = mac802154_set_lbt;
+ priv->phy->set_cca_mode = mac802154_set_cca_mode;
rc = wpan_phy_register(priv->phy);
if (rc < 0)
--
1.7.9.5
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Linux-zigbee-devel mailing list
Linux-zigbee-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-zigbee-devel
