diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-07 18:44:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-07 18:44:35 -0500 |
| commit | 8752b5caed54baa36c056b5c279ccdcf2805b9f6 (patch) | |
| tree | a60f322078d1d53319ef2ece706ac96470bf3cc0 /net/xfrm | |
| parent | fd44b93cb5eee218231f6ce5883df937b3b9c3eb (diff) | |
| parent | 581465fa285863344efc233bc546823bfabd295f (diff) | |
| download | linux-8752b5caed54baa36c056b5c279ccdcf2805b9f6.tar.bz2 | |
Merge branch 'tipc'
Jon Maloy says:
====================
tipc: link setup and failover improvements
This series consists of four unrelated commits with different purposes.
- Commit #1 is purely cosmetic and pedagogic, hopefully making the
failover/tunneling logics slightly easier to understand.
- Commit #2 fixes a bug that has always been in the code, but was not
discovered until very recently.
- Commit #3 fixes a non-fatal race issue in the neighbour discovery
code.
- Commit #4 removes an unnecessary indirection step during link
startup.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
0 files changed, 0 insertions, 0 deletions