aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>2012-05-31 04:18:55 -0400
committerJohan Hedberg <johan.hedberg@intel.com>2012-06-04 23:34:14 -0400
commit13ca56e0537aa148b7e7a6ea38ca6a6a1dc3e197 (patch)
treea333d657b3f90164c452c00d0d5615589569112a /net/bluetooth
parent3cabbfdad3150e0083a64c951701c970ef970c77 (diff)
Bluetooth: Make l2cap_data_channel return void
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>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/l2cap_core.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index bef5266563a6..56f5c0e31649 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -5128,7 +5128,8 @@ drop:
5128 return 0; 5128 return 0;
5129} 5129}
5130 5130
5131static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk_buff *skb) 5131static void l2cap_data_channel(struct l2cap_conn *conn, u16 cid,
5132 struct sk_buff *skb)
5132{ 5133{
5133 struct l2cap_chan *chan; 5134 struct l2cap_chan *chan;
5134 5135
@@ -5138,7 +5139,7 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk
5138 chan = a2mp_channel_create(conn, skb); 5139 chan = a2mp_channel_create(conn, skb);
5139 if (!chan) { 5140 if (!chan) {
5140 kfree_skb(skb); 5141 kfree_skb(skb);
5141 return 0; 5142 return;
5142 } 5143 }
5143 5144
5144 l2cap_chan_lock(chan); 5145 l2cap_chan_lock(chan);
@@ -5146,7 +5147,7 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk
5146 BT_DBG("unknown cid 0x%4.4x", cid); 5147 BT_DBG("unknown cid 0x%4.4x", cid);
5147 /* Drop packet and return */ 5148 /* Drop packet and return */
5148 kfree_skb(skb); 5149 kfree_skb(skb);
5149 return 0; 5150 return;
5150 } 5151 }
5151 } 5152 }
5152 5153
@@ -5184,8 +5185,6 @@ drop:
5184 5185
5185done: 5186done:
5186 l2cap_chan_unlock(chan); 5187 l2cap_chan_unlock(chan);
5187
5188 return 0;
5189} 5188}
5190 5189
5191static inline int l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, struct sk_buff *skb) 5190static inline int l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, struct sk_buff *skb)