mac802154: tx: use queue helpers in xmit worker
authorAlexander Aring <alex.aring@gmail.com>
Sun, 26 Oct 2014 08:37:06 +0000 (09:37 +0100)
committerMarcel Holtmann <marcel@holtmann.org>
Sun, 26 Oct 2014 16:24:03 +0000 (17:24 +0100)
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

index be8deae193867d3996087b0c9c97e1d4765f98cc..8e2f429a4546d89569ec29014e8bc92bd618bf2b 100644 (file)
@@ -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;