Commit 85009203 authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann

at86rf230: change state change if from trx_off

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: default avatarAlexander Aring <alex.aring@gmail.com>
Reviewed-by: default avatarVarka Bhadram <varkabhadram@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 2f8cdd95
...@@ -95,6 +95,7 @@ struct at86rf230_local { ...@@ -95,6 +95,7 @@ struct at86rf230_local {
unsigned long cal_timeout; unsigned long cal_timeout;
s8 max_frame_retries; s8 max_frame_retries;
bool is_tx; bool is_tx;
bool is_tx_from_off;
u8 tx_retry; u8 tx_retry;
struct sk_buff *tx_skb; struct sk_buff *tx_skb;
struct at86rf230_state_change tx; struct at86rf230_state_change tx;
...@@ -991,12 +992,21 @@ at86rf230_xmit_start(void *context) ...@@ -991,12 +992,21 @@ at86rf230_xmit_start(void *context)
* are in STATE_TX_ON. The pfad differs here, so we change * are in STATE_TX_ON. The pfad differs here, so we change
* the complete handler. * the complete handler.
*/ */
if (lp->tx_aret) if (lp->tx_aret) {
at86rf230_async_state_change(lp, ctx, STATE_TX_ON, if (lp->is_tx_from_off) {
at86rf230_xmit_tx_on, false); lp->is_tx_from_off = false;
else 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_async_state_change(lp, ctx, STATE_TX_ON,
at86rf230_write_frame, false); at86rf230_write_frame, false);
}
} }
static int static int
...@@ -1015,11 +1025,13 @@ at86rf230_xmit(struct ieee802154_hw *hw, struct sk_buff *skb) ...@@ -1015,11 +1025,13 @@ at86rf230_xmit(struct ieee802154_hw *hw, struct sk_buff *skb)
* to TX_ON, the lp->cal_timeout should be reinit by state_delay * to TX_ON, the lp->cal_timeout should be reinit by state_delay
* function then to start in the next 5 minutes. * 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_async_state_change(lp, ctx, STATE_TRX_OFF,
at86rf230_xmit_start, false); at86rf230_xmit_start, false);
else } else {
at86rf230_xmit_start(ctx); at86rf230_xmit_start(ctx);
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment