nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

skbuff: convert to skb_orphan_frags

Browse source 
Reduce code duplication a bit using the new helper.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael S. Tsirkin 2012-07-20 09:23:10 +00:00 committed by David S. Miller
parent a353e0ce0f
commit 70008aa50e
1 changed files with 8 additions and 14 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

12
net/core/skbuff.c
View file

@ -804,10 +804,8 @@ struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t gfp_mask)
{ {
struct sk_buff *n; struct sk_buff *n;
if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) { if (skb_orphan_frags(skb, gfp_mask))
if (skb_copy_ubufs(skb, gfp_mask))
return NULL; return NULL;
}
n = skb + 1; n = skb + 1;
if (skb->fclone == SKB_FCLONE_ORIG && if (skb->fclone == SKB_FCLONE_ORIG &&
@ -927,13 +925,11 @@ struct sk_buff *__pskb_copy(struct sk_buff *skb, int headroom, gfp_t gfp_mask)
if (skb_shinfo(skb)->nr_frags) { if (skb_shinfo(skb)->nr_frags) {
int i; int i;
if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) { if (skb_orphan_frags(skb, gfp_mask)) {
if (skb_copy_ubufs(skb, gfp_mask)) {
kfree_skb(n); kfree_skb(n);
n = NULL; n = NULL;
goto out; goto out;
} }
}
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
skb_shinfo(n)->frags[i] = skb_shinfo(skb)->frags[i]; skb_shinfo(n)->frags[i] = skb_shinfo(skb)->frags[i];
skb_frag_ref(skb, i); skb_frag_ref(skb, i);
@ -1005,10 +1001,8 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
*/ */
if (skb_cloned(skb)) { if (skb_cloned(skb)) {
/* copy this zero copy skb frags */ /* copy this zero copy skb frags */
if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) { if (skb_orphan_frags(skb, gfp_mask))
if (skb_copy_ubufs(skb, gfp_mask))
goto nofrags; goto nofrags;
}
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
skb_frag_ref(skb, i); skb_frag_ref(skb, i);