aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-10-27 12:13:29 -0400
committerMarcel Holtmann <marcel@holtmann.org>2014-10-27 13:07:37 -0400
commit61a2281458956db519f2c24fa40bf277adea2a67 (patch)
tree7a4074ecccf64bf350c7f3f7b95a8c00a45fa8bf
parent061ef8f915988839b12460c47ebfcf3700e124f0 (diff)
ieee802154: drivers: use dev_alloc_skb
This patch change the allocation of skb inside the ieee802154 driver layer to dev_alloc_skb. This changes also the gfp mask to GFP_ATOMIC which is needed for upcomming change that the receiving is done by a tasklet and not a workqueue anymore. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Cc: Alan Ott <alan@signal11.us> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--drivers/net/ieee802154/at86rf230.c2
-rw-r--r--drivers/net/ieee802154/cc2520.c2
-rw-r--r--drivers/net/ieee802154/mrf24j40.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 0669783aa3b9..e4fbcaa602b6 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -811,7 +811,7 @@ at86rf230_rx(struct at86rf230_local *lp,
811 memcpy(rx_local_buf, data, len); 811 memcpy(rx_local_buf, data, len);
812 enable_irq(lp->spi->irq); 812 enable_irq(lp->spi->irq);
813 813
814 skb = alloc_skb(IEEE802154_MTU, GFP_ATOMIC); 814 skb = dev_alloc_skb(IEEE802154_MTU);
815 if (!skb) { 815 if (!skb) {
816 dev_vdbg(&lp->spi->dev, "failed to allocate sk_buff\n"); 816 dev_vdbg(&lp->spi->dev, "failed to allocate sk_buff\n");
817 return; 817 return;
diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c
index f6f07f4eb0ec..a31b5b62a353 100644
--- a/drivers/net/ieee802154/cc2520.c
+++ b/drivers/net/ieee802154/cc2520.c
@@ -524,7 +524,7 @@ static int cc2520_rx(struct cc2520_private *priv)
524 if (len < 2 || len > IEEE802154_MTU) 524 if (len < 2 || len > IEEE802154_MTU)
525 return -EINVAL; 525 return -EINVAL;
526 526
527 skb = alloc_skb(len, GFP_KERNEL); 527 skb = dev_alloc_skb(len);
528 if (!skb) 528 if (!skb)
529 return -ENOMEM; 529 return -ENOMEM;
530 530
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index 3d775afa217f..7abb237cb989 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -544,7 +544,7 @@ static int mrf24j40_handle_rx(struct mrf24j40 *devrec)
544 val |= 4; /* SET RXDECINV */ 544 val |= 4; /* SET RXDECINV */
545 write_short_reg(devrec, REG_BBREG1, val); 545 write_short_reg(devrec, REG_BBREG1, val);
546 546
547 skb = alloc_skb(len, GFP_KERNEL); 547 skb = dev_alloc_skb(len);
548 if (!skb) { 548 if (!skb) {
549 ret = -ENOMEM; 549 ret = -ENOMEM;
550 goto out; 550 goto out;