Commit 1d4a31dd authored by David S. Miller's avatar 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: default avatarDavid S. Miller <davem@davemloft.net>
parent 0b815a1a
...@@ -738,7 +738,7 @@ static inline void skb_queue_splice(const struct sk_buff_head *list, ...@@ -738,7 +738,7 @@ static inline void skb_queue_splice(const struct sk_buff_head *list,
{ {
if (!skb_queue_empty(list)) { if (!skb_queue_empty(list)) {
__skb_queue_splice(list, (struct sk_buff *) head, head->next); __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, ...@@ -754,7 +754,7 @@ static inline void skb_queue_splice_init(struct sk_buff_head *list,
{ {
if (!skb_queue_empty(list)) { if (!skb_queue_empty(list)) {
__skb_queue_splice(list, (struct sk_buff *) head, head->next); __skb_queue_splice(list, (struct sk_buff *) head, head->next);
head->qlen = list->qlen; head->qlen += list->qlen;
__skb_queue_head_init(list); __skb_queue_head_init(list);
} }
} }
...@@ -769,7 +769,7 @@ static inline void skb_queue_splice_tail(const struct sk_buff_head *list, ...@@ -769,7 +769,7 @@ static inline void skb_queue_splice_tail(const struct sk_buff_head *list,
{ {
if (!skb_queue_empty(list)) { if (!skb_queue_empty(list)) {
__skb_queue_splice(list, head->prev, (struct sk_buff *) head); __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, ...@@ -786,7 +786,7 @@ static inline void skb_queue_splice_tail_init(struct sk_buff_head *list,
{ {
if (!skb_queue_empty(list)) { if (!skb_queue_empty(list)) {
__skb_queue_splice(list, head->prev, (struct sk_buff *) head); __skb_queue_splice(list, head->prev, (struct sk_buff *) head);
head->qlen = list->qlen; head->qlen += list->qlen;
__skb_queue_head_init(list); __skb_queue_head_init(list);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment