git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
net
/
bluetooth
/
cmtp
/
core.c
diff --git
a/net/bluetooth/cmtp/core.c
b/net/bluetooth/cmtp/core.c
index
2e341de
..
901eff7
100644
(file)
--- a/
net/bluetooth/cmtp/core.c
+++ b/
net/bluetooth/cmtp/core.c
@@
-213,7
+213,7
@@
static int cmtp_send_frame(struct cmtp_session *session, unsigned char *data, in
return kernel_sendmsg(sock, &msg, &iv, 1, len);
}
return kernel_sendmsg(sock, &msg, &iv, 1, len);
}
-static
int
cmtp_process_transmit(struct cmtp_session *session)
+static
void
cmtp_process_transmit(struct cmtp_session *session)
{
struct sk_buff *skb, *nskb;
unsigned char *hdr;
{
struct sk_buff *skb, *nskb;
unsigned char *hdr;
@@
-223,7
+223,7
@@
static int cmtp_process_transmit(struct cmtp_session *session)
if (!(nskb = alloc_skb(session->mtu, GFP_ATOMIC))) {
BT_ERR("Can't allocate memory for new frame");
if (!(nskb = alloc_skb(session->mtu, GFP_ATOMIC))) {
BT_ERR("Can't allocate memory for new frame");
- return
-ENOMEM
;
+ return;
}
while ((skb = skb_dequeue(&session->transmit))) {
}
while ((skb = skb_dequeue(&session->transmit))) {
@@
-275,8
+275,6
@@
static int cmtp_process_transmit(struct cmtp_session *session)
cmtp_send_frame(session, nskb->data, nskb->len);
kfree_skb(nskb);
cmtp_send_frame(session, nskb->data, nskb->len);
kfree_skb(nskb);
-
- return skb_queue_len(&session->transmit);
}
static int cmtp_session(void *arg)
}
static int cmtp_session(void *arg)