diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-12-01 20:49:58 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-12-01 20:49:58 (GMT) |
| commit | 992066c8d3f24d3b5779b1309f8a67634fac1c24 (patch) | |
| tree | bb3e19cf9cc65ebdc3c077a2a1963e1369d465b4 /include/net | |
| parent | 18ca43823f3ce111c6efb8cc90d9f35246527727 (diff) | |
| parent | f6af675ef5489c69fc3d4faf8c6f477df3cbf8b9 (diff) | |
| download | linux-992066c8d3f24d3b5779b1309f8a67634fac1c24.tar.xz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index a805b3d..396c098 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -130,6 +130,7 @@ struct smp_irk { struct link_key { struct list_head list; + struct rcu_head rcu; bdaddr_t bdaddr; u8 type; u8 val[HCI_LINK_KEY_SIZE]; |