diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-31 09:26:45 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-31 09:26:45 +0300 |
| commit | 9d52bf0a238657ebfddaf5976409ac33174b9f78 (patch) | |
| tree | 4bab8453a145bdb38eaea6d83c2368d6a7f7ce2c /net/mac802154/util.c | |
| parent | 1dcf3ac49fb0079ed7d3d3f4a4cf25e9fb9fffc6 (diff) | |
| parent | b5a61c306b0dddb28e3a3ab5d782c73e5f665497 (diff) | |
| download | linux-9d52bf0a238657ebfddaf5976409ac33174b9f78.tar.xz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2015-05-28
Here's a set of patches intended for 4.2. The majority of the changes
are on the 802.15.4 side of things rather than Bluetooth related:
- All sorts of cleanups & fixes to ieee802154 and related drivers
- Rework of tx power support in ieee802154 and its drivers
- Support for setting ieee802154 tx power through nl802154
- New IDs for the btusb driver
- Various cleanups & smaller fixes to btusb
- New btrtl driver for Realtec devices
- Fix suspend/resume for Realtek devices
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac802154/util.c')
| -rw-r--r-- | net/mac802154/util.c | 5 |
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); |