diff options
| author | David S. Miller <davem@davemloft.net> | 2015-12-14 16:23:10 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-14 16:23:10 -0500 |
| commit | 5148371a752234181ac73ea388863faeaf4dd66c (patch) | |
| tree | 3cab25602dd57ce88c073a4321706717b3f0dd3d /net/mac802154/driver-ops.h | |
| parent | 7e074af2273a6e3115ff7c35529081ab52f8a9e9 (diff) | |
| parent | 7302b9d90117496049dd4bfa28755f7c2ed55b27 (diff) | |
| download | linux-5148371a752234181ac73ea388863faeaf4dd66c.tar.bz2 | |
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-12-11
Here's another set of Bluetooth & 802.15.4 patches for the 4.5 kernel:
- 6LoWPAN debugfs support
- New 802.15.4 driver for ADF7242 MAC IEEE802154
- Initial code for 6LoWPAN Generic Header Compression (GHC) support
- Refactor Bluetooth LE scan & advertising behind dedicated workqueue
- Cleanups to Bluetooth H:5 HCI driver
- Support for Toshiba Broadcom based Bluetooth controllers
- Use continuous scanning when establishing Bluetooth LE connections
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/driver-ops.h')
| -rw-r--r-- | net/mac802154/driver-ops.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac802154/driver-ops.h b/net/mac802154/driver-ops.h index 0550f3365e33..fd9daf2ecec9 100644 --- a/net/mac802154/driver-ops.h +++ b/net/mac802154/driver-ops.h @@ -18,9 +18,6 @@ drv_xmit_async(struct ieee802154_local *local, struct sk_buff *skb) static inline int drv_xmit_sync(struct ieee802154_local *local, struct sk_buff *skb) { - /* don't allow other operations while sync xmit */ - ASSERT_RTNL(); - might_sleep(); return local->ops->xmit_sync(&local->hw, skb); |