diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-07-22 19:50:23 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-07-22 19:50:23 +0200 |
| commit | bd6fb31fd3072c63256212222dc328b16e378994 (patch) | |
| tree | a56615d90af385983765530f231cca978c1d01d3 /include/net/bluetooth/l2cap.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next (diff) | |
| parent | Bluetooth: Add support for Broadcom device of Asus Z97-DELUXE motherboard (diff) | |
| download | linux-bd6fb31fd3072c63256212222dc328b16e378994.tar.xz linux-bd6fb31fd3072c63256212222dc328b16e378994.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'include/net/bluetooth/l2cap.h')
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 1fffd92808b0..8df15ad0d43f 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -905,7 +905,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, bdaddr_t *dst, u8 dst_type); int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len); void l2cap_chan_busy(struct l2cap_chan *chan, int busy); -int l2cap_chan_check_security(struct l2cap_chan *chan); +int l2cap_chan_check_security(struct l2cap_chan *chan, bool initiator); void l2cap_chan_set_defaults(struct l2cap_chan *chan); int l2cap_ertm_init(struct l2cap_chan *chan); void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan); |