diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-17 00:05:02 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-17 00:05:02 -0800 |
| commit | a2bfbc072e279ff81e6b336acff612b9bc2e5281 (patch) | |
| tree | 89cfe21911e1539e1b7f89d8a10d42abecba2a18 /drivers/net/ppp_generic.c | |
| parent | 5c427ff9e4cc61625d48172ea082ae99e21eea6a (diff) | |
| parent | 82b3cc1a2f5e46300a9dec4a8cc8106dc20a4c23 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/can/Kconfig
Diffstat (limited to 'drivers/net/ppp_generic.c')
| -rw-r--r-- | drivers/net/ppp_generic.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 9bf2a6be9031..965adb6174c3 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c @@ -1944,8 +1944,15 @@ ppp_receive_mp_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch) } /* Pull completed packets off the queue and receive them. */ - while ((skb = ppp_mp_reconstruct(ppp))) - ppp_receive_nonmp_frame(ppp, skb); + while ((skb = ppp_mp_reconstruct(ppp))) { + if (pskb_may_pull(skb, 2)) + ppp_receive_nonmp_frame(ppp, skb); + else { + ++ppp->dev->stats.rx_length_errors; + kfree_skb(skb); + ppp_receive_error(ppp); + } + } return; |