diff options
| author | Alexander Aring <alex.aring@gmail.com> | 2014-12-10 15:33:12 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-12-19 00:19:23 +0100 |
| commit | 7fe9a3882bb37195c41ab125a0f2852398d2646a (patch) | |
| tree | 2575090079228f59a93466eaf2d1b69524b97e8a /net/mac802154/mac_cmd.c | |
| parent | b40d6376ff470572e2fafb20ca06a68f2d7940cb (diff) | |
| download | linux-stable-7fe9a3882bb37195c41ab125a0f2852398d2646a.tar.gz linux-stable-7fe9a3882bb37195c41ab125a0f2852398d2646a.tar.bz2 linux-stable-7fe9a3882bb37195c41ab125a0f2852398d2646a.zip | |
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>
Diffstat (limited to 'net/mac802154/mac_cmd.c')
| -rw-r--r-- | net/mac802154/mac_cmd.c | 6 |
1 files changed, 3 insertions, 3 deletions
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, ¶ms->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 */ |