On 04/29/2015 02:52 AM, Alexander Aring wrote:
> If a transmit ends in a calibration which means the transceiver do a
> TRX_OFF state change, we can directly change into TX_ARET state instead
> doing a TX_ON to TX_ARET statechange.
>
> Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
> ---
> drivers/net/ieee802154/at86rf230.c | 25 ++++++++++++++++++-------
> 1 file changed, 18 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
> index 6285145..6c3cf79 100644
> --- a/drivers/net/ieee802154/at86rf230.c
> +++ b/drivers/net/ieee802154/at86rf230.c
> @@ -94,7 +94,7 @@ struct at86rf230_local {
> bool tx_aret;
> unsigned long cal_timeout;
> s8 max_frame_retries;
> - bool is_tx;
> + bool is_tx, is_tx_from_off;
Instead of declaring two variable in a single line, declare in two separate lines.
> u8 tx_retry;
> struct sk_buff *tx_skb;
> struct at86rf230_state_change tx;
> @@ -991,12 +991,21 @@ at86rf230_xmit_start(void *context)
> * are in STATE_TX_ON. The pfad differs here, so we change
> * the complete handler.
> */
> - if (lp->tx_aret)
> - at86rf230_async_state_change(lp, ctx, STATE_TX_ON,
> - at86rf230_xmit_tx_on, false);
> - else
> + if (lp->tx_aret) {
> + if (lp->is_tx_from_off) {
> + lp->is_tx_from_off = false;
> + at86rf230_async_state_change(lp, ctx, STATE_TX_ARET_ON,
> + at86rf230_xmit_tx_on,
> + false);
> + } else {
> + at86rf230_async_state_change(lp, ctx, STATE_TX_ON,
> + at86rf230_xmit_tx_on,
> + false);
> + }
> + } else {
> at86rf230_async_state_change(lp, ctx, STATE_TX_ON,
> at86rf230_write_frame, false);
> + }
> }
>
> static int
> @@ -1015,11 +1024,13 @@ at86rf230_xmit(struct ieee802154_hw *hw, struct sk_buff *skb)
> * to TX_ON, the lp->cal_timeout should be reinit by state_delay
> * function then to start in the next 5 minutes.
> */
> - if (time_is_before_jiffies(lp->cal_timeout))
> + if (time_is_before_jiffies(lp->cal_timeout)) {
> + lp->is_tx_from_off = true;
> at86rf230_async_state_change(lp, ctx, STATE_TRX_OFF,
> at86rf230_xmit_start, false);
> - else
> + } else {
> at86rf230_xmit_start(ctx);
> + }
>
> return 0;
> }
For all the patches in the series.
Reviewed-by: Varka Bhadram <varkabhadram@xxxxxxxxx>
--
Varka Bhadram
--
To unsubscribe from this list: send the line "unsubscribe linux-wpan" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
