From 5c9e52e3a802d6725e2b7747aee0498569de72b8 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Sun, 16 Sep 2007 16:21:42 -0700 Subject: [PATCH] --- yaml --- r: 65001 b: refs/heads/master c: 7b797d5b150775d717cb03b5ada28b8bad99afab h: refs/heads/master i: 64999: b61d4bf66fa8a9697f3b51339af6d1702236c029 v: v3 --- [refs] | 2 +- trunk/drivers/net/ppp_generic.c | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index e2853b4f474a..2a7b09a10baa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9cc20484e5e48c6a5deb4387c20fd45bfbdde8c +refs/heads/master: 7b797d5b150775d717cb03b5ada28b8bad99afab diff --git a/trunk/drivers/net/ppp_generic.c b/trunk/drivers/net/ppp_generic.c index 9293c82ef2af..7e21342becb2 100644 --- a/trunk/drivers/net/ppp_generic.c +++ b/trunk/drivers/net/ppp_generic.c @@ -899,17 +899,9 @@ ppp_start_xmit(struct sk_buff *skb, struct net_device *dev) /* Put the 2-byte PPP protocol number on the front, making sure there is room for the address and control fields. */ - if (skb_headroom(skb) < PPP_HDRLEN) { - struct sk_buff *ns; - - ns = alloc_skb(skb->len + dev->hard_header_len, GFP_ATOMIC); - if (ns == 0) - goto outf; - skb_reserve(ns, dev->hard_header_len); - skb_copy_bits(skb, 0, skb_put(ns, skb->len), skb->len); - kfree_skb(skb); - skb = ns; - } + if (skb_cow_head(skb, PPP_HDRLEN)) + goto outf; + pp = skb_push(skb, 2); proto = npindex_to_proto[npi]; pp[0] = proto >> 8;