summaryrefslogtreecommitdiff
path: root/net/core/skbuff.c
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2007-10-31 11:06:37 (GMT)
committerJens Axboe <axboe@carl.home.kernel.dk>2007-11-02 07:47:06 (GMT)
commitc46f2334c84c2b26baa64d42d75ddc5fab38c3dc (patch)
tree4d7800effffe61bd3eaeae8f13e44466e4818b36 /net/core/skbuff.c
parent87ae9afdcada236d0a1b38ce2c465a65916961dc (diff)
downloadlinux-fsl-qoriq-c46f2334c84c2b26baa64d42d75ddc5fab38c3dc.tar.xz
[SG] Get rid of __sg_mark_end()
sg_mark_end() overwrites the page_link information, but all users want __sg_mark_end() behaviour where we just set the end bit. That is the most natural way to use the sg list, since you'll fill it in and then mark the end point. So change sg_mark_end() to only set the termination bit. Add a sg_magic debug check as well, and clear a chain pointer if it is set. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'net/core/skbuff.c')
-rw-r--r--net/core/skbuff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 64b50ff..32d5826 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2095,7 +2095,7 @@ int skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int le
{
int nsg = __skb_to_sgvec(skb, sg, offset, len);
- __sg_mark_end(&sg[nsg - 1]);
+ sg_mark_end(&sg[nsg - 1]);
return nsg;
}