summary refs log tree commit diff
path: root/net/ax25/ax25_timer.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-02-22 00:00:20 -0500
committerDavid S. Miller <davem@davemloft.net>2014-02-22 00:00:20 -0500
commit68ad785c007246490b220ae958b544671339059b (patch)
treef79e78be18af6890b71aa833161b6ca4cc4576b3 /net/ax25/ax25_timer.c
parent7cce3b75682ff898c935c17d186983cbf3ed393e (diff)
parent970122fdf4b2d79c708022f2fdc0ab3840311d87 (diff)
downloadlinux-68ad785c007246490b220ae958b544671339059b.tar.gz
Merge branch 'tipc'
Ying Xue says:

====================
tipc: clean up components initialization code

In this series, we will fix a regression issue involved by commit
6e967adf7(tipc: relocate common functions from media to bearer)
But before the issue is fixed, we firstly adjust the process of
components initialization so as to remove all enabled flags from
necessary tipc components. Otherwise, without the change, we also
have to add an extra enabled flag into bearer layer indicating
whether bearer setup is finshed or not.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ax25/ax25_timer.c')
0 files changed, 0 insertions, 0 deletions