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

Commit 7fe9a388 authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann
Browse files

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: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent b40d6376

drivers/net/ieee802154/at86rf230.c

+28 −2
Original line number Diff line number Diff line
@@ -1146,11 +1146,37 @@ at86rf230_set_lbt(struct ieee802154_hw *hw, bool on) 
}



static int

at86rf230_set_cca_mode(struct ieee802154_hw *hw, u8 mode)

at86rf230_set_cca_mode(struct ieee802154_hw *hw,

		       const struct wpan_phy_cca *cca)

{

	struct at86rf230_local *lp = hw->priv;

	u8 val;



	return at86rf230_write_subreg(lp, SR_CCA_MODE, mode);

	/* mapping 802.15.4 to driver spec */

	switch (cca->mode) {

	case NL802154_CCA_ENERGY:

		val = 1;

		break;

	case NL802154_CCA_CARRIER:

		val = 2;

		break;

	case NL802154_CCA_ENERGY_CARRIER:

		switch (cca->opt) {

		case NL802154_CCA_OPT_ENERGY_CARRIER_AND:

			val = 3;

			break;

		case NL802154_CCA_OPT_ENERGY_CARRIER_OR:

			val = 0;

			break;

		default:

			return -EINVAL;

		}

		break;

	default:

		return -EINVAL;

	}



	return at86rf230_write_subreg(lp, SR_CCA_MODE, val);

}



static int

include/net/cfg802154.h

+6 −1
Original line number Diff line number Diff line
@@ -56,6 +56,11 @@ struct cfg802154_ops { 
				struct wpan_dev *wpan_dev, bool mode);

};



struct wpan_phy_cca {

	enum nl802154_cca_modes mode;

	enum nl802154_cca_opts opt;

};



struct wpan_phy {

	struct mutex pib_lock;
@@ -76,7 +81,7 @@ struct wpan_phy { 
	u8 current_page;

	u32 channels_supported[IEEE802154_MAX_PAGE + 1];

	s8 transmit_power;

	u8 cca_mode;

	struct wpan_phy_cca cca;



	__le64 perm_extended_addr;

include/net/ieee802154_netdev.h

+3 −1
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <linux/skbuff.h>

#include <linux/ieee802154.h>



#include <net/cfg802154.h>



struct ieee802154_sechdr {

#if defined(__LITTLE_ENDIAN_BITFIELD)

	u8 level:3,
@@ -337,7 +339,7 @@ struct ieee802154_mac_params { 
	s8 frame_retries;



	bool lbt;

	u8 cca_mode;

	struct wpan_phy_cca cca;

	s32 cca_ed_level;

};

include/net/mac802154.h

+4 −1
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include <linux/ieee802154.h>

#include <linux/skbuff.h>



#include <net/cfg802154.h>



/* General MAC frame format:

 *  2 bytes: Frame Control

 *  1 byte:  Sequence Number
@@ -212,7 +214,8 @@ struct ieee802154_ops { 
					    unsigned long changed);

	int		(*set_txpower)(struct ieee802154_hw *hw, int db);

	int		(*set_lbt)(struct ieee802154_hw *hw, bool on);

	int		(*set_cca_mode)(struct ieee802154_hw *hw, u8 mode);

	int		(*set_cca_mode)(struct ieee802154_hw *hw,

					const struct wpan_phy_cca *cca);

	int		(*set_cca_ed_level)(struct ieee802154_hw *hw,

					    s32 level);

	int		(*set_csma_params)(struct ieee802154_hw *hw,

net/ieee802154/nl-mac.c

+2 −2
Original line number Diff line number Diff line
@@ -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]);