summaryrefslogtreecommitdiffstats
path: root/net/mac802154
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2015-05-17 21:44:56 +0200
committerMarcel Holtmann <marcel@holtmann.org>2015-05-19 11:44:45 +0200
commit3862eba691e3928338e188915676dd4fa7cefcaa (patch)
tree2e7e057918d115168ba21f39fce3f8725e5edb94 /net/mac802154
parenta2c390aa3d67f0c3a1465e246d1b7468c37abae4 (diff)
downloadlinux-3862eba691e3928338e188915676dd4fa7cefcaa.tar.gz
linux-3862eba691e3928338e188915676dd4fa7cefcaa.tar.bz2
linux-3862eba691e3928338e188915676dd4fa7cefcaa.zip
mac802154: tx: allow xmit complete from hard irq
Replace consume_skb with dev_consume_skb_any in ieee802154_xmit_complete which can be called in hard irq and other contexts. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/mac802154')
-rw-r--r--net/mac802154/util.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac802154/util.c b/net/mac802154/util.c
index 150bf807e572..583435f38930 100644
--- a/net/mac802154/util.c
+++ b/net/mac802154/util.c
@@ -85,11 +85,10 @@ void ieee802154_xmit_complete(struct ieee802154_hw *hw, struct sk_buff *skb,
hrtimer_start(&local->ifs_timer,
ktime_set(0, hw->phy->sifs_period * NSEC_PER_USEC),
HRTIMER_MODE_REL);
-
- consume_skb(skb);
} else {
ieee802154_wake_queue(hw);
- consume_skb(skb);
}
+
+ dev_consume_skb_any(skb);
}
EXPORT_SYMBOL(ieee802154_xmit_complete);