summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorShirley Ma <xma@us.ibm.com>2011-07-09 02:55:27 -0700
committerDavid S. Miller <davem@davemloft.net>2011-07-09 02:55:27 -0700
commita48332f803093d5e3d431a5a1f595698911d1145 (patch)
treec493ee69295c8a282e4a69a34cb86131e9f63ff5 /net
parenta05e42c27f80d341a5ec2053b041e24231a002e2 (diff)
downloadop-kernel-dev-a48332f803093d5e3d431a5a1f595698911d1145.zip
op-kernel-dev-a48332f803093d5e3d431a5a1f595698911d1145.tar.gz
skbuff: clear tx zero-copy flag
This patch clears tx zero-copy flag as needed. Signed-off-by: Shirley Ma <xma@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/skbuff.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index a9577a2..d220119 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -677,6 +677,7 @@ struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t gfp_mask)
if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
if (skb_copy_ubufs(skb, gfp_mask))
return NULL;
+ skb_shinfo(skb)->tx_flags &= ~SKBTX_DEV_ZEROCOPY;
}
n = skb + 1;
@@ -801,6 +802,7 @@ struct sk_buff *pskb_copy(struct sk_buff *skb, gfp_t gfp_mask)
kfree(n);
goto out;
}
+ skb_shinfo(skb)->tx_flags &= ~SKBTX_DEV_ZEROCOPY;
}
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
skb_shinfo(n)->frags[i] = skb_shinfo(skb)->frags[i];
@@ -893,6 +895,7 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
if (skb_copy_ubufs(skb, gfp_mask))
goto nofrags;
+ skb_shinfo(skb)->tx_flags &= ~SKBTX_DEV_ZEROCOPY;
}
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
get_page(skb_shinfo(skb)->frags[i].page);
OpenPOWER on IntegriCloud