From 18d60a0d49ef3eb2d31f65cf5b652702d9c6e710 Mon Sep 17 00:00:00 2001
From: Alexander Aring <alex.aring@gmail.com>
Date: Sun, 26 Oct 2014 09:37:06 +0100
Subject: [PATCH] mac802154: tx: use queue helpers in xmit worker
This patch uses the queue utility helpers inside the xmit worker of
mac802154 subsystem.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---
net/mac802154/tx.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index be8deae193867..8e2f429a4546d 100644
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -47,7 +47,6 @@ static void mac802154_xmit_worker(struct work_struct *work)
{
struct wpan_xmit_cb *cb = container_of(work, struct wpan_xmit_cb, work);
struct ieee802154_local *local = cb->local;
- struct ieee802154_sub_if_data *sdata;
struct sk_buff *skb = cb->skb;
int res;
@@ -56,18 +55,12 @@ static void mac802154_xmit_worker(struct work_struct *work)
pr_debug("transmission failed\n");
/* Restart the netif queue on each sub_if_data object. */
- rcu_read_lock();
- list_for_each_entry_rcu(sdata, &local->interfaces, list)
- netif_wake_queue(sdata->dev);
- rcu_read_unlock();
-
- dev_kfree_skb(skb);
+ ieee802154_xmit_complete(&local->hw, skb);
}
static netdev_tx_t
mac802154_tx(struct ieee802154_local *local, struct sk_buff *skb)
{
- struct ieee802154_sub_if_data *sdata;
struct wpan_xmit_cb *cb = wpan_xmit_cb(skb);
mac802154_monitors_rx(local, skb);
@@ -84,10 +77,7 @@ mac802154_tx(struct ieee802154_local *local, struct sk_buff *skb)
goto err_tx;
/* Stop the netif queue on each sub_if_data object. */
- rcu_read_lock();
- list_for_each_entry_rcu(sdata, &local->interfaces, list)
- netif_stop_queue(sdata->dev);
- rcu_read_unlock();
+ ieee802154_stop_queue(&local->hw);
INIT_WORK(&cb->work, mac802154_xmit_worker);
cb->skb = skb;
--
2.30.2