Merge branch 'tipc-next'
authorDavid S. Miller <davem@davemloft.net>
Thu, 2 Apr 2015 20:27:13 +0000 (16:27 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 2 Apr 2015 20:27:13 +0000 (16:27 -0400)
commitc448b5e7853b5921957c4cbf5ad54a20eff79882
tree1d01a4365c6cb35c01ef6a2ce36af019de1571be
parentc5531ca2bf3de4e172d2dcc12b97b9f663ab0453
parented193ece2649c194a87a9d8470195760d367c075
Merge branch 'tipc-next'

Jon Maloy says:

====================
tipc: remove some unnecessary complexity

The TIPC code is unnecessarily complex in some places, often because
the conditions or assumptions that were the cause for the complexity
are not valid anymore.

In these three commits, we eliminate some cases of such redundant
complexity.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>