aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2013-10-15 19:47:11 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-10-15 19:50:41 -0400
commit2ce5fb510fc0ba50c8e1b6bcb991848084ea67ec (patch)
tree114031c06cb6833f034bd44ede5ba1b8e99ca113
parent74e7574066e020dca8ad8a57927470e67ea91394 (diff)
Bluetooth: Add l2cap_chan_no_resume stub for A2MP
The A2MP client for L2CAP channels needs to use l2cap_chan_no_resume empty stub function. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-rw-r--r--include/net/bluetooth/l2cap.h4
-rw-r--r--net/bluetooth/a2mp.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 377db2aa89f9..3d922b938141 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -797,6 +797,10 @@ static inline void l2cap_chan_no_defer(struct l2cap_chan *chan)
797{ 797{
798} 798}
799 799
800static inline void l2cap_chan_no_resume(struct l2cap_chan *chan)
801{
802}
803
800static inline void l2cap_chan_no_set_shutdown(struct l2cap_chan *chan) 804static inline void l2cap_chan_no_set_shutdown(struct l2cap_chan *chan)
801{ 805{
802} 806}
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index 74c14779bed6..fe32a334a52d 100644
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -710,6 +710,7 @@ static struct l2cap_ops a2mp_chan_ops = {
710 .teardown = l2cap_chan_no_teardown, 710 .teardown = l2cap_chan_no_teardown,
711 .ready = l2cap_chan_no_ready, 711 .ready = l2cap_chan_no_ready,
712 .defer = l2cap_chan_no_defer, 712 .defer = l2cap_chan_no_defer,
713 .resume = l2cap_chan_no_resume,
713 .set_shutdown = l2cap_chan_no_set_shutdown, 714 .set_shutdown = l2cap_chan_no_set_shutdown,
714 .get_sndtimeo = l2cap_chan_no_get_sndtimeo, 715 .get_sndtimeo = l2cap_chan_no_get_sndtimeo,
715}; 716};