summaryrefslogtreecommitdiffstats
path: root/drivers/net/ieee802154
diff options
context:
space:
mode:
authorAlexander Aring <aar@pengutronix.de>2016-07-06 23:32:29 +0200
committerMarcel Holtmann <marcel@holtmann.org>2016-07-08 13:23:12 +0200
commit38961294510ab20d24809c125c0a3738a02d3a28 (patch)
tree6333aa69152085de922c3440a4ada78f5108aac3 /drivers/net/ieee802154
parent9e262f5037b95a9ccc508debec2715e70559cc81 (diff)
downloadlinux-38961294510ab20d24809c125c0a3738a02d3a28.tar.gz
linux-38961294510ab20d24809c125c0a3738a02d3a28.tar.bz2
linux-38961294510ab20d24809c125c0a3738a02d3a28.zip
atusb: don't change csma settings while set channel
This patch fixes the behaviour to not overwrite csma settings when set channel afterwards. Cc: Stefan Schmidt <stefan@osg.samsung.com> Acked-by: Stefan Schmidt <stefan@osg.samsung.com> Signed-off-by: Alexander Aring <aar@pengutronix.de> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/net/ieee802154')
-rw-r--r--drivers/net/ieee802154/atusb.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/ieee802154/atusb.c b/drivers/net/ieee802154/atusb.c
index 52c9051f3b95..1056ed142411 100644
--- a/drivers/net/ieee802154/atusb.c
+++ b/drivers/net/ieee802154/atusb.c
@@ -366,11 +366,7 @@ static int atusb_channel(struct ieee802154_hw *hw, u8 page, u8 channel)
struct atusb *atusb = hw->priv;
int ret;
- /* This implicitly sets the CCA (Clear Channel Assessment) mode to 0,
- * "Mode 3a, Carrier sense OR energy above threshold".
- * We should probably make this configurable. @@@
- */
- ret = atusb_write_reg(atusb, RG_PHY_CC_CCA, channel);
+ ret = atusb_write_subreg(atusb, SR_CHANNEL, channel);
if (ret < 0)
return ret;
msleep(1); /* @@@ ugly synchronization */