aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-09-22 21:57:21 -0700
committerDavid S. Miller <davem@davemloft.net>2008-09-22 21:57:21 -0700
commit1d4a31dde95af56edac4dee268249a29a21fa7c0 (patch)
tree68d9bd2d277aa13da4020111d2e8420b129dc373 /include/linux
parent0b815a1a6d43ab498674b8430c8c35ab08487a16 (diff)
downloadkernel_samsung_smdk4412-1d4a31dde95af56edac4dee268249a29a21fa7c0.zip
kernel_samsung_smdk4412-1d4a31dde95af56edac4dee268249a29a21fa7c0.tar.gz
kernel_samsung_smdk4412-1d4a31dde95af56edac4dee268249a29a21fa7c0.tar.bz2
net: Fix bus in SKB queue splicing interfaces.
Handle the case of head being non-empty, by adding list->qlen to head->qlen instead of using direct assignment. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/skbuff.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 027b061..4a144e8 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -738,7 +738,7 @@ static inline void skb_queue_splice(const struct sk_buff_head *list,
{
if (!skb_queue_empty(list)) {
__skb_queue_splice(list, (struct sk_buff *) head, head->next);
- head->qlen = list->qlen;
+ head->qlen += list->qlen;
}
}
@@ -754,7 +754,7 @@ static inline void skb_queue_splice_init(struct sk_buff_head *list,
{
if (!skb_queue_empty(list)) {
__skb_queue_splice(list, (struct sk_buff *) head, head->next);
- head->qlen = list->qlen;
+ head->qlen += list->qlen;
__skb_queue_head_init(list);
}
}
@@ -769,7 +769,7 @@ static inline void skb_queue_splice_tail(const struct sk_buff_head *list,
{
if (!skb_queue_empty(list)) {
__skb_queue_splice(list, head->prev, (struct sk_buff *) head);
- head->qlen = list->qlen;
+ head->qlen += list->qlen;
}
}
@@ -786,7 +786,7 @@ static inline void skb_queue_splice_tail_init(struct sk_buff_head *list,
{
if (!skb_queue_empty(list)) {
__skb_queue_splice(list, head->prev, (struct sk_buff *) head);
- head->qlen = list->qlen;
+ head->qlen += list->qlen;
__skb_queue_head_init(list);
}
}