diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2007-10-31 07:06:37 -0400 |
---|---|---|
committer | Jens Axboe <axboe@carl.home.kernel.dk> | 2007-11-02 03:47:06 -0400 |
commit | c46f2334c84c2b26baa64d42d75ddc5fab38c3dc (patch) | |
tree | 4d7800effffe61bd3eaeae8f13e44466e4818b36 /net/core | |
parent | 87ae9afdcada236d0a1b38ce2c465a65916961dc (diff) |
[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')
-rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 64b50ff7a413..32d5826b7177 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 | |||
2095 | { | 2095 | { |
2096 | int nsg = __skb_to_sgvec(skb, sg, offset, len); | 2096 | int nsg = __skb_to_sgvec(skb, sg, offset, len); |
2097 | 2097 | ||
2098 | __sg_mark_end(&sg[nsg - 1]); | 2098 | sg_mark_end(&sg[nsg - 1]); |
2099 | 2099 | ||
2100 | return nsg; | 2100 | return nsg; |
2101 | } | 2101 | } |