Merge branch 'linux-2.6'

1 files changed, 22 insertions, 48 deletions

diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 68631a5721ac..0d7f570b9a54 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -385,12 +385,12 @@ static int pppoe_rcv(struct sk_buff *skb,
         struct pppoe_hdr *ph;
         struct pppox_sock *po;
 
-        if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
-                goto drop;
-
         if (!(skb = skb_share_check(skb, GFP_ATOMIC)))
                 goto out;
 
+        if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
+                goto drop;
+
         ph = pppoe_hdr(skb);
 
         po = get_item((unsigned long) ph->sid, eth_hdr(skb)->h_source, dev->ifindex);
@@ -848,71 +848,45 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)
 {
         struct pppox_sock *po = pppox_sk(sk);
         struct net_device *dev = po->pppoe_dev;
-        struct pppoe_hdr hdr;
         struct pppoe_hdr *ph;
-        int headroom = skb_headroom(skb);
         int data_len = skb->len;
-        struct sk_buff *skb2;
 
         if (sock_flag(sk, SOCK_DEAD) || !(sk->sk_state & PPPOX_CONNECTED))
                 goto abort;
 
-        hdr.ver = 1;
-        hdr.type = 1;
-        hdr.code = 0;
-        hdr.sid = po->num;
-        hdr.length = htons(skb->len);
-
         if (!dev)
                 goto abort;
 
-        /* Copy the skb if there is no space for the header. */
-        if (headroom < (sizeof(struct pppoe_hdr) + dev->hard_header_len)) {
-                skb2 = dev_alloc_skb(32+skb->len +
-                                     sizeof(struct pppoe_hdr) +
-                                     dev->hard_header_len);
-
-                if (skb2 == NULL)
-                        goto abort;
-
-                skb_reserve(skb2, dev->hard_header_len + sizeof(struct pppoe_hdr));
-                skb_copy_from_linear_data(skb, skb_put(skb2, skb->len),
-                                          skb->len);
-        } else {
-                /* Make a clone so as to not disturb the original skb,
-                 * give dev_queue_xmit something it can free.
-                 */
-                skb2 = skb_clone(skb, GFP_ATOMIC);
-
-                if (skb2 == NULL)
-                        goto abort;
-        }
+        /* Copy the data if there is no space for the header or if it's
+         * read-only.
+         */
+        if (skb_cow_head(skb, sizeof(*ph) + dev->hard_header_len))
+                goto abort;
 
-        ph = (struct pppoe_hdr *) skb_push(skb2, sizeof(struct pppoe_hdr));
-        memcpy(ph, &hdr, sizeof(struct pppoe_hdr));
-        skb2->protocol = __constant_htons(ETH_P_PPP_SES);
+        __skb_push(skb, sizeof(*ph));
+        skb_reset_network_header(skb);
 
-        skb_reset_network_header(skb2);
+        ph = pppoe_hdr(skb);
+        ph->ver = 1;
+        ph->type = 1;
+        ph->code = 0;
+        ph->sid = po->num;
+        ph->length = htons(data_len);
 
-        skb2->dev = dev;
+        skb->protocol = __constant_htons(ETH_P_PPP_SES);
+        skb->dev = dev;
 
-        dev->hard_header(skb2, dev, ETH_P_PPP_SES,
+        dev->hard_header(skb, dev, ETH_P_PPP_SES,
                          po->pppoe_pa.remote, NULL, data_len);
 
-        /* We're transmitting skb2, and assuming that dev_queue_xmit
-         * will free it.  The generic ppp layer however, is expecting
-         * that we give back 'skb' (not 'skb2') in case of failure,
-         * but free it in case of success.
-         */
-
-        if (dev_queue_xmit(skb2) < 0)
+        if (dev_queue_xmit(skb) < 0)
                 goto abort;
 
-        kfree_skb(skb);
         return 1;
 
 abort:
-        return 0;
+        kfree_skb(skb);
+        return 1;
 }