aboutsummaryrefslogtreecommitdiff
path: root/net/mac802154
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac802154')
-rw-r--r--net/mac802154/iface.c12
-rw-r--r--net/mac802154/main.c85
2 files changed, 6 insertions, 91 deletions
diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index 025cd5aba13f..300877a1a0c9 100644
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -196,32 +196,32 @@ static int mac802154_wpan_open(struct net_device *dev)
mutex_lock(&phy->pib_lock);
- if (phy->set_txpower) {
+ if (local->hw.flags & IEEE802154_HW_TXPOWER) {
rc = drv_set_tx_power(local, sdata->mac_params.transmit_power);
if (rc < 0)
goto out;
}
- if (phy->set_lbt) {
+ if (local->hw.flags & IEEE802154_HW_LBT) {
rc = drv_set_lbt_mode(local, sdata->mac_params.lbt);
if (rc < 0)
goto out;
}
- if (phy->set_cca_mode) {
+ if (local->hw.flags & IEEE802154_HW_CCA_MODE) {
rc = drv_set_cca_mode(local, sdata->mac_params.cca_mode);
if (rc < 0)
goto out;
}
- if (phy->set_cca_ed_level) {
+ if (local->hw.flags & IEEE802154_HW_CCA_ED_LEVEL) {
rc = drv_set_cca_ed_level(local,
sdata->mac_params.cca_ed_level);
if (rc < 0)
goto out;
}
- if (phy->set_csma_params) {
+ if (local->hw.flags & IEEE802154_HW_CSMA_PARAMS) {
rc = drv_set_csma_params(local, sdata->mac_params.min_be,
sdata->mac_params.max_be,
sdata->mac_params.csma_retries);
@@ -229,7 +229,7 @@ static int mac802154_wpan_open(struct net_device *dev)
goto out;
}
- if (phy->set_frame_retries) {
+ if (local->hw.flags & IEEE802154_HW_FRAME_RETRIES) {
rc = drv_set_max_frame_retries(local,
sdata->mac_params.frame_retries);
if (rc < 0)
diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index 24ecc09de2a4..9fa9514b3a36 100644
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -121,49 +121,6 @@ err:
return ERR_PTR(err);
}
-static int mac802154_set_txpower(struct wpan_phy *phy, int db)
-{
- struct ieee802154_local *local = wpan_phy_priv(phy);
-
- return drv_set_tx_power(local, db);
-}
-
-static int mac802154_set_lbt(struct wpan_phy *phy, bool on)
-{
- struct ieee802154_local *local = wpan_phy_priv(phy);
-
- return drv_set_lbt_mode(local, on);
-}
-
-static int mac802154_set_cca_mode(struct wpan_phy *phy, u8 mode)
-{
- struct ieee802154_local *local = wpan_phy_priv(phy);
-
- return drv_set_cca_mode(local, mode);
-}
-
-static int mac802154_set_cca_ed_level(struct wpan_phy *phy, s32 level)
-{
- struct ieee802154_local *local = wpan_phy_priv(phy);
-
- return drv_set_cca_ed_level(local, level);
-}
-
-static int mac802154_set_csma_params(struct wpan_phy *phy, u8 min_be,
- u8 max_be, u8 retries)
-{
- struct ieee802154_local *local = wpan_phy_priv(phy);
-
- return drv_set_csma_params(local, min_be, max_be, retries);
-}
-
-static int mac802154_set_frame_retries(struct wpan_phy *phy, s8 retries)
-{
- struct ieee802154_local *local = wpan_phy_priv(phy);
-
- return drv_set_max_frame_retries(local, retries);
-}
-
static void ieee802154_tasklet_handler(unsigned long data)
{
struct ieee802154_local *local = (struct ieee802154_local *)data;
@@ -262,48 +219,6 @@ int ieee802154_register_hw(struct ieee802154_hw *hw)
struct ieee802154_local *local = hw_to_local(hw);
int rc = -ENOSYS;
- if (hw->flags & IEEE802154_HW_TXPOWER) {
- if (!local->ops->set_txpower)
- goto out;
-
- local->phy->set_txpower = mac802154_set_txpower;
- }
-
- if (hw->flags & IEEE802154_HW_LBT) {
- if (!local->ops->set_lbt)
- goto out;
-
- local->phy->set_lbt = mac802154_set_lbt;
- }
-
- if (hw->flags & IEEE802154_HW_CCA_MODE) {
- if (!local->ops->set_cca_mode)
- goto out;
-
- local->phy->set_cca_mode = mac802154_set_cca_mode;
- }
-
- if (hw->flags & IEEE802154_HW_CCA_ED_LEVEL) {
- if (!local->ops->set_cca_ed_level)
- goto out;
-
- local->phy->set_cca_ed_level = mac802154_set_cca_ed_level;
- }
-
- if (hw->flags & IEEE802154_HW_CSMA_PARAMS) {
- if (!local->ops->set_csma_params)
- goto out;
-
- local->phy->set_csma_params = mac802154_set_csma_params;
- }
-
- if (hw->flags & IEEE802154_HW_FRAME_RETRIES) {
- if (!local->ops->set_frame_retries)
- goto out;
-
- local->phy->set_frame_retries = mac802154_set_frame_retries;
- }
-
local->workqueue =
create_singlethread_workqueue(wpan_phy_name(local->phy));
if (!local->workqueue) {