commits July 2017

commits@lists.open-mesh.org

1 participants
1317 discussions

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/Download: update for 2011.2.0 (6d828e22)
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 6d828e22d44aa67412e232c095b543b8a149ef46 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Sun Jun 19 21:22:35 2011 +0000 doc: open-mesh/Download: update for 2011.2.0 >--------------------------------------------------------------- 6d828e22d44aa67412e232c095b543b8a149ef46 open-mesh/Download.textile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/open-mesh/Download.textile b/open-mesh/Download.textile index 1c729dfb..77a6ca0c 100644 --- a/open-mesh/Download.textile +++ b/open-mesh/Download.textile @@ -7,8 +7,8 @@ Please use the maint branch for your public infrastructure unless you know exact h2. Download Released Source Code -* The latest version of [[batman-adv:Wiki|batman-adv]] is "batman-adv-2011.1.0.tar.gz":http://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2011.1.0.tar.gz "md5":http://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2011.1.0.tar.gz.md5 "sha1":http://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2011.1.0.tar.gz.sha1 "asc":http://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2011.1.0.tar.gz.asc -* The latest version of batctl (management and control tool for batman-adv) is "batctl-2011.1.0.tar.gz":http://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2011.1.0.tar.gz "md5":http://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2011.1.0.tar.gz.md5 "sha1":http://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2011.1.0.tar.gz.sha1 "asc":http://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2011.1.0.tar.gz.asc +* The latest version of [[batman-adv:Wiki|batman-adv]] is "batman-adv-2011.2.0.tar.gz":http://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2011.2.0.tar.gz "md5":http://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2011.2.0.tar.gz.md5 "sha1":http://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2011.2.0.tar.gz.sha1 "asc":http://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2011.2.0.tar.gz.asc +* The latest version of batctl (management and control tool for batman-adv) is "batctl-2011.2.0.tar.gz":http://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2011.2.0.tar.gz "md5":http://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2011.2.0.tar.gz.md5 "sha1":http://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2011.2.0.tar.gz.sha1 "asc":http://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2011.2.0.tar.gz.asc * The latest stable version of batmand is "batman-0.3.2.tar.gz":http://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.tar.gz "md5":http://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.tar.gz.md5 "sha1":http://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.tar.gz.sha1 "asc":http://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.tar.gz.asc * The latest version of the vis server for the batmand (package not needed for batman-adv) is "vis-0.3.2.tar.gz":http://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.gz "md5":http://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.gz.md5 "sha1":http://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.gz.sha1 "asc":http://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.gz.asc @@ -37,7 +37,7 @@ It follows an overview of linux versions and the batman-adv version they contain * linux 2.6.37 => batman-adv 2010.2.0 (get batctl 2010.2.0 from "here":http://downloads.open-mesh.org/batman/stable/sources/batctl/) * linux 2.6.38 => batman-adv 2011.0.0 (get batctl 2011.0.0 from "here":http://downloads.open-mesh.org/batman/stable/sources/batctl/) * linux 2.6.39 => batman-adv 2011.1.0 (get batctl 2011.1.0 from "here":http://downloads.open-mesh.org/batman/stable/sources/batctl/) - +* linux 3.0 => batman-adv 2011.2.0 (get batctl 2011.2.0 from "here":http://downloads.open-mesh.org/batman/stable/sources/batctl/) h2. Debian

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/Release-todo (1f5b7530)
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 1f5b753010afbfc641056a403340d0f693cfc643 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Sun Jun 19 21:23:10 2011 +0000 doc: batman-adv/Release-todo >--------------------------------------------------------------- 1f5b753010afbfc641056a403340d0f693cfc643 batman-adv/Release-todo.textile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/batman-adv/Release-todo.textile b/batman-adv/Release-todo.textile index 86157c22..941b262e 100644 --- a/batman-adv/Release-todo.textile +++ b/batman-adv/Release-todo.textile @@ -33,11 +33,11 @@ h2. Documentation h2. Release -* [ ] build package tar.gz and generate checksums -* [ ] move packages/checksums to stable/sources / create symlinks from releases -* [ ] update download links in the redmine downloads page +* [x] build package tar.gz and generate checksums +* [x] move packages/checksums to stable/sources / create symlinks from releases +* [x] update download links in the redmine downloads page * [ ] send release mail -* [ ] update IRC channel topic +* [x] update IRC channel topic h2. Distributions

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/SubmittingLinux (61613d0b)
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 61613d0b6e70e5989fedb9a9e0100092a8063955 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jun 21 13:10:45 2011 +0000 doc: batman-adv/SubmittingLinux >--------------------------------------------------------------- 61613d0b6e70e5989fedb9a9e0100092a8063955 batman-adv/SubmittingLinux.textile | 389 ------------------------------------- 1 file changed, 389 deletions(-) diff --git a/batman-adv/SubmittingLinux.textile b/batman-adv/SubmittingLinux.textile index d98a0660..a18b32f0 100644 --- a/batman-adv/SubmittingLinux.textile +++ b/batman-adv/SubmittingLinux.textile @@ -1,392 +1,3 @@ -h1. Submitting Patches to Linux - - -We currently submit patches for Linux from our next branch. I try to give a short overview about it using some patches submitted to DaveM. - -Following steps must always be done: -* get the linux-integration repository (we assume that the linux branch is up to date) -* get the newest patches from next -* merge next into linux -* check for compat code -* check difference with next -* rebase on top of previous version -* squash/cleanup patches -* 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 "batman-adv: " before each commit subject -* get current version of linux-next -* create working branch on linux-next -* apply all patches on linux next -* check if all patches build again with linux next -* check if all patches are checkpatch.pl clean -* submit patches - - - -h2. get the linux-integration repository - - -<pre> -'-(%25)-> git clone git+ssh://git@open-mesh.org/srv/git/ecsv/linux-merge.git -Initialized empty Git repository in /home/sven/tmp/linux-merge/.git/ -remote: Counting objects: 1544059, done. -remote: Compressing objects: 100%25 (252781/252781), done. -.... -'-(%25)-> cd linux-merge -</pre> - - -h2. get the newest patches from next - - -<pre> -'-(%25)-(merge/master)> git remote update -Fetching origin -remote: Counting objects: 1387, done. -remote: Compressing objects: 100%25 (211/211), done. -remote: Total 823 (delta 651), reused 762 (delta 602) -Receiving objects: 100%25 (823/823), 136.90 KiB | 254 KiB/s, done. -Resolving deltas: 100%25 (651/651), completed with 228 local objects. -From git+ssh://open-mesh.org/srv/git/ecsv/linux-merge - bfa88ea..151b6a5 master -> origin/master - c9f7cbe..078eb6a next -> origin/next -</pre> - - -h2. merge next into linux - - -<pre> -'-(%25)-(xyz)> git checkout merge/master -Checking out files: 100%25 (32337/32337), done. -Switched to branch 'linux' -'-(%25)-(merge/master)> git merge -s subtree origin/standalone/next -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)-(merge/master)> 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)-(merge/master)> vim net/batman-adv/Makefile -'-(%25)-(merge/master)> git add net/batman-adv/Makefile -'-(%25)-(merge/master)> git commit -[linux f2204f0] Merge remote branch 'origin/standalone/next' into merge/master -</pre> - - -h2. check for compat code - - -<pre> -git grep compat.h net/batman-adv/ -net/batman-adv/CHANGELOG:* all kernel version compatibility functions has been moved to compat.h -</pre> - - -h2. check difference with next - - -<pre> -git diff origin/standalone/next: merge/master:net/batman-adv/ -</pre> - -Here you should see the -* Removed CHANGELOG -* new added Kconfig -* A special Makefile which only contains obj-m and a batman-adv-objs line -* removed Makefile.kbuild, README, compat.c, compat.h -* removed references to compat.h from main.h -* (Re)Moved sysfs-class-net-batman-adv and sysfs-class-net-mesh - - - -h2. rebase on top of previous tag - - -<pre> -'-(%25)-(merge/master)> git checkout -b patches -'-(%25)-(patches)> git rebase -s subtree origin/merge/master -First, rewinding head to replay your work on top of it... -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 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 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 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] 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 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 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 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): 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 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 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 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. -'-(%25)-(patches)> git diff merge/master -</pre> - -The last diff must be empty or we did something wrong. - - -h2. squash/cleanup patches - - -<pre> -'-(%25)-(patches)> git rebase -i origin/merge/master -Successfully rebased and updated refs/heads/patches -</pre> - - -h2. check if all versions compile cleanly against a current version of linux-next and sparse (cgcc) - - -<pre> -'-(%25)-(patches)> git rev-list --reverse origin/merge/master.. -166b2caa61fce5260aed4e119671764331fdc62a -5cd65234b12021fe1f28e28e455a6b6a06712ec2 -83d1bc8bb328bcfa42be492fe0e2648b77c18af2 -9e9605f0fe000f1097cb43271540ab2b76b2a782 -043aa9a54a5296c6027a5bcd808b8d29cea8a474 -f6d8baba5fce6161bc2cee9c97e0afbc139942c0 -a85d1b45e4cde0c882a41baaefeec0cd5502416f -'-(%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 -'-(%25)-(166b2caa61fce5260aed4e119671764331fdc62a)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` -... -'-(%25)-(166b2caa61fce5260aed4e119671764331fdc62a)> git checkout 5cd65234b12021fe1f28e28e455a6b6a06712ec2 -Previous HEAD position was 166b2ca... batman-adv: Convert names from Java to C style -HEAD is now at 5cd6523... batman-adv: Avoid rounding issues for local hna timeout -'-(%25)-(83d1bc8bb328bcfa42be492fe0e2648b77c18af2)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` -.... -'-(%25)-(83d1bc8bb328bcfa42be492fe0e2648b77c18af2)> git checkout 9e9605f0fe000f1097cb43271540ab2b76b2a782 -Previous HEAD position was 83d1bc8... batman-adv: Lower resolution for timeouts -HEAD is now at 9e9605f... batman-adv: replace manual calculation by msecs_to_jiffies() for better readability -'-(%25)-(9e9605f0fe000f1097cb43271540ab2b76b2a782)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` -.... -'-(%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... 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... 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` -... -'-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> git checkout a85d1b45e4cde0c882a41baaefeec0cd5502416f -Previous HEAD position was f6d8bab... batman-adv: adapting source version to revised versioning scheme -HEAD is now at a85d1b4... batman-adv: Add include guards to all header files -'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` -... -'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> git checkout patches -Switched to branch 'patches' -'-(%25)-(patches)> cd ../../../ -</pre> - - -h2. format patches - - -<pre> -'-(%25)-(patches)> git format-patch --patience -s -M origin/merge/master -0001-batman-adv-Convert-names-from-Java-to-C-style.patch -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-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 -</pre> - -Usually I add "batman-adv: " right when checking the signed-off-by and author (from) line. - - -h2. apply all patches on linux next - - -<pre> -'-(%25)-(patches)> cd ../linux-next -'-(%25)-(master)> git remote update -'-(%25)-(master)> git reset --hard origin/master -HEAD is now at c3116ae Add linux-next specific files for 20100625 -'-(%25)-(master)> git checkout -b davem -Switched to a new branch 'davem' -'-(%25)-(davem)> git am -3 ../linux-merge/00*.patch -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 -</pre> - - -h2. check if all patches build again with linux next - - -<pre> -'-(%25)-(davem)> make -.... -</pre> - - -h2. format patches on top of linux-next master - - -<pre> -'-(%25)-(davem)> git format-patch -s --patience -M master -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)-(davem)> ./scripts/checkpatch.pl --strict 00*.patch -total: 0 errors, 0 warnings, 0 checks, 135 lines checked - -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-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-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-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-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-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-batman-adv-Add-include-guards-to-all-header-.patch has no obvious style problems and is ready for submission. -</pre> - - -h2. submit patches - - -<pre> -'-(%25)-(davem)> ../linux-merge/ -'-(%25)-(patches)> git checkout batman-adv/next -'-(%25)-(batman-adv/next)> git rev-parse batman-adv/next -12513b76a021e5b41a9d5d5981da75dfd6480890 -'-(%25)-(batman-adv/next)> git am -3 00*.patch -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 -'-(%25)-(batman-adv/next)> git diff merge/master -- net/batman-adv/ -'-(%25)-(batman-adv/next)> git push -'-(%25)-(batman-adv/next)> git request-pull 12513b76a021e5b41a9d5d5981da75dfd6480890 git://git.open-mesh.org/ecsv/linux-merge.git > shortlog -'-(%25)-(batman-adv/next)> git send-email --compose --to=davem(a)davemloft.net --cc=netdev(a)vger.kernel.org --cc=b.a.t.m.a.n(a)lists.open-mesh.org 00*.patch -</pre> - -Now I will write something like - -<pre> -From Sven Eckelmann <sven(a)narfation.org> # This line is ignored. -GIT: Lines beginning in "GIT:" will be removed. -GIT: Consider including an overall diffstat or table of contents -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(a)narfation.org> -Subject: pull request: batman-adv 2010-06-26 -In-Reply-To: - -Hi, - -I would like tp propose following corrections for net-next-2.6. - -The following changes since commit 12513b76a021e5b41a9d5d5981da75dfd6480890: - - Staging: dt3155: remove unused 32-bit and 8-bit global registers (2010-06-25 11:18:34 -0700) - -are available in the git repository at: - git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/next - Antonio Quartulli (1): batman-adv: Convert names from Java to C style

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/WikiStart (1ba16399)
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 1ba16399555c9a3d89517b5d24ebb7aeddb11eba Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Jun 19 22:53:30 2011 +0000 doc: open-mesh/WikiStart >--------------------------------------------------------------- 1ba16399555c9a3d89517b5d24ebb7aeddb11eba open-mesh/WikiStart.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-mesh/WikiStart.textile b/open-mesh/WikiStart.textile index ffbcac83..d0c90a88 100644 --- a/open-mesh/WikiStart.textile +++ b/open-mesh/WikiStart.textile @@ -10,7 +10,7 @@ B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is a routing protocol h2. News -* *19.Apr. 2011* [[2011-06-19-batman-adv-2011-2-0-release|Batman-adv 2011.2.0 released]] +* *19.Jun. 2011* [[2011-06-19-batman-adv-2011-2-0-release|Batman-adv 2011.2.0 released]] * *19.Apr. 2011* [[2011-04-18-batman-adv-2011-1-0-release|Batman-adv 2011.1.0 released]] * *30.Mar. 2011* [[2011-03-30-GSoC-announcement|B.A.T.M.A.N. @Google Summer of Code 2011]] * *27.Mar. 2011* [[2011-03-27-transition-to-git|Transition to git]]

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/SubmittingLinux (4175b274)
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 4175b274224dd73a153bd7d6edd082bf7af0bbaf Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jun 21 13:11:42 2011 +0000 doc: batman-adv/SubmittingLinux >--------------------------------------------------------------- 4175b274224dd73a153bd7d6edd082bf7af0bbaf batman-adv/SubmittingLinux.textile | 389 +++++++++++++++++++++++++++++++++++++ 1 file changed, 389 insertions(+) diff --git a/batman-adv/SubmittingLinux.textile b/batman-adv/SubmittingLinux.textile index a18b32f0..0b1001e0 100644 --- a/batman-adv/SubmittingLinux.textile +++ b/batman-adv/SubmittingLinux.textile @@ -1,3 +1,392 @@ +h1. Submitting Patches to Linux + + +We currently submit patches for Linux from our next branch. I try to give a short overview about it using some patches submitted to DaveM. + +Following steps must always be done: +* get the linux-integration repository (we assume that the linux branch is up to date) +* get the newest patches from next +* merge next into linux +* check for compat code +* check difference with next +* rebase on top of previous version +* squash/cleanup patches +* 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 "batman-adv: " before each commit subject +* get current version of linux-next +* create working branch on linux-next +* apply all patches on linux next +* check if all patches build again with linux next +* check if all patches are checkpatch.pl clean +* submit patches + + + +h2. get the linux-integration repository + + +<pre> +'-(%25)-> git clone git+ssh://git@open-mesh.org/srv/git/marek/linux-merge.git +Initialized empty Git repository in /home/sven/tmp/linux-merge/.git/ +remote: Counting objects: 1544059, done. +remote: Compressing objects: 100%25 (252781/252781), done. +.... +'-(%25)-> cd linux-merge +</pre> + + +h2. get the newest patches from next + + +<pre> +'-(%25)-(merge/master)> git remote update +Fetching origin +remote: Counting objects: 1387, done. +remote: Compressing objects: 100%25 (211/211), done. +remote: Total 823 (delta 651), reused 762 (delta 602) +Receiving objects: 100%25 (823/823), 136.90 KiB | 254 KiB/s, done. +Resolving deltas: 100%25 (651/651), completed with 228 local objects. +From git+ssh://open-mesh.org/srv/git/marek/linux-merge + bfa88ea..151b6a5 master -> origin/master + c9f7cbe..078eb6a next -> origin/next +</pre> + + +h2. merge next into linux + + +<pre> +'-(%25)-(xyz)> git checkout merge/master +Checking out files: 100%25 (32337/32337), done. +Switched to branch 'linux' +'-(%25)-(merge/master)> git merge -s subtree origin/standalone/next +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)-(merge/master)> 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)-(merge/master)> vim net/batman-adv/Makefile +'-(%25)-(merge/master)> git add net/batman-adv/Makefile +'-(%25)-(merge/master)> git commit +[linux f2204f0] Merge remote branch 'origin/standalone/next' into merge/master +</pre> + + +h2. check for compat code + + +<pre> +git grep compat.h net/batman-adv/ +net/batman-adv/CHANGELOG:* all kernel version compatibility functions has been moved to compat.h +</pre> + + +h2. check difference with next + + +<pre> +git diff origin/standalone/next: origin/merge/master:net/batman-adv/ +</pre> + +Here you should see the +* Removed CHANGELOG +* new added Kconfig +* A special Makefile which only contains obj-m and a batman-adv-objs line +* removed Makefile.kbuild, README, compat.c, compat.h +* removed references to compat.h from main.h +* (Re)Moved sysfs-class-net-batman-adv and sysfs-class-net-mesh + + + +h2. rebase on top of previous tag + + +<pre> +'-(%25)-(merge/master)> git checkout -b patches +'-(%25)-(patches)> git rebase -s subtree origin/merge/master +First, rewinding head to replay your work on top of it... +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 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 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 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] 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 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 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 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): 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 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 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 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. +'-(%25)-(patches)> git diff merge/master +</pre> + +The last diff must be empty or we did something wrong. + + +h2. squash/cleanup patches + + +<pre> +'-(%25)-(patches)> git rebase -i origin/merge/master +Successfully rebased and updated refs/heads/patches +</pre> + + +h2. check if all versions compile cleanly against a current version of linux-next and sparse (cgcc) + + +<pre> +'-(%25)-(patches)> git rev-list --reverse origin/merge/master.. +166b2caa61fce5260aed4e119671764331fdc62a +5cd65234b12021fe1f28e28e455a6b6a06712ec2 +83d1bc8bb328bcfa42be492fe0e2648b77c18af2 +9e9605f0fe000f1097cb43271540ab2b76b2a782 +043aa9a54a5296c6027a5bcd808b8d29cea8a474 +f6d8baba5fce6161bc2cee9c97e0afbc139942c0 +a85d1b45e4cde0c882a41baaefeec0cd5502416f +'-(%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 +'-(%25)-(166b2caa61fce5260aed4e119671764331fdc62a)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` +... +'-(%25)-(166b2caa61fce5260aed4e119671764331fdc62a)> git checkout 5cd65234b12021fe1f28e28e455a6b6a06712ec2 +Previous HEAD position was 166b2ca... batman-adv: Convert names from Java to C style +HEAD is now at 5cd6523... batman-adv: Avoid rounding issues for local hna timeout +'-(%25)-(83d1bc8bb328bcfa42be492fe0e2648b77c18af2)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` +.... +'-(%25)-(83d1bc8bb328bcfa42be492fe0e2648b77c18af2)> git checkout 9e9605f0fe000f1097cb43271540ab2b76b2a782 +Previous HEAD position was 83d1bc8... batman-adv: Lower resolution for timeouts +HEAD is now at 9e9605f... batman-adv: replace manual calculation by msecs_to_jiffies() for better readability +'-(%25)-(9e9605f0fe000f1097cb43271540ab2b76b2a782)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` +.... +'-(%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... 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... 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` +... +'-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> git checkout a85d1b45e4cde0c882a41baaefeec0cd5502416f +Previous HEAD position was f6d8bab... batman-adv: adapting source version to revised versioning scheme +HEAD is now at a85d1b4... batman-adv: Add include guards to all header files +'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` +... +'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> git checkout patches +Switched to branch 'patches' +'-(%25)-(patches)> cd ../../../ +</pre> + + +h2. format patches + + +<pre> +'-(%25)-(patches)> git format-patch --patience -s -M origin/merge/master +0001-batman-adv-Convert-names-from-Java-to-C-style.patch +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-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 +</pre> + +Usually I add "batman-adv: " right when checking the signed-off-by and author (from) line. + + +h2. apply all patches on linux next + + +<pre> +'-(%25)-(patches)> cd ../linux-next +'-(%25)-(master)> git remote update +'-(%25)-(master)> git reset --hard origin/master +HEAD is now at c3116ae Add linux-next specific files for 20100625 +'-(%25)-(master)> git checkout -b davem +Switched to a new branch 'davem' +'-(%25)-(davem)> git am -3 ../linux-merge/00*.patch +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 +</pre> + + +h2. check if all patches build again with linux next + + +<pre> +'-(%25)-(davem)> make +.... +</pre> + + +h2. format patches on top of linux-next master + + +<pre> +'-(%25)-(davem)> git format-patch -s --patience -M master +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)-(davem)> ./scripts/checkpatch.pl --strict 00*.patch +total: 0 errors, 0 warnings, 0 checks, 135 lines checked + +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-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-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-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-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-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-batman-adv-Add-include-guards-to-all-header-.patch has no obvious style problems and is ready for submission. +</pre> + + +h2. submit patches + + +<pre> +'-(%25)-(davem)> ../linux-merge/ +'-(%25)-(patches)> git checkout batman-adv/next +'-(%25)-(batman-adv/next)> git rev-parse batman-adv/next +12513b76a021e5b41a9d5d5981da75dfd6480890 +'-(%25)-(batman-adv/next)> git am -3 00*.patch +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 +'-(%25)-(batman-adv/next)> git diff merge/master -- net/batman-adv/ +'-(%25)-(batman-adv/next)> git push +'-(%25)-(batman-adv/next)> git request-pull 12513b76a021e5b41a9d5d5981da75dfd6480890 git://git.open-mesh.org/marek/linux-merge.git > shortlog +'-(%25)-(batman-adv/next)> git send-email --compose --to=davem(a)davemloft.net --cc=netdev(a)vger.kernel.org --cc=b.a.t.m.a.n(a)lists.open-mesh.org 00*.patch +</pre> + +Now I will write something like + +<pre> +From Sven Eckelmann <sven(a)narfation.org> # This line is ignored. +GIT: Lines beginning in "GIT:" will be removed. +GIT: Consider including an overall diffstat or table of contents +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(a)narfation.org> +Subject: pull request: batman-adv 2010-06-26 +In-Reply-To: + +Hi, + +I would like tp propose following corrections for net-next-2.6. + +The following changes since commit 12513b76a021e5b41a9d5d5981da75dfd6480890: + + Staging: dt3155: remove unused 32-bit and 8-bit global registers (2010-06-25 11:18:34 -0700) + +are available in the git repository at: + git://git.open-mesh.org/marek/linux-merge.git batman-adv/next + Antonio Quartulli (1): batman-adv: Convert names from Java to C style

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/Bridge-loop-avoidance-II (d78152a7)
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 d78152a7d27628e2280f66a882d6e15ea8f0cdc5 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Wed Jun 8 23:26:28 2011 +0000 doc: batman-adv/Bridge-loop-avoidance-II >--------------------------------------------------------------- d78152a7d27628e2280f66a882d6e15ea8f0cdc5 batman-adv/Bridge-loop-avoidance-II.textile | 144 ++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/batman-adv/Bridge-loop-avoidance-II.textile b/batman-adv/Bridge-loop-avoidance-II.textile new file mode 100644 index 00000000..a74bded2 --- /dev/null +++ b/batman-adv/Bridge-loop-avoidance-II.textile @@ -0,0 +1,144 @@ +h1. Bridge loop avoidance II + +This page contains a concept in progress, it is not implemented yet, but feel free to discuss it. + +h2. Goals: + + * Should be able to scale + * Communication between meshnodes and LAN should be via the best gateway + * Minimize Broadcast Traffic in the LAN + * Roaming should still be possible + +h2. Definitions: + + + * Gateway: A mesh node which is conncted to both a mesh and a LAN + * Client: A non-mesh network participant which is sending data via the mesh. The Client is always identified by the Source MAC address of the payload Ethernet header. + +h2. Key Concepts: + +h3. Claims: + +Only one gateway (out of possibly many gateways) should serve a client from the mesh for the LAN. This is announced by sending "claim packets" on the soft-interface bat0. A "claim packet" contains a list of MAC addresses the gateway feels responsible for. Each gateway will save the claim list of other gateways. By doing this, it can: + + * see which clients are already tracked (claimed) + * see which other gateways exist in the LAN + +Note that gateways may overwrite a claim of another gateway by simply claiming the same client. In this case, the newest claim wins, and local databases are updated accordingly. + +Gateways can also "unclaim" their own clients. After doing this, the client is not claimed anymore for this LAN. + +h3. Duplicate list: + +To track duplicate Ethernet frames without meta information (like sequence numbers, etc), broadcast packets are checksummed. A node keeps a list of the last N checksums of frames. A new frame can be matched by checksumming it and check for matches in the list. + +Two different duplicate lists are kept in the concept: + + * mesh duplicate list: This list is kept for every gateway mesh node which is connected to a LAN with multiple gateways. It checks broadcast packets which are sent from the LAN into the mesh through multiple gateways (and thus multiple times). + * LAN duplicate list: This is a single list. It tracks broadcast packets which were sent from the mesh through the soft interface into the LAN. + +h2. Details and Cases: + +The concept will be explained by discussing the different cases: unicast and broadcast frames, both for the LAN->mesh and mesh->LAN case. Loop cases are considered too: LAN->mesh->LAN +and mesh->LAN->mesh. Furthermore, roaming is discussed when a client changes from the LAN to another mesh node and back. + +h3. Broadcast, mesh->LAN: + +If the originator of the broadcast is another gateway from the same LAN, drop it immediately. + +If a gateway has already claimed the client, only the resposible gateway will deliver the frame to the bridge. Other gateways will discard the packet. + +If no gateway has claimed the client, the gateway(s) will race for the claim: + + * check if a claim is present (we assumed there is none) + * wait for a short, random time + * check again if any other gateway has claimed in the meantime. If yes, drop it. + * send a claim packet including the new client + * deliver the Broadcast frame to the soft-interface + +The random backoff is used to avoid the race conditions when the packet is delivered from the mesh by multiple gateways at the same time. + +For every broadcast frame delivered into the LAN, add an entry in the LAN duplicate list. This is used for loop detection and roaming. + +h3. Unicast, mesh->LAN: + +If the client is not claimed by the gateway receiving the unicast, a claim packet is sent out first. This gateway is now the (new) responsible gateway for this client. + +Then, the unicast packet is delivered to the soft interface. + +h3. Broadcast, LAN->mesh: + +If the client is claimed, all not responsible gateways should discard the frame - this might be a loop. The responsible gateway shall check its LAN duplicate list - if the frame matches, it is a frame he sent out by himself (and received due to bad drivers or stupid switches). In this case, discard it. If the packet does not match, it might be sent from a client which just roamed into our LAN. In this case, "unclaim" this client by sending an according claim packet, and forward the packet into the mesh. + +If the client is not claimed by any gateway, every gateway shall forward the packet into the mesh. This will lead to duplicates of the broadcast with different meta information (different originators, different sequence numbers). To avoid duplicates within the mesh, every mesh node will use the "mesh duplicate list": + + * after the (old) seqno window check: match the frame to the "mesh duplicate list" of other gateways to see if another gateway from the same LAN has sent a broadcast with the same payload checksum. + * if true, drop the packet. Otherwise, add the checksum to the entries and re-forward it. + +(Note that it might be neccesary to connect the checksums to sequence numbers to allow intentionally sent duplicate payload broadcasts) + +h3. Unicast, LAN->mesh: + +Nothing fancy should happen here, as a switch should do the right thing. If the client is not claimed, the frame is simply sent into the mesh. + +However, when using hubs (or broken switches), also unicast packets might loop. Therefore, if the client is claimed by any gateway, drop it. + +h3. mesh->LAN->mesh loop: + +A broadcast frame is only sent to LAN by the (yet to be) responsible gateway. Back from the LAN to the mesh, all not responsible gateway will drop the frame. The responsible gateway will also drop it as the packet is matched in the "LAN duplicate list". + +To avoid loops for hubs, unicast packets are dropped from LAN to mesh if the client is claimed. + +h3. LAN->mesh->LAN loop: + +Although a broadcast frame is sent into the mesh from different originators, it won't loop back into the LAN as a gateway will drop it if was sent from another gateway (from the same LAN). + +h3. LAN->mesh Roaming: + +This is the easy case: Sooner or later, a claim will be added for the roamed client. + +h3. mesh->LAN Roaming: + +We assume that the client was already claimed by a gateway before, otherwise there is nothing to consider. + +When a broadcast frame is sent, the responsible gateway can detect the roam: The frames checksum should not be in the "LAN duplicate list", as the frame is new and has not been sent by this gateway. The client will therefore be unclaimed. This first broadcast will only be broadcasted by the (previously) responsible gateway into the mesh, later broadcasts will be sent by all gateways again. + +Unicast frames are dropped, and the clients roaming will not be known as long as no broadcast frame is sent. This is a limitation. :( + +h3. Gateway selection: + +The gateways should announce the other gateways from their LAN, e.g. within TT/HNA messages. + +Other non-gateway meshnodes may then select their best gateway to the LAN based on the TQ value. They must also use this information to effectively detect duplicates from the LAN->mesh +case. + +h2. Discussion: + +h3. Features: + + * no single "super" gateway => should scale better + * the only additional BATMAN LAN packets are claim packets, which are only sent for new claims + * no encupsulated BATMAN packets on the LAN + * broadcasts are sent from all the gateways into the mesh + * nodes can select gateways, and change among them (gateways will automatically re-claiming) + * should not loop ;) + +h3. Limitations: + + * Roaming to the LAN with multiple gateways is slow when only unicast packets are used + * duplicate lists based on checksums may fail due to checksum collisions or out-of-list frames. This may lead to duplicates, loops and other ugly stuff. Therefore, the checksums should be wide and the lists should be long. :) + * quite complex concept + * other things I might have missed ... + +h3. Further ideas (from discussion on 2011-06-08): + + * What to do if a gateway fails? how do we timeout it? - we could change the concept to work like the new TT: regular updates of changes (with a sequence number), only send changes, and request full update if required. The regular update would allow us to timeout gateways if they are no longer there/connected. + * Not included in the concept is how we handle LAN-interconnected, separate mesh clouds. The gateways of the different mesh clouds would claim clients, which would prevent traffic going from mesh 1 to mesh 2. This could be solved by verifying that a gateway is not only accessible via LAN, but also via mesh (looking into the originator table). If they are not in our mesh, we ignore the claims. + * Instead of using the "mesh duplicate list", we could also try to synchronize the broadcast sequence numbers of the gateways, so that broadcasts are always sent with the same originator address + sequence number, appearing as the same broadcast. There may be a lot of side effects to consider (packet loss, racing packets, etc ...) + * some pictures to illustrate the concept would be nice :) + +h3. Agenda/Comments for next discussion + +Please add any comments for the next discussion here: + + * (still empty, please edit! now!) \ No newline at end of file

1 0

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

14 Jul '17

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/ELP (6f2fdbd0)
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 6f2fdbd02d98e25db2361a629c3883b3c2e05c58 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Wed Jun 15 01:46:37 2011 +0000 doc: batman-adv/ELP >--------------------------------------------------------------- 6f2fdbd02d98e25db2361a629c3883b3c2e05c58 batman-adv/ELP.textile | 56 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/batman-adv/ELP.textile b/batman-adv/ELP.textile index 58baa2a2..0778db24 100644 --- a/batman-adv/ELP.textile +++ b/batman-adv/ELP.textile @@ -1,4 +1,4 @@ -h1. Neighborhood Discovery Protocol (NDP) +h1. Echo Location Protocol (ELP) The B.A.T.M.A.N. protocol originally only used a single message type (called OGM) to determine the link qualities to the direct neighbors and spreading these link quality information through the whole mesh. This procedure is summarized on the [[open-mesh:BATMANConcept|BATMAN concept page]] and explained in details in "the RFC draft":http://tools.ietf.org/html/draft-wunderlich-openmesh-manet-routing-00 published in 2008. @@ -6,7 +6,7 @@ This approach was chosen for its simplicity during the protocol design phase and * Wireless interfaces usually come with some packet loss, therefore a higher broadcast rate is desirable to allow a fast reaction on flaky connections. Other interfaces of the same host might be connected to Ethernet LANs / VPNs / etc which rarely exhibit packet loss would benefit from a lower broadcast rate to reduce overhead. * It generally is more desirable to detect local link quality changes at a faster rate than propagating all these changes through the entire mesh (the far end of the mesh does not need to care about local link quality changes that much). Other optimizations strategies, like reducing overhead, might be possible if OGMs weren't used for all tasks in the mesh at the same time. -As a result detecting local link qualities shall be handled by an independent message type, NDP, whereas the OGM message type remains responsible for flooding the mesh with these link quality information and determening the overall path transmit qualities. +As a result detecting local link qualities shall be handled by an independent message type, ELP, whereas the OGM message type remains responsible for flooding the mesh with these link quality information and determening the overall path transmit qualities. h2. Definitions @@ -21,18 +21,18 @@ h2. Definitions h2. Protocol Procedure -h3. Broadcasting own Neighborhood Discovery Protocol (NDP) Messages +h3. Broadcasting own Echo Location Protocol (ELP) Messages -Each node periodically (NDP interval) generates and broadcasts NDP messages for each interface B.A.T.M.A.N. is running on. A jitter may be applied to avoid collisions. +Each node periodically (ELP interval) generates and broadcasts ELP messages for each interface B.A.T.M.A.N. is running on. A jitter may be applied to avoid collisions. -h4. The Neighborhood Discovery Protocol (NDP) Format: +h4. The Echo Location Protocol (ELP) Format: -* Packet type: Initialize this field with the NDP packet type. +* Packet type: Initialize this field with the ELP packet type. * Version: Set your internal compatibility version. * Originator Address: Set this field to the primary MAC address of this B.A.T.M.A.N. node. * Sequence number: On first broadcast set the sequence number to an arbitrary value and increment the field by one for each following broadcast. -* Interval: Set to the current NDP interval of this interface. +* Interval: Set to the current ELP interval of this interface. * Num Neigh: The number of neighbors that are announced with this message. If this B.A.T.M.A.N. interface wants to announce neighboring nodes it should append a neighbor entry message for each neighbor to be announced and fill the "number of neighbors" field accordingly. @@ -70,38 +70,38 @@ Note: See 'Neighbor Ranking' and 'Time-based Window Adjustment' to get a detaile +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ </code></pre> -h4. NDP minimum packet size / padding +h4. ELP minimum packet size / padding -An NDP packet should be padded to at least 300 Bytes (excluding ethernet frame header) and may be padded to up to 1500 Bytes. Especially on wireless interfaces the packet size of broadcast packets can have quite an impact on the probability of arrival. +An ELP packet should be padded to at least 300 Bytes (excluding ethernet frame header) and may be padded to up to 1500 Bytes. Especially on wireless interfaces the packet size of broadcast packets can have quite an impact on the probability of arrival. -h3. Receiving Neighborhood Discovery Messages (NDP) +h3. Receiving Echo Location Messages (ELP) -Upon receiving an NDP packet a node must perform the following preliminary checks before the packet is further processed: +Upon receiving an ELP packet a node must perform the following preliminary checks before the packet is further processed: -* If the NDP contains a version which is different to the own internal version the message must be silently dropped (thus, it must not be further processed). -* If the sender address of the NDP message is an ethernet multicast (including broadcast) address the message must be silently dropped. -* If the destination address of the NDP message is a unicast address the message must be silently dropped. -* If the originator address of the NDP message is our own the message must be silently dropped as this NDP message originated from this node. -* If the NDP message does not contain a newer sequence number (duplicate, out-of-order or out-of-range) the message must be silently dropped. +* If the ELP contains a version which is different to the own internal version the message must be silently dropped (thus, it must not be further processed). +* If the sender address of the ELP message is an ethernet multicast (including broadcast) address the message must be silently dropped. +* If the destination address of the ELP message is a unicast address the message must be silently dropped. +* If the originator address of the ELP message is our own the message must be silently dropped as this ELP message originated from this node. +* If the ELP message does not contain a newer sequence number (duplicate, out-of-order or out-of-range) the message must be silently dropped. h4. Duplicate -An NDP packet is considered a duplicate if: +An ELP packet is considered a duplicate if: * The last received sequence number is smaller than or equal to the current window sequence number. * The last received sequence number is greater than the current window sequence number minus WINDOW_SIZE. * The received sequence number is equal to the last received sequence number. h4. Out-of-Order -An NDP packet is considered out-of-order if: +An ELP packet is considered out-of-order if: * The last received sequence number is smaller than or equal to the current window sequence number. * The last received sequence number is greater than the current window sequence number minus WINDOW_SIZE. * The received sequence number is smaller than the last received sequence number. h4. Out-of-Range -An NDP packet is considered out-of-range if: +An ELP packet is considered out-of-range if: * The received sequence number is not a duplicate and not out-of-order. * The received sequence number is smaller than the current window sequence number. * The received sequence number is greater than the current window sequence number minus 2^31. @@ -109,23 +109,23 @@ An NDP packet is considered out-of-range if: h3. Neighbor Ranking -For each NDP message having passed the preliminary checks the following actions must be performed: +For each ELP message having passed the preliminary checks the following actions must be performed: * The last seen time of this neighbor interface needs to be updated. * The last updated time of this neighbor interface needs to be updated. -* The ndp interval of this neighbor interface needs to be updated with the ndp interval set in the received NDP message. -* The last received sequence number from this neighbor needs to be set to the sequence number of the received NDP message. -* If the sequence number of the received NDP message is higher than the current window sequence number then: -** The window's current sequence number for this neighbor needs to be set to the sequence number of the received NDP message. -** The sliding window of the NDP message must be shifted (purged) to reflect the new upper and lower boundaries of the ranking range. -* The sequence number of the received NDP message must be added to the sliding window. +* The ndp interval of this neighbor interface needs to be updated with the ndp interval set in the received ELP message. +* The last received sequence number from this neighbor needs to be set to the sequence number of the received ELP message. +* If the sequence number of the received ELP message is higher than the current window sequence number then: +** The window's current sequence number for this neighbor needs to be set to the sequence number of the received ELP message. +** The sliding window of the ELP message must be shifted (purged) to reflect the new upper and lower boundaries of the ranking range. +* The sequence number of the received ELP message must be added to the sliding window. * The new resulting link RQ value is calculated by counting all sequence numbers that are to be found in the recently adjusted sliding window. * The neighbor entries must be parsed until an entry matching the MAC address of the incoming hard-interface has been found. If a match is found then save the received link RQ value as link TQ value towards this neighbor interface and skip the further traversal of the list. If no matching entry was found, set the link TQ value towards that neighbor to 0. h3. Time-based Window Adjustment -At least once per second all NDP windows must be shifted to the expected current sequence number. This needs to be done to avoid that the OGM protocol picks up too high link quality values from NDP which do very likely not represent the current link quality anymore. +At least once per second all ELP windows must be shifted to the expected current sequence number. This needs to be done to avoid that the OGM protocol picks up too high link quality values from ELP which do very likely not represent the current link quality anymore. More precisely, for any interface of a node towards any according, stored neighbor interface check whether: @@ -135,7 +135,7 @@ If so, the following actions must be performed: * The last updated time of this neighbor interface needs to be set to the current time. * The current window sequence number of this neighbor needs to be set to the expected sequence number (= current window sequence number + rounded-down( (current time - last updated time) / neighbor interface's ndp interval). -* The sliding window of the NDP message must be shifted (purged) to reflect the new upper and lower boundaries of the ranking range. +* The sliding window of the ELP message must be shifted (purged) to reflect the new upper and lower boundaries of the ranking range. * The new resulting link RQ value is calculated by counting all sequence numbers that are to be found in the recently adjusted sliding window. h3. Neighbor Interface Purging Recommendations

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/Client-announcement (3d1ff480)
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 3d1ff480338db3f2f301fe5838cc7abd81ae07db Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Thu Jun 9 16:54:34 2011 +0000 doc: batman-adv/Client-announcement >--------------------------------------------------------------- 3d1ff480338db3f2f301fe5838cc7abd81ae07db batman-adv/Client-announcement.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv/Client-announcement.textile b/batman-adv/Client-announcement.textile index 58c43f88..839e8872 100644 --- a/batman-adv/Client-announcement.textile +++ b/batman-adv/Client-announcement.textile @@ -60,7 +60,7 @@ The tt request format: +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ </pre> -The reply to any tt request can either be the changeset of the current ttvn or the full local table. The changeset always is the preferred format to answer the request as it comes with a smaller overhead penalty. In same cases a changeset reply is not possible (e.g. a node just joined the mesh) which makes a full table reply necessary. If the reply contains the changeset of the current ttvn the corresponding change entries (see above) are appended to the reply. If the reply contains the full table the list of MAC addresses is appended to the message. +The reply to any tt request can either be the changeset of the current ttvn or the full local table. The changeset always is the preferred format to answer the request as it comes with a smaller overhead penalty. In same cases a changeset reply is not possible (e.g. a node just joined the mesh) which makes a full table reply necessary. If the reply contains the changeset of the current ttvn the corresponding change entries (see above) are appended to the reply. If the reply contains the full table the entire list of client addresses is appended to the message using the change entry format containing the MAC addresses and corresponding flags. h2. Table request forwarding:

1 0

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

14 Jul '17

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits July 2017