提交 1d4a31dd 编写于 作者: D David S. Miller

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: NDavid S. Miller <davem@davemloft.net>
上级 0b815a1a
......@@ -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);
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册