commits July 2017

commits@lists.open-mesh.org

1 participants
1317 discussions

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/Download (cda95f1b)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/BranchesExplained (4fa4f766)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/ELP (7a1d1e25)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit 7a1d1e259e83328cf552c04902707e1243f15a43 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Sat Jan 15 22:12:27 2011 +0000 doc: batman-adv/ELP >--------------------------------------------------------------- 7a1d1e259e83328cf552c04902707e1243f15a43 batman-adv/ELP.textile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/batman-adv/ELP.textile b/batman-adv/ELP.textile index 1d49de36..ea0fb15a 100644 --- a/batman-adv/ELP.textile +++ b/batman-adv/ELP.textile @@ -8,6 +8,10 @@ However, this also has three major drawbacks: The idea is to strip the link-quality calculations from the normal originator-messages and use a seperate packet type (basically hello-messages) and mechanism for this. Which would allow us to develop (convergence) optimization strategies for both jobs independently. +== Pros of NDP == + * + * + == Definitions == '''duplicate'''

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/ELP: add notes from NDP documentation discussion (b82b6163)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit b82b616387bd96a48ff53e6df509526ff432f57d Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Sat Jan 15 23:56:54 2011 +0000 doc: batman-adv/ELP: add notes from NDP documentation discussion >--------------------------------------------------------------- b82b616387bd96a48ff53e6df509526ff432f57d batman-adv/ELP.textile | 98 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 64 insertions(+), 34 deletions(-) diff --git a/batman-adv/ELP.textile b/batman-adv/ELP.textile index ea0fb15a..ea432ec0 100644 --- a/batman-adv/ELP.textile +++ b/batman-adv/ELP.textile @@ -9,53 +9,53 @@ However, this also has three major drawbacks: The idea is to strip the link-quality calculations from the normal originator-messages and use a seperate packet type (basically hello-messages) and mechanism for this. Which would allow us to develop (convergence) optimization strategies for both jobs independently. == Pros of NDP == - * - * + * Modularization of the code + * The delta changes between two OGMs can be increased with an NDP interval faster than the OGM interval, resulting in a higher influence of a single OGM. + * Seperate optimization strategies can be used for NDP and OGMs individually then. + * The more sparse the network is (number of single hop neighbors significantly smaller than the number of all nodes), the faster the NDP interval can be chosen relative to the OGM interval, resulting in major convergence speed improvements in sparse networks. + * As NDP messages are never rebroadcasted it also helps to reduce the overhead in dense networks (many single hop neighbors). + * (Mobile nodes can chose a faster OGM + NDP interval then. It directly improves their transmit path - which was not the case with the OGM LQ measurements due to the echo-quality dependency, and indirectly improves their receive path a little, due to the asymmetric penalty) + * Less overhead: no rebroadcasts + * More acuracy in case of medium/bad links == Definitions == -'''duplicate''' - * seqno X from originator Y + * duplicate + * out of order + * LQ / RQ -> in percent + * bidrectional link -'''out of order''' - * seqno X + 1 received before seqno X +== Protocol Procedure == +every node broadcasts a NDP packet which contains a seqno and the list of neighbors it can hear. +[Picture of NDP packet] (not struct definition) -== Looping problems == -However, there seems to be a looping problem? (or do sequence numbers or global TQ window fix this?) -In the following 4 node scenario, the parameters are as follows: - * OGM interval: 1000 - * NDP interval: ε (very fast) -Now node R moves from B to A within the first second, so he'll arrive at B before it schedules its next OGM. Also this next OGM after this first second already uses the new link qualities due to the fast NDP interval. +=== Calculating Receive Quality === + * Counting NDP packets + -> duplicate, abort proceding -'''t = 0:''' +=== Calculating Transmit Quality === + * don't attach neighbor if RQ == 0 + * -[[Image(NDP-mobile-loop-0s.png, 20%25)]] +== Misc == -'''t = 1:''' +=== Route switching === +NDP does not directly change routing decisions on its own, to keep a clean separation between OGMs and NDP and to reduce side effects. -[[Image(NDP-mobile-loop-1s.png, 20%25)]] +=== Interface down === + * Clear LQ table -After about 10 seconds average, there will be a loop with S sending packets to B, and B sending them back to S. This loop will last for about 3.3 seconds average. +== Extensions == +=== Threshholds === +=== EWMA === +=== Weighted Window === +=== Auto RQ window sliding === +=== Fixed minimum NDP packet size? === +=== Sometimes maximum packet size packets? === -The following [[http://x-realis.dyndns.org/freifunk/scan.pdf table]] will hold some more in detail information with the times and events that will change BATMAN nodes topology knowledge. It holds the following information: - * The times t in the table are the average times of arrival of an OGM at a node in seconds. - * The table shows the TQ values towards R. The first six of these rows are from a nodes perspective, the last two ones the actual, real TQ values for the chosen path. - * Time span with loops is marked with YES in the 'loops' row. -''Result:'' In this quite typical and small-scale scenario, we already have an average time with looping packets of '''3.3''' seconds. -== packet type: BAT_PACKET_NDP == -{{{ -/* Neighbor discovery packet */ -struct batman_packet_ndp { - uint8_t packet_type; - uint8_t version; /* batman version field */ - uint8_t orig[6]; - uint32_t seqno; - uint8_t num_neighbors; - uint8_t align[3]; -} __attribute__((packed)); -}}} +---- == RQ calculation == In periodic intervals, customizable per interface, a ndp packet gets broadcasted on each interface. As it has been done with the normal OGMs before, the rq-value is being calculated with a sliding window and counting the number of received ndp packets, but on a per interface basis now. @@ -90,3 +90,33 @@ Although this does not optimize the convergence speed, it could greatly increase P(|N| = |N^+^|) = ∏_{n ∈ N} TQ(B, iface, n) with N being the set of A's neighbors and N^+^ the set of neighbors successfully receiving the broadcast. A node could then either decide with a threshold, if it might not rebroadcast (rebroadcast, if P(|N| = |N^+^|) < 0.9 i.e.). Or more elegantly rebroadcast to a certain probability: 1 - P(|N| = |N^+^|) (or 1 - P(|N| = |N^+^|)^3^ for a more conservative decision i.e.). + +---- + + +==== Looping problems ==== + +''Not an NDP issue, also present for current OGM mechanism - moved it to a different page later'' + +However, there seems to be a looping problem? (or do sequence numbers or global TQ window fix this?) +In the following 4 node scenario, the parameters are as follows: + * OGM interval: 1000 + * NDP interval: ε (very fast) +Now node R moves from B to A within the first second, so he'll arrive at B before it schedules its next OGM. Also this next OGM after this first second already uses the new link qualities due to the fast NDP interval. + +'''t = 0:''' + +[[Image(NDP-mobile-loop-0s.png, 20%25)]] + +'''t = 1:''' + +[[Image(NDP-mobile-loop-1s.png, 20%25)]] + +After about 10 seconds average, there will be a loop with S sending packets to B, and B sending them back to S. This loop will last for about 3.3 seconds average. + +The following [[http://x-realis.dyndns.org/freifunk/scan.pdf table]] will hold some more in detail information with the times and events that will change BATMAN nodes topology knowledge. It holds the following information: + * The times t in the table are the average times of arrival of an OGM at a node in seconds. + * The table shows the TQ values towards R. The first six of these rows are from a nodes perspective, the last two ones the actual, real TQ values for the chosen path. + * Time span with loops is marked with YES in the 'loops' row. + +''Result:'' In this quite typical and small-scale scenario, we already have an average time with looping packets of '''3.3''' seconds.

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/ELP (bdcb9cfd)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit bdcb9cfd5536d87327babcdfa6d39975f006bdbb Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat Jan 15 22:09:02 2011 +0000 doc: batman-adv/ELP >--------------------------------------------------------------- bdcb9cfd5536d87327babcdfa6d39975f006bdbb batman-adv/ELP.textile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/batman-adv/ELP.textile b/batman-adv/ELP.textile index 8d3d9c92..1d49de36 100644 --- a/batman-adv/ELP.textile +++ b/batman-adv/ELP.textile @@ -8,6 +8,14 @@ However, this also has three major drawbacks: The idea is to strip the link-quality calculations from the normal originator-messages and use a seperate packet type (basically hello-messages) and mechanism for this. Which would allow us to develop (convergence) optimization strategies for both jobs independently. +== Definitions == + +'''duplicate''' + * seqno X from originator Y + +'''out of order''' + * seqno X + 1 received before seqno X + == Looping problems == However, there seems to be a looping problem? (or do sequence numbers or global TQ window fix this?) In the following 4 node scenario, the parameters are as follows:

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/ELP: detailed protocol procedure descriptions (a648c200)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit a648c200e0fb78e1df8c53dbb3286edf6d39f906 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Sun Jan 16 01:08:01 2011 +0000 doc: batman-adv/ELP: detailed protocol procedure descriptions >--------------------------------------------------------------- a648c200e0fb78e1df8c53dbb3286edf6d39f906 batman-adv/ELP.textile | 52 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/batman-adv/ELP.textile b/batman-adv/ELP.textile index ea432ec0..7b20baae 100644 --- a/batman-adv/ELP.textile +++ b/batman-adv/ELP.textile @@ -13,37 +13,53 @@ The idea is to strip the link-quality calculations from the normal originator-me * The delta changes between two OGMs can be increased with an NDP interval faster than the OGM interval, resulting in a higher influence of a single OGM. * Seperate optimization strategies can be used for NDP and OGMs individually then. * The more sparse the network is (number of single hop neighbors significantly smaller than the number of all nodes), the faster the NDP interval can be chosen relative to the OGM interval, resulting in major convergence speed improvements in sparse networks. - * As NDP messages are never rebroadcasted it also helps to reduce the overhead in dense networks (many single hop neighbors). - * (Mobile nodes can chose a faster OGM + NDP interval then. It directly improves their transmit path - which was not the case with the OGM LQ measurements due to the echo-quality dependency, and indirectly improves their receive path a little, due to the asymmetric penalty) - * Less overhead: no rebroadcasts - * More acuracy in case of medium/bad links + * As NDP messages are never rebroadcasted it also helps to reduce the overhead in dense networks (many single hop neighbors). + * (Mobile nodes can chose a faster OGM + NDP interval then. It directly improves their transmit path - which was not the case with the OGM LQ measurements due to the echo-quality dependency, and indirectly improves their receive path a little, due to the asymmetric penalty) + * Less overhead: With the classic LQ measurements with NDP, the overhead increases in a squared way immediately due to the OGM rebroadcast mechanism. The squared factor in NDP has a very low base however, therefore it only applies at a large amount of neighbors. This means, that when having i.e. 10 neighbors (or probably even 50), you can select a 10 (or 50x) faster NDP interval compared to the LQ measurements with the classic OGMs. + * More accuracy in case of medium/bad links: The EQ mechanism "reduces" the effective window for the EQ measurements. So when having a TQ of 50%25, the effective EQ window will be only ~32 bits large instead of the 64, leading to many more TQ/RQ fluctuations on links with a low transmit quality. == Definitions == - * duplicate + * duplicate (match of (neigh_addr, seqno) tuple, not originator related) * out of order * LQ / RQ -> in percent * bidrectional link == Protocol Procedure == -every node broadcasts a NDP packet which contains a seqno and the list of neighbors it can hear. +Every node broadcasts an NDP packet which contains a seqno and the list of neighbors it can hear. This is done periodically after each NDP interval + jitter. [Picture of NDP packet] (not struct definition) === Calculating Receive Quality === - * Counting NDP packets - -> duplicate, abort proceding +The first step for a node is to calculate its receive quality from every neighbor. Therefore it: + * checks whether the NDP packet is a duplicate. If so, abort processing of NDP packet + * checks whether the NDP packet is too old? (TODO: Simon, add/describe the protected window mechanism) + * Inserts the seqno it receives in a window (default size: 64), if it is newer than XXX and moves the window + accordingly. Or inserts the seqno without moving the window if it is in range of the current window + * Calculates the new percentage of received packets in the window and memorizes this value for the according neighbor. -=== Calculating Transmit Quality === - * don't attach neighbor if RQ == 0 - * - -== Misc == -=== Route switching === -NDP does not directly change routing decisions on its own, to keep a clean separation between OGMs and NDP and to reduce side effects. - -=== Interface down === - * Clear LQ table +=== Calculating Transmit Quality === +However, we are not directly interested in the local RQ value, but the local TQ instead as the routing protocol is usually +interested in calculating the best transmission and not reception path. Therefore the calculated local RQ towards a neighbor +needs to be published to this neighbor as it is the local TQ from this neighbor's point of view. That is where the +neighbor entries attached to the own NDP packets are used for, in the following procedure: + * Do not attach a neighbor entry if the RQ is 0. If so, skip the following steps. + * Check if there is enough space for another neighbor entry in the packet left. Otherwise abort and skip the following steps. + * Attach the (neigh_if_mac, local RQ) tuple (4 Byte aligned) to the NDP packet. + * Increase the counter for the number of neighbor entries in the NDP packet header. +The neighbor receiving an NDP packet then has to go through the following steps to obtain its new TQ information: + * Traverse the NDP packet's attached neighbor entries. + * If an entry matches the mac address of the receiving interface and if the seqno is a new one, + then update/memorize the local TQ towards that neighbor with this value. + (TODO: does it make sense to not only check if the incoming interface mac matches, but also for other interfaces? Which would be + the case if a node uses two interfaces sharing somehow the same broadcast domain... rare, but possible... example: two wifi interfaces, + using channels 1 and 3) + * If a match has been found, do not further procede the traversal of neighbor entries + +== Misc Notes == + * NDP has no knowledge about originator addresses. It especially does not treat NDP packets of the same originator but different interfaces in any way special. For determining link qualities it is sufficient to treat NDP packets of the same originator over different interfaces as separate neighbors. + * When an interface is being set down, the LQ table is cleared + * Route switching: NDP does not directly change routing decisions on its own, to keep a clean separation between OGMs and NDP and to reduce side effects. == Extensions == === Threshholds ===

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/Contribute (d3644f3a)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit d3644f3a9b4337ab0dc882fb46169703d5bc52fb Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Dec 29 21:13:26 2010 +0000 doc: open-mesh/Contribute >--------------------------------------------------------------- d3644f3a9b4337ab0dc882fb46169703d5bc52fb open-mesh/Contribute.textile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/open-mesh/Contribute.textile b/open-mesh/Contribute.textile index 35e2f404..0eb56988 100644 --- a/open-mesh/Contribute.textile +++ b/open-mesh/Contribute.textile @@ -1,4 +1,3 @@ - = How to Contribute = {{{ @@ -56,6 +55,11 @@ If you intend to send us patches, please consider the following guidelines: * The mail's subject will become the first line in the commit message. The body contains the longer patch description and the patch (unified format) itself. Please also specify the target branch (e.g. batctl, batman-adv, etc) at the beginning of the subject line. See the [http://www.open-mesh.org/timeline timeline] for more examples. * Add a "Signed-off-by: Your Name <!you(a)example.com>" line to the patch message to make the ownership of the patch clear. * Patches for B.A.T.M.A.N. Advanced need to follow the linux kernel coding style closely (use checkpatch.pl to verify your patch) as well as the linux "how to submit patches" guidelines (search for the term !SubmitPatches to find thorough documentation). + * Patches must be against trunk and have an additional prefix before the actual project subdirectory. It must be possible to apply those patches on top of a checkout of the svn trunk directory using {{{patch -p1 -i $PATCH}}} + * Patches against the batman-adv master branch must be formated using +{{{ +git format-patch -M --patience --src-prefix=a/batman-adv/ --dst-prefix=b/batman-adv/ $BASECOMMIT +}}} * An exemplary good submission you may want to look at can be found here: https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2009-December/002033.html }}}

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/SubmittingLinux: replace staging with net (09182ab9)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit 09182ab942eeb27b358bbff115d1d19f6e3f2a8d Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 18 13:47:25 2010 +0000 doc: batman-adv/SubmittingLinux: replace staging with net >--------------------------------------------------------------- 09182ab942eeb27b358bbff115d1d19f6e3f2a8d batman-adv/SubmittingLinux.textile | 230 ++++++++++++++++++------------------- 1 file changed, 115 insertions(+), 115 deletions(-) diff --git a/batman-adv/SubmittingLinux.textile b/batman-adv/SubmittingLinux.textile index 1ad06aad..be91d2bb 100644 --- a/batman-adv/SubmittingLinux.textile +++ b/batman-adv/SubmittingLinux.textile @@ -14,7 +14,7 @@ Following steps must always be done: * check if all versions compile cleanly against a current version of linux-next and sparse (cgcc) * format patches * check commit messages author/signed-off-by of patches - * Add "Staging: batman-adv: " before each commit subject + * Add "batman-adv: " before each commit subject * get current version of linux-next * create working branch on linux-next * apply all patches on linux next @@ -57,26 +57,26 @@ From git+ssh://open-mesh.org/srv/git/ecsv/linux-merge Checking out files: 100%25 (32337/32337), done. Switched to branch 'linux' '-(%25)-(linux)> git merge -s subtree origin/next -Auto-merging drivers/staging/batman-adv/Makefile -CONFLICT (content): Merge conflict in drivers/staging/batman-adv/Makefile -CONFLICT (delete/modify): drivers/staging/batman-adv/Makefile.kbuild deleted in HEAD and modified in next. Version next of drivers/staging/batman-adv/Makefile.kbuild left in tree. -CONFLICT (delete/modify): drivers/staging/batman-adv/compat.h deleted in HEAD and modified in next. Version next of drivers/staging/batman-adv/compat.h left in tree. -Auto-merging drivers/staging/batman-adv/main.c -Auto-merging drivers/staging/batman-adv/originator.c -Auto-merging drivers/staging/batman-adv/routing.c -Auto-merging drivers/staging/batman-adv/send.c -Auto-merging drivers/staging/batman-adv/soft-interface.c -Auto-merging drivers/staging/batman-adv/translation-table.c -Auto-merging drivers/staging/batman-adv/vis.c +Auto-merging net/batman-adv/Makefile +CONFLICT (content): Merge conflict in net/batman-adv/Makefile +CONFLICT (delete/modify): net/batman-adv/Makefile.kbuild deleted in HEAD and modified in next. Version next of net/batman-adv/Makefile.kbuild left in tree. +CONFLICT (delete/modify): net/batman-adv/compat.h deleted in HEAD and modified in next. Version next of net/batman-adv/compat.h left in tree. +Auto-merging net/batman-adv/main.c +Auto-merging net/batman-adv/originator.c +Auto-merging net/batman-adv/routing.c +Auto-merging net/batman-adv/send.c +Auto-merging net/batman-adv/soft-interface.c +Auto-merging net/batman-adv/translation-table.c +Auto-merging net/batman-adv/vis.c Automatic merge failed; fix conflicts and then commit the result. -'-(%25)-(linux)> git rm drivers/staging/batman-adv/Makefile.kbuild drivers/staging/batman-adv/compat.h -drivers/staging/batman-adv/Makefile: needs merge -drivers/staging/batman-adv/Makefile.kbuild: needs merge -drivers/staging/batman-adv/compat.h: needs merge -rm 'drivers/staging/batman-adv/Makefile.kbuild' -rm 'drivers/staging/batman-adv/compat.h' -'-(%25)-(linux)> vim drivers/staging/batman-adv/Makefile -'-(%25)-(linux)> git add drivers/staging/batman-adv/Makefile +'-(%25)-(linux)> git rm net/batman-adv/Makefile.kbuild net/batman-adv/compat.h +net/batman-adv/Makefile: needs merge +net/batman-adv/Makefile.kbuild: needs merge +net/batman-adv/compat.h: needs merge +rm 'net/batman-adv/Makefile.kbuild' +rm 'net/batman-adv/compat.h' +'-(%25)-(linux)> vim net/batman-adv/Makefile +'-(%25)-(linux)> git add net/batman-adv/Makefile '-(%25)-(linux)> git commit [linux f2204f0] Merge remote branch 'origin/next' into linux }}} @@ -84,14 +84,14 @@ rm 'drivers/staging/batman-adv/compat.h' == check for compat code == {{{ -git grep compat.h drivers/staging/batman-adv/ -drivers/staging/batman-adv/CHANGELOG:* all kernel version compatibility functions has been moved to compat.h +git grep compat.h net/batman-adv/ +net/batman-adv/CHANGELOG:* all kernel version compatibility functions has been moved to compat.h }}} == check difference with next == {{{ -git diff origin/next: linux:drivers/staging/batman-adv/ +git diff origin/next: linux:net/batman-adv/ }}} Here you should see the @@ -114,7 +114,7 @@ Compressing objects: 100%25 (12/12), done. Writing objects: 100%25 (12/12), 1.75 KiB, done. Total 12 (delta 11), reused 0 (delta 0) Generating commit mails...done -fatal: Not a valid object name master:drivers/staging/batman-adv/TODO +fatal: Not a valid object name master:net/batman-adv/TODO To git+ssh://git@open-mesh.org/srv/git/ecsv/linux-merge.git * [new tag] GregKH-20100625 -> GregKH-20100625 }}} @@ -125,75 +125,75 @@ To git+ssh://git@open-mesh.org/srv/git/ecsv/linux-merge.git '-(%25)-(linux)> git checkout -b patches '-(%25)-(patches)> git rebase -s subtree GregKH-20100618 First, rewinding head to replay your work on top of it... -Auto-merging drivers/staging/batman-adv/main.c -Auto-merging drivers/staging/batman-adv/routing.c -Auto-merging drivers/staging/batman-adv/send.c -Auto-merging drivers/staging/batman-adv/soft-interface.c -Auto-merging drivers/staging/batman-adv/vis.c +Auto-merging net/batman-adv/main.c +Auto-merging net/batman-adv/routing.c +Auto-merging net/batman-adv/send.c +Auto-merging net/batman-adv/soft-interface.c +Auto-merging net/batman-adv/vis.c [detached HEAD 166b2ca] batman-adv: Convert names from Java to C style Author: Antonio Quartulli <ordex(a)ritirata.org> 7 files changed, 18 insertions(+), 18 deletions(-) Committed: 0001 batman-adv: Convert names from Java to C style -Auto-merging drivers/staging/batman-adv/translation-table.c +Auto-merging net/batman-adv/translation-table.c [detached HEAD 5cd6523] batman-adv: Avoid rounding issues for local hna timeout Author: Linus Lüssing <linus.luessing(a)web.de> 1 files changed, 1 insertions(+), 1 deletions(-) Committed: 0002 batman-adv: Avoid rounding issues for local hna timeout -Auto-merging drivers/staging/batman-adv/originator.c -Auto-merging drivers/staging/batman-adv/translation-table.c -Auto-merging drivers/staging/batman-adv/vis.c +Auto-merging net/batman-adv/originator.c +Auto-merging net/batman-adv/translation-table.c +Auto-merging net/batman-adv/vis.c [detached HEAD 83d1bc8] batman-adv: Lower resolution for timeouts Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> 5 files changed, 7 insertions(+), 10 deletions(-) Committed: 0003 batman-adv: Lower resolution for timeouts -Auto-merging drivers/staging/batman-adv/send.c +Auto-merging net/batman-adv/send.c [detached HEAD 9e9605f] batman-adv: replace manual calculation by msecs_to_jiffies() for better readability Author: Marek Lindner <lindner_marek(a)yahoo.de> 1 files changed, 4 insertions(+), 4 deletions(-) Committed: 0004 batman-adv: replace manual calculation by msecs_to_jiffies() for better readability -[detached HEAD 043aa9a] Staging: batman-adv: Add sysfs abi documentation about bonding +[detached HEAD 043aa9a] batman-adv: Add sysfs abi documentation about bonding Author: Marek Lindner <lindner_marek(a)yahoo.de> 1 files changed, 8 insertions(+), 0 deletions(-) -Committed: 0005 Staging: batman-adv: Add sysfs abi documentation about bonding +Committed: 0005 batman-adv: Add sysfs abi documentation about bonding [detached HEAD f6d8bab] batman-adv: adapting source version to revised versioning scheme Author: Marek Lindner <lindner_marek(a)yahoo.de> 1 files changed, 1 insertions(+), 1 deletions(-) Committed: 0006 batman-adv: adapting source version to revised versioning scheme -Auto-merging drivers/staging/batman-adv/Makefile -CONFLICT (content): Merge conflict in drivers/staging/batman-adv/Makefile +Auto-merging net/batman-adv/Makefile +CONFLICT (content): Merge conflict in net/batman-adv/Makefile When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". -'-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> vim drivers/staging/batman-adv/Makefile -'-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> git add drivers/staging/batman-adv/Makefile +'-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> vim net/batman-adv/Makefile +'-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> git add net/batman-adv/Makefile '-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> git rebase -s subtree --continue Already applied: 0007 batman-adv: Use nproc to get number of available processors -CONFLICT (delete/modify): drivers/staging/batman-adv/compat.h deleted in GregKH-20100618 and modified in HEAD~1. Version HEAD~1 of drivers/staging/batman-adv/compat.h left in tree. +CONFLICT (delete/modify): net/batman-adv/compat.h deleted in GregKH-20100618 and modified in HEAD~1. Version HEAD~1 of net/batman-adv/compat.h left in tree. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". -'-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> git rm drivers/staging/batman-adv/compat.h -drivers/staging/batman-adv/compat.h: needs merge -rm 'drivers/staging/batman-adv/compat.h' +'-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> git rm net/batman-adv/compat.h +net/batman-adv/compat.h: needs merge +rm 'net/batman-adv/compat.h' '-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> git rebase -s subtree --continue [detached HEAD a85d1b4] batman-adv: Add include guards to all header files 17 files changed, 78 insertions(+), 12 deletions(-) Committed: 0008 batman-adv: Add include guards to all header files -Auto-merging drivers/staging/batman-adv/Makefile -CONFLICT (content): Merge conflict in drivers/staging/batman-adv/Makefile -CONFLICT (delete/modify): drivers/staging/batman-adv/Makefile.kbuild deleted in GregKH-20100618 and modified in HEAD~0. Version HEAD~0 of drivers/staging/batman-adv/Makefile.kbuild left in tree. +Auto-merging net/batman-adv/Makefile +CONFLICT (content): Merge conflict in net/batman-adv/Makefile +CONFLICT (delete/modify): net/batman-adv/Makefile.kbuild deleted in GregKH-20100618 and modified in HEAD~0. Version HEAD~0 of net/batman-adv/Makefile.kbuild left in tree. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". -'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> git rm drivers/staging/batman-adv/Makefile.kbuild -drivers/staging/batman-adv/Makefile: needs merge -drivers/staging/batman-adv/Makefile.kbuild: needs merge -rm 'drivers/staging/batman-adv/Makefile.kbuild' -'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> vim drivers/staging/batman-adv/Makefile -'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> git add drivers/staging/batman-adv/Makefile +'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> git rm net/batman-adv/Makefile.kbuild +net/batman-adv/Makefile: needs merge +net/batman-adv/Makefile.kbuild: needs merge +rm 'net/batman-adv/Makefile.kbuild' +'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> vim net/batman-adv/Makefile +'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> git add net/batman-adv/Makefile '-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> git rebase -s subtree --continue Already applied: 0009 batman-adv: Add support for git revision string All done. @@ -220,7 +220,7 @@ Successfully rebased and updated refs/heads/patches 043aa9a54a5296c6027a5bcd808b8d29cea8a474 f6d8baba5fce6161bc2cee9c97e0afbc139942c0 a85d1b45e4cde0c882a41baaefeec0cd5502416f -'-(%25)-(patches)> cd drivers/staging/batman-adv/ +'-(%25)-(patches)> cd net/batman-adv/ '-(%25)-(patches)> git checkout 166b2caa61fce5260aed4e119671764331fdc62a Previous HEAD position was a85d1b4... batman-adv: Avoid rounding issues for local hna timeout HEAD is now at 166b2ca... batman-adv: Convert names from Java to C style @@ -238,11 +238,11 @@ HEAD is now at 9e9605f... batman-adv: replace manual calculation by msecs_to_jif .... '-(%25)-(9e9605f0fe000f1097cb43271540ab2b76b2a782)> git checkout 043aa9a54a5296c6027a5bcd808b8d29cea8a474 Previous HEAD position was 9e9605f... batman-adv: replace manual calculation by msecs_to_jiffies() for better readability -HEAD is now at 043aa9a... Staging: batman-adv: Add sysfs abi documentation about bonding +HEAD is now at 043aa9a... batman-adv: Add sysfs abi documentation about bonding '-(%25)-(043aa9a54a5296c6027a5bcd808b8d29cea8a474)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` ... '-(%25)-(043aa9a54a5296c6027a5bcd808b8d29cea8a474)> git checkout f6d8baba5fce6161bc2cee9c97e0afbc139942c0 -Previous HEAD position was 043aa9a... Staging: batman-adv: Add sysfs abi documentation about bonding +Previous HEAD position was 043aa9a... batman-adv: Add sysfs abi documentation about bonding HEAD is now at f6d8bab... batman-adv: adapting source version to revised versioning scheme '-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` ... @@ -264,13 +264,13 @@ Switched to branch 'patches' 0002-batman-adv-Avoid-rounding-issues-for-local-hna-timeo.patch 0003-batman-adv-Lower-resolution-for-timeouts.patch 0004-batman-adv-replace-manual-calculation-by-msecs_to_ji.patch -0005-Staging-batman-adv-Add-sysfs-abi-documentation-about.patch +0005-batman-adv-Add-sysfs-abi-documentation-about.patch 0006-batman-adv-adapting-source-version-to-revised-versio.patch 0007-batman-adv-Add-include-guards-to-all-header-files.patch '-(%25)-(patches)> vim 00*.patch }}} -Usually I add "Staging: batman-adv: " right when checking the signed-off-by and author (from) line. +Usually I add "batman-adv: " right when checking the signed-off-by and author (from) line. == apply all patches on linux next == @@ -282,13 +282,13 @@ HEAD is now at c3116ae Add linux-next specific files for 20100625 '-(%25)-(master)> git checkout -b greg Switched to a new branch 'greg' '-(%25)-(greg)> git am -3 ../linux-merge/00*.patch -Applying: Staging: batman-adv: Convert names from Java to C style -Applying: Staging: batman-adv: Avoid rounding issues for local hna timeout -Applying: Staging: batman-adv: Lower resolution for timeouts -Applying: Staging: batman-adv: replace manual calculation by msecs_to_jiffies() for better readability -Applying: Staging: batman-adv: Add sysfs abi documentation about bonding -Applying: Staging: batman-adv: adapting source version to revised versioning scheme -Applying: Staging: batman-adv: Add include guards to all header files +Applying: batman-adv: Convert names from Java to C style +Applying: batman-adv: Avoid rounding issues for local hna timeout +Applying: batman-adv: Lower resolution for timeouts +Applying: batman-adv: replace manual calculation by msecs_to_jiffies() for better readability +Applying: batman-adv: Add sysfs abi documentation about bonding +Applying: batman-adv: adapting source version to revised versioning scheme +Applying: batman-adv: Add include guards to all header files }}} == check if all patches build again with linux next == @@ -302,35 +302,35 @@ Applying: Staging: batman-adv: Add include guards to all header files {{{ '-(%25)-(greg)> git format-patch -s --patience -M master -0001-Staging-batman-adv-Convert-names-from-Java-to-C-styl.patch -0002-Staging-batman-adv-Avoid-rounding-issues-for-local-h.patch -0003-Staging-batman-adv-Lower-resolution-for-timeouts.patch -0004-Staging-batman-adv-replace-manual-calculation-by-mse.patch -0005-Staging-batman-adv-Add-sysfs-abi-documentation-about.patch -0006-Staging-batman-adv-adapting-source-version-to-revise.patch -0007-Staging-batman-adv-Add-include-guards-to-all-header-.patch +0001-batman-adv-Convert-names-from-Java-to-C-styl.patch +0002-batman-adv-Avoid-rounding-issues-for-local-h.patch +0003-batman-adv-Lower-resolution-for-timeouts.patch +0004-batman-adv-replace-manual-calculation-by-mse.patch +0005-batman-adv-Add-sysfs-abi-documentation-about.patch +0006-batman-adv-adapting-source-version-to-revise.patch +0007-batman-adv-Add-include-guards-to-all-header-.patch '-(%25)-(greg)> ./scripts/checkpatch.pl --strict 00*.patch total: 0 errors, 0 warnings, 0 checks, 135 lines checked -0001-Staging-batman-adv-Convert-names-from-Java-to-C-styl.patch has no obvious style problems and is ready for submission. +0001-batman-adv-Convert-names-from-Java-to-C-styl.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 8 lines checked -0002-Staging-batman-adv-Avoid-rounding-issues-for-local-h.patch has no obvious style problems and is ready for submission. +0002-batman-adv-Avoid-rounding-issues-for-local-h.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 55 lines checked -0003-Staging-batman-adv-Lower-resolution-for-timeouts.patch has no obvious style problems and is ready for submission. +0003-batman-adv-Lower-resolution-for-timeouts.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 19 lines checked -0004-Staging-batman-adv-replace-manual-calculation-by-mse.patch has no obvious style problems and is ready for submission. +0004-batman-adv-replace-manual-calculation-by-mse.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 14 lines checked -0005-Staging-batman-adv-Add-sysfs-abi-documentation-about.patch has no obvious style problems and is ready for submission. +0005-batman-adv-Add-sysfs-abi-documentation-about.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 8 lines checked -0006-Staging-batman-adv-adapting-source-version-to-revise.patch has no obvious style problems and is ready for submission. +0006-batman-adv-adapting-source-version-to-revise.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 239 lines checked -0007-Staging-batman-adv-Add-include-guards-to-all-header-.patch has no obvious style problems and is ready for submission. +0007-batman-adv-Add-include-guards-to-all-header-.patch has no obvious style problems and is ready for submission. }}} == submit patches == @@ -351,13 +351,13 @@ GIT: for the patch you are writing. GIT: GIT: Clear the body content if you don't wish to send a summary. From: Sven Eckelmann <sven.eckelmann(a)gmx.de> -Subject: Staging: batman-adv for 2.6.36 (3) +Subject: batman-adv for 2.6.36 (3) In-Reply-To: Hi, here are patches targeted for 2.6.36. All patches needed for that patchset are -already part of your staging-next tree. +already part of your net-next tree. All patches are cleanup patches and no new feature is added. @@ -365,48 +365,48 @@ thanks, Sven Antonio Quartulli (1): - Staging: batman-adv: Convert names from Java to C style + batman-adv: Convert names from Java to C style Linus Lüssing (1): - Staging: batman-adv: Avoid rounding issues for local hna timeout + batman-adv: Avoid rounding issues for local hna timeout Marek Lindner (4): - Staging: batman-adv: replace manual calculation by msecs_to_jiffies() for better readability - Staging: batman-adv: Add sysfs abi documentation about bonding - Staging: batman-adv: adapting source version to revised versioning scheme - Staging: batman-adv: fix early debugfs deinitialization + batman-adv: replace manual calculation by msecs_to_jiffies() for better readability + batman-adv: Add sysfs abi documentation about bonding + batman-adv: adapting source version to revised versioning scheme + batman-adv: fix early debugfs deinitialization Simon Wunderlich (1): - Staging: batman-adv: Lower resolution for timeouts + batman-adv: Lower resolution for timeouts Sven Eckelmann (1): - Staging: batman-adv: Add include guards to all header files - - drivers/staging/batman-adv/aggregation.h | 5 +++++ - drivers/staging/batman-adv/bat_debugfs.h | 6 +++--- - drivers/staging/batman-adv/bat_sysfs.h | 6 +++--- - drivers/staging/batman-adv/bitarray.h | 4 ++++ - drivers/staging/batman-adv/hard-interface.h | 5 +++++ - drivers/staging/batman-adv/hash.h | 8 +++++--- - drivers/staging/batman-adv/icmp_socket.h | 5 +++++ - drivers/staging/batman-adv/main.c | 4 ++-- - drivers/staging/batman-adv/main.h | 13 +++++++++---- - drivers/staging/batman-adv/originator.c | 6 ++---- - drivers/staging/batman-adv/originator.h | 5 +++++ - drivers/staging/batman-adv/packet.h | 5 +++++ - drivers/staging/batman-adv/ring_buffer.h | 5 +++++ - drivers/staging/batman-adv/routing.c | 6 +++--- - drivers/staging/batman-adv/routing.h | 5 +++++ - drivers/staging/batman-adv/send.c | 14 +++++++------- - drivers/staging/batman-adv/send.h | 5 +++++ - drivers/staging/batman-adv/soft-interface.c | 6 +++--- - drivers/staging/batman-adv/soft-interface.h | 7 ++++++- - drivers/staging/batman-adv/sysfs-class-net-mesh | 8 ++++++++ - drivers/staging/batman-adv/translation-table.c | 3 +-- - drivers/staging/batman-adv/translation-table.h | 5 +++++ - drivers/staging/batman-adv/types.h | 6 +++--- - drivers/staging/batman-adv/vis.c | 14 +++++++------- - drivers/staging/batman-adv/vis.h | 7 ++++++- + batman-adv: Add include guards to all header files + + net/batman-adv/aggregation.h | 5 +++++ + net/batman-adv/bat_debugfs.h | 6 +++--- + net/batman-adv/bat_sysfs.h | 6 +++--- + net/batman-adv/bitarray.h | 4 ++++ + net/batman-adv/hard-interface.h | 5 +++++ + net/batman-adv/hash.h | 8 +++++--- + net/batman-adv/icmp_socket.h | 5 +++++ + net/batman-adv/main.c | 4 ++-- + net/batman-adv/main.h | 13 +++++++++---- + net/batman-adv/originator.c | 6 ++---- + net/batman-adv/originator.h | 5 +++++ + net/batman-adv/packet.h | 5 +++++ + net/batman-adv/ring_buffer.h | 5 +++++ + net/batman-adv/routing.c | 6 +++--- + net/batman-adv/routing.h | 5 +++++ + net/batman-adv/send.c | 14 +++++++------- + net/batman-adv/send.h | 5 +++++ + net/batman-adv/soft-interface.c | 6 +++--- + net/batman-adv/soft-interface.h | 7 ++++++- + net/batman-adv/sysfs-class-net-mesh | 8 ++++++++ + net/batman-adv/translation-table.c | 3 +-- + net/batman-adv/translation-table.h | 5 +++++ + net/batman-adv/types.h | 6 +++--- + net/batman-adv/vis.c | 14 +++++++------- + net/batman-adv/vis.h | 7 ++++++- 25 files changed, 117 insertions(+), 46 deletions(-)

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/LinuxNextTracking (386403dd)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

1 0

[doc] backup-redmine/2017-07-13, master: doc: attachments/new_dist_neigh.png (60f58822)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit 60f5882213abf4f6e146ba7cd4daf9bb8369416e Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Dec 13 14:57:22 2010 +0000 doc: attachments/new_dist_neigh.png >--------------------------------------------------------------- 60f5882213abf4f6e146ba7cd4daf9bb8369416e attachments/new_dist_neigh.png | Bin 0 -> 37857 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/attachments/new_dist_neigh.png b/attachments/new_dist_neigh.png new file mode 100644 index 00000000..47401097 Binary files /dev/null and b/attachments/new_dist_neigh.png differ

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits July 2017