Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Honestly all the conflicts were simple overlapping changes, nothing really interesting to report. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -218,6 +218,7 @@ void tipc_group_delete(struct net *net, struct tipc_group *grp)
|
||||
|
||||
rbtree_postorder_for_each_entry_safe(m, tmp, tree, tree_node) {
|
||||
tipc_group_proto_xmit(grp, m, GRP_LEAVE_MSG, &xmitq);
|
||||
__skb_queue_purge(&m->deferredq);
|
||||
list_del(&m->list);
|
||||
kfree(m);
|
||||
}
|
||||
|
Reference in New Issue
Block a user