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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[safe/jmp/linux-2.6]
/
net
/
x25
/
x25_in.c
diff --git
a/net/x25/x25_in.c
b/net/x25/x25_in.c
index
7d7c3ab
..
96d9227
100644
(file)
--- a/
net/x25/x25_in.c
+++ b/
net/x25/x25_in.c
@@
-114,7
+114,7
@@
static int x25_state1_machine(struct sock *sk, struct sk_buff *skb, int frametyp
/*
* Copy any Call User Data.
*/
- if (skb->len >
=
0) {
+ if (skb->len > 0) {
skb_copy_from_linear_data(skb,
x25->calluserdata.cuddata,
skb->len);