diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-26 23:42:21 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-26 23:42:21 -0500 |
| commit | 0b42f25d2f123bb7fbd3565d003a8ea9e1e810fe (patch) | |
| tree | 77856ad061e97e86027df1fa6efdf20a9fe309b5 /include/net/bluetooth | |
| parent | e5f12b3f5ebb8a6ffd3864a04f687ea0ef78a48a (diff) | |
| parent | d8e435f3ab6fea2ea324dce72b51dd7761747523 (diff) | |
| download | op-kernel-dev-0b42f25d2f123bb7fbd3565d003a8ea9e1e810fe.zip op-kernel-dev-0b42f25d2f123bb7fbd3565d003a8ea9e1e810fe.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
udplite conflict is resolved by taking what 'net-next' did
which removed the backlog receive method assignment, since
it is no longer necessary.
Two entries were added to the non-priv ethtool operations
switch statement, one in 'net' and one in 'net-next, so
simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/bluetooth')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index f00bf66..554671c 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -1018,7 +1018,7 @@ static inline void hci_set_drvdata(struct hci_dev *hdev, void *data) } struct hci_dev *hci_dev_get(int index); -struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src); +struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src, u8 src_type); struct hci_dev *hci_alloc_dev(void); void hci_free_dev(struct hci_dev *hdev); |
