From 5953034307c10a7941bd1ae202f6ef1bfcb5a35d Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Thu, 31 May 2012 11:18:57 +0300 Subject: [PATCH] --- yaml --- r: 314467 b: refs/heads/master c: 6810fca724d2a3c08c0d2eb8510648e7a36ab592 h: refs/heads/master i: 314465: d380c6f2e1bc7b018a31007e37196cd6aef3ac9f 314463: ab8be9e8c5478f5c9dc7da1bda0437f68deff245 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/l2cap_core.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 4f529aa6c42c..9f1cc98b6966 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84104b241d26302cb9083779d06741002534a58e +refs/heads/master: 6810fca724d2a3c08c0d2eb8510648e7a36ab592 diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c index a8d69aba39fd..8229ae4fb4fd 100644 --- a/trunk/net/bluetooth/l2cap_core.c +++ b/trunk/net/bluetooth/l2cap_core.c @@ -5211,8 +5211,8 @@ static void l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, kfree_skb(skb); } -static inline int l2cap_att_channel(struct l2cap_conn *conn, u16 cid, - struct sk_buff *skb) +static void l2cap_att_channel(struct l2cap_conn *conn, u16 cid, + struct sk_buff *skb) { struct l2cap_chan *chan; @@ -5229,12 +5229,10 @@ static inline int l2cap_att_channel(struct l2cap_conn *conn, u16 cid, goto drop; if (!chan->ops->recv(chan, skb)) - return 0; + return; drop: kfree_skb(skb); - - return 0; } static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)