| Message ID | 20160620150135.13250-1-aar@pengutronix.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
Hello. On 20/06/16 17:01, Alexander Aring wrote: > This patch fixes the behaviour to not overwrite csma settings when > set channel afterwards. > > Cc: Stefan Schmidt <stefan@osg.samsung.com> > Signed-off-by: Alexander Aring <aar@pengutronix.de> > --- > drivers/net/ieee802154/atusb.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/net/ieee802154/atusb.c b/drivers/net/ieee802154/atusb.c > index 52c9051..1056ed1 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 */ Good point. We have csma ops and iwpan support for csma now this setting is no longer needed. Acked-by: Stefan Schmidt <stefan@osg.samsung.com> regards Stefan Schmidt -- To unsubscribe from this list: send the line "unsubscribe linux-wpan" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ieee802154/atusb.c b/drivers/net/ieee802154/atusb.c index 52c9051..1056ed1 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 */
This patch fixes the behaviour to not overwrite csma settings when set channel afterwards. Cc: Stefan Schmidt <stefan@osg.samsung.com> Signed-off-by: Alexander Aring <aar@pengutronix.de> --- drivers/net/ieee802154/atusb.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)