at86rf230: refactor receive handling

This patch refactor the receive handling into one function.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 85012201eaf5750e961f838914a460d34ab004ba..8e93ea415149158cfa583c3e28791b88474287ed 100644 (file)
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -781,13 +781,23 @@ at86rf230_tx_trac_status(void *context)
 }
 
 static void
-at86rf230_rx(struct at86rf230_local *lp,
-            const u8 *data, const u8 len, const u8 lqi)
+at86rf230_rx_read_frame_complete(void *context)
 {
-       struct sk_buff *skb;
+       struct at86rf230_state_change *ctx = context;
+       struct at86rf230_local *lp = ctx->lp;
        u8 rx_local_buf[AT86RF2XX_MAX_BUF];
+       const u8 *buf = lp->irq.buf;
+       struct sk_buff *skb;
+       u8 len, lqi;
 
-       memcpy(rx_local_buf, data, len);
+       len = buf[1];
+       if (!ieee802154_is_valid_psdu_len(len)) {
+               dev_vdbg(&lp->spi->dev, "corrupted frame received\n");
+               len = IEEE802154_MTU;
+       }
+       lqi = buf[2 + len];
+
+       memcpy(rx_local_buf, buf + 2, len);
        enable_irq(lp->spi->irq);
 
        skb = dev_alloc_skb(IEEE802154_MTU);
@@ -800,22 +810,6 @@ at86rf230_rx(struct at86rf230_local *lp,
        ieee802154_rx_irqsafe(lp->hw, skb, lqi);
 }
 
-static void
-at86rf230_rx_read_frame_complete(void *context)
-{
-       struct at86rf230_state_change *ctx = context;
-       struct at86rf230_local *lp = ctx->lp;
-       const u8 *buf = lp->irq.buf;
-       u8 len = buf[1];
-
-       if (!ieee802154_is_valid_psdu_len(len)) {
-               dev_vdbg(&lp->spi->dev, "corrupted frame received\n");
-               len = IEEE802154_MTU;
-       }
-
-       at86rf230_rx(lp, buf + 2, len, buf[2 + len]);
-}
-
 static void
 at86rf230_rx_read_frame(struct at86rf230_local *lp)
 {