]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Bluetooth: Make l2cap_data_channel return void
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Thu, 31 May 2012 08:18:55 +0000 (11:18 +0300)
committerJohan Hedberg <johan.hedberg@intel.com>
Tue, 5 Jun 2012 03:34:14 +0000 (06:34 +0300)
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>
net/bluetooth/l2cap_core.c

index bef5266563a6add7f85081e2667c5cc236208731..56f5c0e31649ceb9811f6f226ad802da22f17b1b 100644 (file)
@@ -5128,7 +5128,8 @@ drop:
        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;
 
@@ -5138,7 +5139,7 @@ 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);
@@ -5146,7 +5147,7 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk
                        BT_DBG("unknown cid 0x%4.4x", cid);
                        /* Drop packet and return */
                        kfree_skb(skb);
-                       return 0;
+                       return;
                }
        }
 
@@ -5184,8 +5185,6 @@ drop:
 
 done:
        l2cap_chan_unlock(chan);
-
-       return 0;
 }
 
 static inline int l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, struct sk_buff *skb)