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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
ppp_generic.c
diff --git
a/drivers/net/ppp_generic.c
b/drivers/net/ppp_generic.c
index
e38f603
..
e7b4187
100644
(file)
--- a/
drivers/net/ppp_generic.c
+++ b/
drivers/net/ppp_generic.c
@@
-1416,7
+1416,7
@@
static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)
flen = len;
if (nfree > 0) {
if (pch->speed == 0) {
- flen =
tot
len/nfree;
+ flen = len/nfree;
if (nbigger > 0) {
flen++;
nbigger--;