diff options
| author | Ian Campbell <Ian.Campbell@citrix.com> | 2011-08-22 23:44:58 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-24 17:52:11 -0700 |
| commit | ea2ab69379a941c6f8884e290fdd28c93936a778 (patch) | |
| tree | c02aa9c5ed66b1640b54bb6b763d131b9419be29 /net/core/sock.c | |
| parent | 15133fbbb91ae695f153fb48daa6a1a8af4a5032 (diff) | |
| download | kernel_samsung_smdk4412-ea2ab69379a941c6f8884e290fdd28c93936a778.zip kernel_samsung_smdk4412-ea2ab69379a941c6f8884e290fdd28c93936a778.tar.gz kernel_samsung_smdk4412-ea2ab69379a941c6f8884e290fdd28c93936a778.tar.bz2 | |
net: convert core to skb paged frag APIs
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 9997026..b29ab61 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1533,7 +1533,6 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len, skb_shinfo(skb)->nr_frags = npages; for (i = 0; i < npages; i++) { struct page *page; - skb_frag_t *frag; page = alloc_pages(sk->sk_allocation, 0); if (!page) { @@ -1543,12 +1542,11 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len, goto failure; } - frag = &skb_shinfo(skb)->frags[i]; - frag->page = page; - frag->page_offset = 0; - frag->size = (data_len >= PAGE_SIZE ? - PAGE_SIZE : - data_len); + __skb_fill_page_desc(skb, i, + page, 0, + (data_len >= PAGE_SIZE ? + PAGE_SIZE : + data_len)); data_len -= PAGE_SIZE; } |