X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fppp_generic.c;h=d643a097faa5cd8de1a234179d17ab55aa336ed3;hb=d7fa2589bbe7ab53fd5eb20e8c7e388d5aff6f16;hp=b2073fce82169fa41f97a4e21bf2dde453f3ccd4;hpb=2e9abdd9bad485970b37cd53a82f92702054984c;p=powerpc.git

diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index b2073fce82..d643a097fa 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)
 			kfree_skb(skb);
 			skb = ns;
 		}
-		else if (!pskb_may_pull(skb, skb->len))
-			goto err;
 		else
 			skb->ip_summed = CHECKSUM_NONE;
 
@@ -2580,8 +2578,7 @@ ppp_find_channel(int unit)
 
 	list_for_each_entry(pch, &new_channels, list) {
 		if (pch->file.index == unit) {
-			list_del(&pch->list);
-			list_add(&pch->list, &all_channels);
+			list_move(&pch->list, &all_channels);
 			return pch;
 		}
 	}