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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
bluetooth
/
cmtp
/
core.c
diff --git
a/net/bluetooth/cmtp/core.c
b/net/bluetooth/cmtp/core.c
index
20ce04f
..
b81a01c
100644
(file)
--- a/
net/bluetooth/cmtp/core.c
+++ b/
net/bluetooth/cmtp/core.c
@@
-20,13
+20,11
@@
SOFTWARE IS DISCLAIMED.
*/
SOFTWARE IS DISCLAIMED.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/kernel.h>
-#include <linux/major.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/poll.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/poll.h>
@@
-214,7
+212,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;
@@
-224,7
+222,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))) {
@@
-276,8
+274,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)
@@
-339,10
+335,9
@@
int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)
baswap(&src, &bt_sk(sock->sk)->src);
baswap(&dst, &bt_sk(sock->sk)->dst);
baswap(&src, &bt_sk(sock->sk)->src);
baswap(&dst, &bt_sk(sock->sk)->dst);
- session = k
m
alloc(sizeof(struct cmtp_session), GFP_KERNEL);
+ session = k
z
alloc(sizeof(struct cmtp_session), GFP_KERNEL);
if (!session)
return -ENOMEM;
if (!session)
return -ENOMEM;
- memset(session, 0, sizeof(struct cmtp_session));
down_write(&cmtp_session_sem);
down_write(&cmtp_session_sem);