diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-08-25 15:35:20 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-08-25 15:35:20 -0400 |
| commit | 0fdcaa5948f385bfaa5c22f90d3ace2f28e05447 (patch) | |
| tree | 6f9e2f82d6530a408e2c51cbbb02ac54199faea8 /include/net | |
| parent | 47e4df94d129cbca84de252ff63c4ded08a513e7 (diff) | |
| parent | f161dd4122ffa73e4e12000309dca65bec80d416 (diff) | |
| download | op-kernel-dev-0fdcaa5948f385bfaa5c22f90d3ace2f28e05447.zip op-kernel-dev-0fdcaa5948f385bfaa5c22f90d3ace2f28e05447.tar.gz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 2 | ||||
| -rw-r--r-- | include/net/netns/ieee802154_6lowpan.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index b5d5af3..6f884e6 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -464,6 +464,8 @@ struct hci_conn_params { HCI_AUTO_CONN_ALWAYS, HCI_AUTO_CONN_LINK_LOSS, } auto_connect; + + struct hci_conn *conn; }; extern struct list_head hci_dev_list; diff --git a/include/net/netns/ieee802154_6lowpan.h b/include/net/netns/ieee802154_6lowpan.h index e207096..8170f8d 100644 --- a/include/net/netns/ieee802154_6lowpan.h +++ b/include/net/netns/ieee802154_6lowpan.h @@ -16,7 +16,6 @@ struct netns_sysctl_lowpan { struct netns_ieee802154_lowpan { struct netns_sysctl_lowpan sysctl; struct netns_frags frags; - int max_dsize; }; #endif |
