Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

[deliverable/linux.git] / net / mac802154 / tx.c

diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index 3827f359b336de356695635401820fc094344faf..7e253455f9dd0ed995186ff3482b39e8679aa75a 100644 (file)
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -38,12 +38,6 @@ void ieee802154_xmit_worker(struct work_struct *work)
        struct net_device *dev = skb->dev;
        int res;
 
-       rtnl_lock();
-
-       /* check if ifdown occurred while schedule */
-       if (!netif_running(dev))
-               goto err_tx;
-
        res = drv_xmit_sync(local, skb);
        if (res)
                goto err_tx;
@@ -53,14 +47,11 @@ void ieee802154_xmit_worker(struct work_struct *work)
        dev->stats.tx_packets++;
        dev->stats.tx_bytes += skb->len;
 
-       rtnl_unlock();
-
        return;
 
 err_tx:
        /* Restart the netif queue on each sub_if_data object. */
        ieee802154_wake_queue(&local->hw);
-       rtnl_unlock();
        kfree_skb(skb);
        netdev_dbg(dev, "transmission failed\n");
 }