git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.
[safe/jmp/linux-2.6]
/
net
/
rose
/
rose_in.c
diff --git
a/net/rose/rose_in.c
b/net/rose/rose_in.c
index
8348d33
..
7f7fcb4
100644
(file)
--- a/
net/rose/rose_in.c
+++ b/
net/rose/rose_in.c
@@
-16,7
+16,6
@@
#include <linux/socket.h>
#include <linux/in.h>
#include <linux/kernel.h>
#include <linux/socket.h>
#include <linux/in.h>
#include <linux/kernel.h>
-#include <linux/sched.h>
#include <linux/timer.h>
#include <linux/string.h>
#include <linux/sockios.h>
#include <linux/timer.h>
#include <linux/string.h>
#include <linux/sockios.h>
@@
-183,7
+182,7
@@
static int rose_state3_machine(struct sock *sk, struct sk_buff *skb, int framety
break;
}
if (atomic_read(&sk->sk_rmem_alloc) >
break;
}
if (atomic_read(&sk->sk_rmem_alloc) >
- (sk->sk_rcvbuf
/ 2
))
+ (sk->sk_rcvbuf
>> 1
))
rose->condition |= ROSE_COND_OWN_RX_BUSY;
}
/*
rose->condition |= ROSE_COND_OWN_RX_BUSY;
}
/*