drivers/net/ppp_generic.c: Revert my idiotic unaligned SKB changes.

diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 6c598e0653042c8335b59d0f565ffdb957003a08..011e54d73a4c12ebb389b2875e0979e774198256 100644 (file)
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -1388,25 +1388,6 @@ static void
 ppp_receive_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)
 {
        if (skb->len >= 2) {
-               struct sk_buff *new_skb;
-
-               /* If this packet is byte aligned, fix that.  */
-               if ((unsigned long)skb->data & 0x1UL) {
-                       int len = skb->len;
-
-                       if (skb_tailroom(skb) < 124)
-                               len += 128;
-                       new_skb = dev_alloc_skb(len + 16);
-                       if (!new_skb) {
-                               printk(KERN_ERR"PPP: no memory (bad aligned SKB)\n");
-                               goto err;
-                       }
-                       skb_reserve(new_skb, 2);
-                       memcpy(skb_put(new_skb, skb->len), skb->data, skb->len);
-                       kfree_skb(skb);
-                       skb = new_skb;
-               }
-
 #ifdef CONFIG_PPP_MULTILINK
                /* XXX do channel-level decompression here */
                if (PPP_PROTO(skb) == PPP_MP)