X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=net%2Fcore%2Fdev.c;h=28b0b9e992a0408d0f4bd8bbf504ea0253d6a6d0;hb=89d71a66c40d629e3b1285def543ab1425558cd5;hp=510ff205d5dbd8e318749f21bd8a31c671f59fcf;hpb=bff1c09640b3006bca711e18ef08a5fb955ad9b5;p=safe%2Fjmp%2Flinux-2.6

diff --git a/net/core/dev.c b/net/core/dev.c
index 510ff20..28b0b9e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2604,20 +2604,13 @@ EXPORT_SYMBOL(napi_reuse_skb);
 
 struct sk_buff *napi_get_frags(struct napi_struct *napi)
 {
-	struct net_device *dev = napi->dev;
 	struct sk_buff *skb = napi->skb;
 
 	if (!skb) {
-		skb = netdev_alloc_skb(dev, GRO_MAX_HEAD + NET_IP_ALIGN);
-		if (!skb)
-			goto out;
-
-		skb_reserve(skb, NET_IP_ALIGN);
-
-		napi->skb = skb;
+		skb = netdev_alloc_skb_ip_align(napi->dev, GRO_MAX_HEAD);
+		if (skb)
+			napi->skb = skb;
 	}
-
-out:
 	return skb;
 }
 EXPORT_SYMBOL(napi_get_frags);