git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.alsa-project.org/alsa-kernel
[pandora-kernel.git]
/
net
/
x25
/
x25_in.c
diff --git
a/net/x25/x25_in.c
b/net/x25/x25_in.c
index
1c88762
..
7d7c3ab
100644
(file)
--- a/
net/x25/x25_in.c
+++ b/
net/x25/x25_in.c
@@
-247,7
+247,7
@@
static int x25_state3_machine(struct sock *sk, struct sk_buff *skb, int frametyp
break;
}
if (atomic_read(&sk->sk_rmem_alloc) >
- (sk->sk_rcvbuf
/ 2
))
+ (sk->sk_rcvbuf
>> 1
))
x25->condition |= X25_COND_OWN_RX_BUSY;
}
/*