aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-01-14 17:37:09 -0500
committerDavid S. Miller <davem@davemloft.net>2014-01-14 17:42:42 -0500
commit0a379e21c503b2ff66b44d588df9f231e9b0b9ca (patch)
tree22b875fcf4b67fcd007726f00c5fc1748ce985d0 /net/tipc
parenta49da8811e71c5355b52c65ee32976741d5834cd (diff)
parentfdc3452cd2c7b2bfe0f378f92123f4f9a98fa2bd (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/link.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 471973ff134f..d4b5de41b682 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1438,6 +1438,7 @@ void tipc_rcv(struct sk_buff *head, struct tipc_bearer *b_ptr)
1438 int type; 1438 int type;
1439 1439
1440 head = head->next; 1440 head = head->next;
1441 buf->next = NULL;
1441 1442
1442 /* Ensure bearer is still enabled */ 1443 /* Ensure bearer is still enabled */
1443 if (unlikely(!b_ptr->active)) 1444 if (unlikely(!b_ptr->active))