Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...

[~andy/linux] / net / bluetooth / a2mp.c

diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index e08ca2ac31aa4bf10173671d8c41235d2596e920..fb93250b3938600e820eb8927049707532fc3871 100644 (file)
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -440,23 +440,6 @@ static struct sk_buff *a2mp_chan_alloc_skb_cb(struct l2cap_chan *chan,
        return bt_skb_alloc(len, GFP_KERNEL);
 }
 
-static struct l2cap_chan *a2mp_chan_no_new_conn_cb(struct l2cap_chan *chan)
-{
-       BT_ERR("new_connection for chan %p not implemented", chan);
-
-       return NULL;
-}
-
-static void a2mp_chan_no_teardown_cb(struct l2cap_chan *chan, int err)
-{
-       BT_ERR("teardown for chan %p not implemented", chan);
-}
-
-static void a2mp_chan_no_ready(struct l2cap_chan *chan)
-{
-       BT_ERR("ready for chan %p not implemented", chan);
-}
-
 static struct l2cap_ops a2mp_chan_ops = {
        .name = "L2CAP A2MP channel",
        .recv = a2mp_chan_recv_cb,
@@ -465,9 +448,9 @@ static struct l2cap_ops a2mp_chan_ops = {
        .alloc_skb = a2mp_chan_alloc_skb_cb,
 
        /* Not implemented for A2MP */
-       .new_connection = a2mp_chan_no_new_conn_cb,
-       .teardown = a2mp_chan_no_teardown_cb,
-       .ready = a2mp_chan_no_ready,
+       .new_connection = l2cap_chan_no_new_connection,
+       .teardown = l2cap_chan_no_teardown,
+       .ready = l2cap_chan_no_ready,
 };
 
 static struct l2cap_chan *a2mp_chan_open(struct l2cap_conn *conn)
@@ -481,8 +464,6 @@ static struct l2cap_chan *a2mp_chan_open(struct l2cap_conn *conn)
 
        BT_DBG("chan %p", chan);
 
-       hci_conn_hold(conn->hcon);
-
        chan->chan_type = L2CAP_CHAN_CONN_FIX_A2MP;
        chan->flush_to = L2CAP_DEFAULT_FLUSH_TO;