Skip to content

Commit

Permalink
Bluetooth: Use chan instead of sk
Browse files Browse the repository at this point in the history
Remove unneeded conversion from sk to chan.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
  • Loading branch information
Andrei Emeltchenko authored and Johan Hedberg committed Feb 13, 2012
1 parent 09bfb2e commit 5ef8cb9
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions net/bluetooth/l2cap_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data);
static void l2cap_send_disconn_req(struct l2cap_conn *conn,
struct l2cap_chan *chan, int err);

static int l2cap_ertm_data_rcv(struct sock *sk, struct sk_buff *skb);
static int l2cap_ertm_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb);

/* ---- L2CAP channels ---- */

Expand Down Expand Up @@ -4138,9 +4138,8 @@ static inline int l2cap_data_channel_sframe(struct l2cap_chan *chan, u32 rx_cont
return 0;
}

static int l2cap_ertm_data_rcv(struct sock *sk, struct sk_buff *skb)
int l2cap_ertm_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb)
{
struct l2cap_chan *chan = l2cap_pi(sk)->chan;
u32 control;
u16 req_seq;
int len, next_tx_seq_offset, req_seq_offset;
Expand Down Expand Up @@ -4241,7 +4240,7 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk
break;

case L2CAP_MODE_ERTM:
l2cap_ertm_data_rcv(sk, skb);
l2cap_ertm_data_rcv(chan, skb);

goto done;

Expand Down

0 comments on commit 5ef8cb9

Please sign in to comment.