summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-22 11:13:00 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-22 11:13:00 -0700
commit13c926e04602db207366c7d213dd99d443ac4ad8 (patch)
treed5d1f5acf648c5c58644eb28b42cb462d5ef7da1 /drivers
parent53ce2dc2718c57346c543dab254fc900c6fe6c65 (diff)
parent22117ea4fef4ea1c7d97c4d68c02c96c268a511b (diff)
downloadlinux-stable-13c926e04602db207366c7d213dd99d443ac4ad8.tar.gz
linux-stable-13c926e04602db207366c7d213dd99d443ac4ad8.tar.bz2
linux-stable-13c926e04602db207366c7d213dd99d443ac4ad8.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IRDA] irda_nl_get_mode: always results in failure [PPP]: Fix output buffer size in ppp_decompress_frame(). [IRDA]: Avoid a label defined but not used warning in irda_init() [IPV6]: Fix kernel panic while send SCTP data with IP fragments [SNAP]: Check packet length before reading [DCCP]: Allocation in atomic context
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ppp_generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index ef3325b69233..9293c82ef2af 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -1726,7 +1726,7 @@ ppp_decompress_frame(struct ppp *ppp, struct sk_buff *skb)
}
/* the decompressor still expects the A/C bytes in the hdr */
len = ppp->rcomp->decompress(ppp->rc_state, skb->data - 2,
- skb->len + 2, ns->data, ppp->mru + PPP_HDRLEN);
+ skb->len + 2, ns->data, obuff_size);
if (len < 0) {
/* Pass the compressed frame to pppd as an
error indication. */