commit 24559b5892690655f1223ca8600eeaad02c5327d
Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Mon May 10 10:31:00 2010 +0200
use alloc_page instead of alloc_pages (0)
@@ -2712,7 +2712,7 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev,
i = 0;
while (datalen > 0) {
- struct page *page = alloc_pages(GFP_KERNEL | __GFP_ZERO, 0);
+ struct page *page = alloc_page(GFP_KERNEL | __GFP_ZERO);
skb_shinfo(skb)->frags[i].page = page;
skb_shinfo(skb)->frags[i].page_offset = 0;
skb_shinfo(skb)->frags[i].size =
@@ -3062,7 +3062,7 @@ static struct sk_buff *fill_packet_ipv6(struct net_device *odev,
i = 0;
while (datalen > 0) {
- struct page *page = alloc_pages(GFP_KERNEL, 0);
+ struct page *page = alloc_page(GFP_KERNEL);
skb_shinfo(skb)->frags[i].page = page;
skb_shinfo(skb)->frags[i].page_offset = 0;
skb_shinfo(skb)->frags[i].size =
@@ -1387,7 +1387,7 @@ static inline struct page *linear_to_page(struct page *page, unsigned int *len,
if (!p) {
new_page:
- p = sk->sk_sndmsg_page = alloc_pages(sk->sk_allocation, 0);
+ p = sk->sk_sndmsg_page = alloc_page(sk->sk_allocation);
if (!p)
return NULL;
@@ -2428,7 +2428,7 @@ int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb,
return -EFAULT;
/* allocate a new page for next frag */
- page = alloc_pages(sk->sk_allocation, 0);
+ page = alloc_page(sk->sk_allocation);
/* If alloc_page fails just return failure and caller will
* free previous allocated pages by doing kfree_skb()
@@ -1457,7 +1457,7 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,
struct page *page;
skb_frag_t *frag;
- page = alloc_pages(sk->sk_allocation, 0);
+ page = alloc_page(sk->sk_allocation);
if (!page) {
err = -ENOBUFS;
skb_shinfo(skb)->nr_frags = i;
@@ -1031,7 +1031,7 @@ alloc_new_skb:
} else if (i < MAX_SKB_FRAGS) {
if (copy > PAGE_SIZE)
copy = PAGE_SIZE;
- page = alloc_pages(sk->sk_allocation, 0);
+ page = alloc_page(sk->sk_allocation);
if (page == NULL) {
err = -ENOMEM;
goto error;
@@ -1392,7 +1392,7 @@ alloc_new_skb:
} else if(i < MAX_SKB_FRAGS) {
if (copy > PAGE_SIZE)
copy = PAGE_SIZE;
- page = alloc_pages(sk->sk_allocation, 0);
+ page = alloc_page(sk->sk_allocation);
if (page == NULL) {
err = -ENOMEM;
goto error;