Skip to content

Commit

Permalink
Bluetooth: Remove sk_backlog usage from L2CAP
Browse files Browse the repository at this point in the history
We run everything in the same lock now. The backlog queue is useless now

Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
  • Loading branch information
Gustavo F. Padovan committed Dec 18, 2011
1 parent aa2ac88 commit eb403a1
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions net/bluetooth/l2cap_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1960,8 +1960,6 @@ static void l2cap_ack_timeout(struct work_struct *work)

static inline void l2cap_ertm_init(struct l2cap_chan *chan)
{
struct sock *sk = chan->sk;

chan->expected_ack_seq = 0;
chan->unacked_frames = 0;
chan->buffer_seq = 0;
Expand All @@ -1975,9 +1973,6 @@ static inline void l2cap_ertm_init(struct l2cap_chan *chan)
skb_queue_head_init(&chan->srej_q);

INIT_LIST_HEAD(&chan->srej_l);


sk->sk_backlog_rcv = l2cap_ertm_data_rcv;
}

static inline __u8 l2cap_select_mode(__u8 mode, __u16 remote_feat_mask)
Expand Down Expand Up @@ -4203,12 +4198,7 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk
break;

case L2CAP_MODE_ERTM:
if (!sock_owned_by_user(sk)) {
l2cap_ertm_data_rcv(sk, skb);
} else {
if (sk_add_backlog(sk, skb))
goto drop;
}
l2cap_ertm_data_rcv(sk, skb);

goto done;

Expand Down

0 comments on commit eb403a1

Please sign in to comment.