diff options
| author | Alexander Aring <alex.aring@gmail.com> | 2014-10-26 11:37:07 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-10-26 19:24:04 +0300 |
| commit | cdb66beaa0da7d326069b10bef090645d61d813f (patch) | |
| tree | f1bdaa5cffc17bb476b31d2d1de87147141829ab | |
| parent | 18d60a0d49ef3eb2d31f65cf5b652702d9c6e710 (diff) | |
| download | linux-cdb66beaa0da7d326069b10bef090645d61d813f.tar.xz | |
mac802154: tx: fix error handling while xmit
In case of an error we should call kfree_skb instead of consume_skb which
is called by ieee802154_xmit_complete function.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| -rw-r--r-- | net/mac802154/tx.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c index 8e2f429a4546..23139cae0764 100644 --- a/net/mac802154/tx.c +++ b/net/mac802154/tx.c @@ -51,11 +51,15 @@ static void mac802154_xmit_worker(struct work_struct *work) int res; res = local->ops->xmit(&local->hw, skb); - if (res) + if (res) { pr_debug("transmission failed\n"); - - /* Restart the netif queue on each sub_if_data object. */ - ieee802154_xmit_complete(&local->hw, skb); + /* Restart the netif queue on each sub_if_data object. */ + ieee802154_wake_queue(&local->hw); + kfree_skb(skb); + } else { + /* Restart the netif queue on each sub_if_data object. */ + ieee802154_xmit_complete(&local->hw, skb); + } } static netdev_tx_t |