Skip to content

Commit

Permalink
Bluetooth: Make l2cap_data_channel return void
Browse files Browse the repository at this point in the history
l2cap_data_channel always return 0 which is not used anywhere,
make it void function.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
  • Loading branch information
Andrei Emeltchenko authored and Johan Hedberg committed Jun 5, 2012
1 parent 3cabbfd commit 13ca56e
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions net/bluetooth/l2cap_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -5128,7 +5128,8 @@ static int l2cap_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb)
return 0;
}

static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk_buff *skb)
static void l2cap_data_channel(struct l2cap_conn *conn, u16 cid,
struct sk_buff *skb)
{
struct l2cap_chan *chan;

Expand All @@ -5138,15 +5139,15 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk
chan = a2mp_channel_create(conn, skb);
if (!chan) {
kfree_skb(skb);
return 0;
return;
}

l2cap_chan_lock(chan);
} else {
BT_DBG("unknown cid 0x%4.4x", cid);
/* Drop packet and return */
kfree_skb(skb);
return 0;
return;
}
}

Expand Down Expand Up @@ -5184,8 +5185,6 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk

done:
l2cap_chan_unlock(chan);

return 0;
}

static inline int l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, struct sk_buff *skb)
Expand Down

0 comments on commit 13ca56e

Please sign in to comment.