diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-06-20 00:56:23 -0400 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-06-20 00:56:23 -0400 |
| commit | 98174e46974323e4941c72e46345f7277755e146 (patch) | |
| tree | c4644c8f38a519cfb3929d1175fc7107eefe48b9 /drivers/net/ppp_generic.c | |
| parent | d8ce75324135ea7100124c1fff4ec5090a350607 (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge HEAD from ../linux-2.6
Diffstat (limited to 'drivers/net/ppp_generic.c')
| -rw-r--r-- | drivers/net/ppp_generic.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index b2073fce8216..01cd8ec751ea 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c | |||
| @@ -1609,8 +1609,6 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb) | |||
| 1609 | kfree_skb(skb); | 1609 | kfree_skb(skb); |
| 1610 | skb = ns; | 1610 | skb = ns; |
| 1611 | } | 1611 | } |
| 1612 | else if (!pskb_may_pull(skb, skb->len)) | ||
| 1613 | goto err; | ||
| 1614 | else | 1612 | else |
| 1615 | skb->ip_summed = CHECKSUM_NONE; | 1613 | skb->ip_summed = CHECKSUM_NONE; |
| 1616 | 1614 | ||