|
From: Ying X. <yin...@wi...> - 2013-10-25 10:40:53
|
v4 changes:
- remove patch #2 (tipc: involve tipc_unregister_media routine)
- remove patch #7 (tipc: remove extern keywords from function
declarations)
- rebase other patches on the latest net-next tree
- revise patch headers of patch #9 and patch #10 with Erik's
suggestions.
v3 changes:
- add patch #1 and patch #7
- rebase v2 on the series of "[PATCH net-next v2 0/6] tipc: some small
patches" sbumitted by Ying at 9/29 and the patch of "[PATCH net-next
1/1] tipc: simplify the link lookup routine" sent by Jon at 9/6.
v2 changes:
- revise changelogs of all relevant patches.
- drop the patch "[PATCH net-next v1 06/30] tipc: avoid to launch
different thread to call link_state_event". As Jason said, it's
meaningful to let tipc_link_start() run in tasklet context.
- merge patch "PATCH net-next v1 01/30] tipc: remove bearer setup
works" into patch #4 (move registration of TIPC packet handler to
media start).
- divide patch "PATCH net-next v1 10/30] tipc: convert static media
array to hash list" into two patches like patch #2 and patch #3.
- merge patch #13 "[PATCH net-next v1 13/30] tipc: move functions of
registering media into tipc_core_start routine", patch #14 "[PATCH
net-next v1 14/30] tipc: eliminate tipc core net start/stop routines"
and patch #15 "[PATCH net-next v1 15/30] tipc: use config_mutex to
protect tipc_net_stop routine" to one patch #6.
- divide patch #16 into two patches: patch #7 and patch #8.
- add a new patch #9.
- now the mapping relationship between v1 and v2 will be:
1. old patch #1 is to new patch #4;
2. old patch #2, #3 and #4 are included into the small
non-controversial series;
3. old patch #4 is dropped in the series.
4. old patch #9 is mapped to patch #1.
5. old patch #10 is divided into patch #2 and #3.
6. old patch #11 is mapped to patch #4.
7. old patch #12 is mapped to patch #5.
8. old patch #13, #14 and #15 is patch #6.
9. old patch #16 is divided into patch #7 and #8.
10. old patch #17 is mapped to patch #10.
11. the rest of patches in v1 will be sent out recently.
Ying Xue (12):
tipc: convert 'blocked' flag in struct tipc_bearer to atomic_t
tipc: involve tipc_unregister_media routine
*** BLURB HERE ***
Ying Xue (10):
tipc: convert 'blocked' flag in struct tipc_bearer to atomic_t
tipc: make bearer variable in media structure synchronous
tipc: get rid of af_packet_priv usage when register TIPC protocol
handler
tipc: move registration of TIPC packet handler to media start
tipc: remove flush_scheduled_work() from media stop routines
tipc: expand config_muex usage
tipc: convert tipc_bearers array to pointer list
tipc: make media structure contain tipc_bearer object
tipc: add common unwind section to reduce duplicated code
tipc: use bearer lock to protect links list when link is created
net/tipc/bcast.c | 10 +--
net/tipc/bearer.c | 92 +++++++++++------------
net/tipc/bearer.h | 11 +--
net/tipc/config.c | 4 +-
net/tipc/config.h | 4 +-
net/tipc/core.c | 37 ++-------
net/tipc/core.h | 1 -
net/tipc/discover.c | 22 +++---
net/tipc/eth_media.c | 204 +++++++++++++++++++++++++-------------------------
net/tipc/ib_media.c | 190 +++++++++++++++++++++++-----------------------
net/tipc/link.c | 14 ++--
net/tipc/net.c | 3 +
12 files changed, 278 insertions(+), 314 deletions(-)
--
1.7.9.5
|