Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

This commit is contained in:
David S. Miller
2014-01-14 14:37:09 -08:00
138 changed files with 785 additions and 439 deletions

View File

@ -1438,6 +1438,7 @@ void tipc_rcv(struct sk_buff *head, struct tipc_bearer *b_ptr)
int type;
head = head->next;
buf->next = NULL;
/* Ensure bearer is still enabled */
if (unlikely(!b_ptr->active))