commits February 2018

commits@lists.open-mesh.org

1 participants
28 discussions

[batman-adv] maint: batman-adv: Fix netlink dumping of BLA backbones (29e4759)
by postmaster＠open-mesh.org 26 Feb '18

26 Feb '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 29e4759e49f06014b84791397ebe1b22546edd2d Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Feb 24 12:03:37 2018 +0100 batman-adv: Fix netlink dumping of BLA backbones The function batadv_bla_backbone_dump_bucket must be able to handle non-complete dumps of a single bucket. It tries to do that by saving the latest dumped index in *idx_skip to inform the caller about the current state. But the caller only assumes that buckets were not completely dumped when the return code is non-zero. This function must therefore also return a non-zero index when the dumping of an entry failed. Otherwise the caller will just skip all remaining buckets. And the function must also reset *idx_skip back to zero when it finished a bucket. Otherwise it will skip the same number of entries in the next bucket as the previous one had. Fixes: 7f609cab5123 ("batman-adv: add backbone table netlink support") Reported-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 29e4759e49f06014b84791397ebe1b22546edd2d net/batman-adv/bridge_loop_avoidance.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 60ce119..422ee16 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -2394,22 +2394,25 @@ batadv_bla_backbone_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq, { struct batadv_bla_backbone_gw *backbone_gw; int idx = 0; + int ret = 0; rcu_read_lock(); hlist_for_each_entry_rcu(backbone_gw, head, hash_entry) { if (idx++ < *idx_skip) continue; - if (batadv_bla_backbone_dump_entry(msg, portid, seq, - primary_if, backbone_gw)) { + + ret = batadv_bla_backbone_dump_entry(msg, portid, seq, + primary_if, backbone_gw); + if (ret) { *idx_skip = idx - 1; goto unlock; } } - *idx_skip = idx; + *idx_skip = 0; unlock: rcu_read_unlock(); - return 0; + return ret; } /**

1 0

[batman-adv] maint: batman-adv: Ignore invalid batadv_v_gw during netlink send (12f1d3a)
by postmaster＠open-mesh.org 26 Feb '18

26 Feb '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 12f1d3a6bf4d157928fec509aab981e5243ee438 Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Mon Feb 19 14:08:53 2018 +0100 batman-adv: Ignore invalid batadv_v_gw during netlink send The function batadv_v_gw_dump stops the processing loop when batadv_v_gw_dump_entry returns a non-0 return code. This should only happen when the buffer is full. Otherwise, an empty message may be returned by batadv_gw_dump. This empty message will then stop the netlink dumping of gateway entries. At worst, not a single entry is returned to userspace even when plenty of possible gateways exist. Fixes: 15315a94ad98 ("batman-adv: add B.A.T.M.A.N. V bat_gw_dump implementations") Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 12f1d3a6bf4d157928fec509aab981e5243ee438 net/batman-adv/bat_v.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index e0e2bfc..683bcc5 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -929,7 +929,7 @@ static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, struct batadv_neigh_ifinfo *router_ifinfo = NULL; struct batadv_neigh_node *router; struct batadv_gw_node *curr_gw; - int ret = -EINVAL; + int ret = 0; void *hdr; router = batadv_orig_router_get(gw_node->orig_node, BATADV_IF_DEFAULT);

1 0

[batman-adv] maint: batman-adv: Ignore invalid batadv_iv_gw during netlink send (c58f37c)
by postmaster＠open-mesh.org 26 Feb '18

26 Feb '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit c58f37c248bb4926cda82fd0463b6fecb3d3654f Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Mon Feb 19 14:08:52 2018 +0100 batman-adv: Ignore invalid batadv_iv_gw during netlink send The function batadv_iv_gw_dump stops the processing loop when batadv_iv_gw_dump_entry returns a non-0 return code. This should only happen when the buffer is full. Otherwise, an empty message may be returned by batadv_gw_dump. This empty message will then stop the netlink dumping of gateway entries. At worst, not a single entry is returned to userspace even when plenty of possible gateways exist. Fixes: fa3228924152 ("batman-adv: add B.A.T.M.A.N. IV bat_gw_dump implementations") Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- c58f37c248bb4926cda82fd0463b6fecb3d3654f net/batman-adv/bat_iv_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index bbe8414..3706426 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -2719,7 +2719,7 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, struct batadv_neigh_ifinfo *router_ifinfo = NULL; struct batadv_neigh_node *router; struct batadv_gw_node *curr_gw; - int ret = -EINVAL; + int ret = 0; void *hdr; router = batadv_orig_router_get(gw_node->orig_node, BATADV_IF_DEFAULT);

1 0

[linux-merge]linux integration; annotated tag, v4.16-rc2, created. v4.16-rc2
by postmaster＠open-mesh.org 19 Feb '18

19 Feb '18

The annotated tag, v4.16-rc2 has been created at 8a1eab637309319aee4caa10b196eb7327b549ae (tag) tagging 91ab883eb21325ad80f3473633f794c78ac87f51 (commit) replaces v4.16-rc1 tagged by Linus Torvalds on Sun Feb 18 17:29:49 2018 -0800 - Shortlog ------------------------------------------------------------ Linux 4.16-rc2 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlqKKI0eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGRNAH/0v3+nuJ0oiHE1Cl fH89F9Ma17j8oTo28byRPi7X5XJfJAqANhHa209rguvnC27y3ew/l9k93HoxG12i ttvyKFDQulQbytfJZXw8lhUyYGXVsTpyNaihPe/NtqPdIxNgfrXsUN9EIEtcnuS2 SiAj51jUySDRNR4ST6TOx4ulDm1zLrmA28WHOBNOTvDi4jTQMt1TsngHfF5AySBB lD4RTRDDwWDWtdMI7euYSq019TiDXCxmwQ94vZjrqmjmSQcl/yCK/JzEV33SZslg 4WqGIllxONvP/UlwxZLaJ+RrslqxNgDVqQKwJdfYhGaWvpgPFtS1s86zW6IgyXny 02jJfD0= =DLWn -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.16-rc1, created. v4.16-rc1
by postmaster＠open-mesh.org 11 Feb '18

11 Feb '18

The annotated tag, v4.16-rc1 has been created at 5781e793a06a17edb3616114129f664f7b73161f (tag) tagging 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 (commit) replaces v4.15 tagged by Linus Torvalds on Sun Feb 11 15:04:42 2018 -0800 - Shortlog ------------------------------------------------------------ Linux 4.16-rc1 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlqAzAoeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGSJgIAJYjUcAXQvhOs/88 a+DUb4lJnSybB6ybwXMb2Ge52wGd6Txh1CJ24CE2guTS/nvZHT5mAl2LaZOH22wd rQHRrv06cRZVqEBpjB7CG63eMDByxwLWCnHV09+DAY0hFzZDekTURQHvFZOprFu3 a7Jnm4JtsmqA5prrxIzmNPCLf1tsoyNBZFZAc8zNerVp7fy6rw0F5cPsjUfA6Uua O69/58nTYyB7Y/jU90u3OZioG3mKRv0iJoYKJ7NYdCewlCvR0RLOA6UB28ud8kwU uJqzN3NQf548f5xXu3nt/p1ON5HJ98Q8hAZAsTI31jdUbVDXeajrHa8A21yZ9H5o hsIQG8o= =2hen -----END PGP SIGNATURE----- Al Viro (1): net: annotate ->poll() instances David S. Miller (2): Merge git://git.kernel.org/.../davem/net Merge tag 'batadv-next-for-davem-20171220' of git://git.open-mesh.org/linux-merge Denys Vlasenko (1): batman-adv: Deinline batadv_orig_hash_find, save 7339 bytes Linus Torvalds (3): Merge branch 'misc.poll' of git://git.kernel.org/.../viro/vfs Merge git://git.kernel.org/.../davem/net-next vfs: do bulk POLL* -> EPOLL* replacement Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (19): batman-adv: Add SPDX license identifier above copyright header batman-adv: Add license header to Kconfig batman-adv: include gfp.h for GFP_* defines batman-adv: include build_bug.h for BUILD_BUG_ON define batman-adv: Include net.h for net_ratelimited_function batman-adv: include kobject.h for kobject_* functions batman-adv: Remove unused sched.h include batman-adv: Add missing kernel-doc to packet.h batman-adv: Use parentheses in function kernel-doc batman-adv: Use inline kernel-doc for enum/struct batman-adv: Fix kernel-doc references to struct members batman-adv: Add kernel-doc to structs in headers batman-adv: Add kernel-doc to enums in headers batman-adv: Add kernel-doc to functions in headers batman-adv: Add kernel-doc to externally visible functions batman-adv: Let packet.h include its headers directly batman-adv: Remove usage of BIT(x) in packet.h batman-adv: Remove kernel fixed width types in packet.h batman-adv: Convert packet.h to uapi header ----------------------------------------------------------------------- -- linux integration

1 0

[doc] master: doc: Fix captions of toctree elements (e1ec7458)
by postmaster＠open-mesh.org 03 Feb '18

03 Feb '18

Repository : ssh://git@open-mesh.org/doc On branch : master >--------------------------------------------------------------- commit e1ec7458ed416eb67851064d56969a5e738d8ee7 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Feb 3 11:10:59 2018 +0100 doc: Fix captions of toctree elements >--------------------------------------------------------------- e1ec7458ed416eb67851064d56969a5e738d8ee7 alfred/developerinformation.rst | 3 +-- alfred/gettingstarted.rst | 3 +-- alfred/index.rst | 4 +--- batman-adv/developerinformation.rst | 3 +-- batman-adv/features.rst | 3 +-- batman-adv/gettingstarted.rst | 3 +-- batman-adv/index.rst | 3 +-- batman-adv/protocol_information.rst | 3 +-- batman-adv/random.rst | 3 +-- batmand/developerinformation.rst | 3 +-- batmand/gettingstarted.rst | 3 +-- batmand/history.rst | 3 +-- batmand/index.rst | 3 +-- index.rst | 5 ++--- open-mesh/documentation.rst | 3 +-- open-mesh/gettingstarted.rst | 3 +-- open-mesh/index.rst | 3 +-- open-mesh/random.rst | 3 +-- 18 files changed, 19 insertions(+), 38 deletions(-) diff --git a/alfred/developerinformation.rst b/alfred/developerinformation.rst index 76d4b69b..a8fe92f4 100644 --- a/alfred/developerinformation.rst +++ b/alfred/developerinformation.rst @@ -4,10 +4,9 @@ Developer Information ===================== -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: Alfred_architecture Alfred-output-format-proposal diff --git a/alfred/gettingstarted.rst b/alfred/gettingstarted.rst index 5f1be7db..511a78b8 100644 --- a/alfred/gettingstarted.rst +++ b/alfred/gettingstarted.rst @@ -4,10 +4,9 @@ Getting Started =============== -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: Building_information Batadv-vis diff --git a/alfred/index.rst b/alfred/index.rst index 67e330fe..64548473 100644 --- a/alfred/index.rst +++ b/alfred/index.rst @@ -33,11 +33,9 @@ for more information or the `manpage <https://downloads.open-mesh.org/batman/manpages/alfred.8.html>`__ for usage. - -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: gettingstarted developerinformation diff --git a/batman-adv/developerinformation.rst b/batman-adv/developerinformation.rst index 3508905c..f4f9b991 100644 --- a/batman-adv/developerinformation.rst +++ b/batman-adv/developerinformation.rst @@ -4,10 +4,9 @@ Developer Information ===================== -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: Tweaking Uevent diff --git a/batman-adv/features.rst b/batman-adv/features.rst index 00a42232..f3eee89e 100644 --- a/batman-adv/features.rst +++ b/batman-adv/features.rst @@ -4,10 +4,9 @@ Features ======== -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: Gateways Bridge-loop-avoidance diff --git a/batman-adv/gettingstarted.rst b/batman-adv/gettingstarted.rst index b67534a4..b72dca6f 100644 --- a/batman-adv/gettingstarted.rst +++ b/batman-adv/gettingstarted.rst @@ -4,10 +4,9 @@ Getting Started =============== -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: Building-with-openwrt Quick-start-guide diff --git a/batman-adv/index.rst b/batman-adv/index.rst index a1fc2c20..ae253417 100644 --- a/batman-adv/index.rst +++ b/batman-adv/index.rst @@ -3,10 +3,9 @@ batman-adv ========== -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: Doc-overview Wiki diff --git a/batman-adv/protocol_information.rst b/batman-adv/protocol_information.rst index a424733a..e864fc8e 100644 --- a/batman-adv/protocol_information.rst +++ b/batman-adv/protocol_information.rst @@ -4,10 +4,9 @@ Protocol Information ==================== -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: Network-wide-multi-link-optimization Client-announcement diff --git a/batman-adv/random.rst b/batman-adv/random.rst index 8685e376..4925b79c 100644 --- a/batman-adv/random.rst +++ b/batman-adv/random.rst @@ -4,10 +4,9 @@ Random ====== -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: Bcast-hidden-node Broadcast-Avoidances diff --git a/batmand/developerinformation.rst b/batmand/developerinformation.rst index 9a5ee8c5..dc6f5fdf 100644 --- a/batmand/developerinformation.rst +++ b/batmand/developerinformation.rst @@ -4,10 +4,9 @@ Developer Information ===================== -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: RoutingVodoo DebugOutput diff --git a/batmand/gettingstarted.rst b/batmand/gettingstarted.rst index 6e156e59..affbdd0c 100644 --- a/batmand/gettingstarted.rst +++ b/batmand/gettingstarted.rst @@ -4,10 +4,9 @@ Getting Started =============== -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: BATMAN_Daemon_HowTo InternetTuning diff --git a/batmand/history.rst b/batmand/history.rst index 5ef3e398..874c4904 100644 --- a/batmand/history.rst +++ b/batmand/history.rst @@ -4,10 +4,9 @@ History ======= -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: BerlinExperience Why-starting-batman diff --git a/batmand/index.rst b/batmand/index.rst index 9eb449fd..bd29aae8 100644 --- a/batmand/index.rst +++ b/batmand/index.rst @@ -3,10 +3,9 @@ batmand ======= -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: Doc-overview gettingstarted diff --git a/index.rst b/index.rst index 5a2a3801..2d7a4d64 100644 --- a/index.rst +++ b/index.rst @@ -1,17 +1,16 @@ .. SPDX-License-Identifier: GPL-2.0 .. open-mesh.org documentation master file, created by - sphinx-quickstart on Thu Jul 13 15:21:39 2017. + sphinx-quickstart on Sat Feb 3 11:01:36 2018. You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. Welcome to open-mesh.org's documentation! ========================================= -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: batman-adv/index alfred/index diff --git a/open-mesh/documentation.rst b/open-mesh/documentation.rst index e9a04683..1a54169c 100644 --- a/open-mesh/documentation.rst +++ b/open-mesh/documentation.rst @@ -4,10 +4,9 @@ Documentation ============= -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: BranchesExplained FAQ diff --git a/open-mesh/gettingstarted.rst b/open-mesh/gettingstarted.rst index eccebf64..0a11202b 100644 --- a/open-mesh/gettingstarted.rst +++ b/open-mesh/gettingstarted.rst @@ -4,10 +4,9 @@ Getting Started =============== -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: Download Contribute diff --git a/open-mesh/index.rst b/open-mesh/index.rst index 18124723..6251891c 100644 --- a/open-mesh/index.rst +++ b/open-mesh/index.rst @@ -3,10 +3,9 @@ open-mesh ========= -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: WikiStart gettingstarted diff --git a/open-mesh/random.rst b/open-mesh/random.rst index f9f2ec46..a13e4c5b 100644 --- a/open-mesh/random.rst +++ b/open-mesh/random.rst @@ -4,10 +4,9 @@ Random ====== -Contents: - .. toctree:: :maxdepth: 2 + :caption: Contents: BATMANConcept

1 0

[doc] master: doc: Simplify sphinx build infrastructure (6d9c54dc)
by postmaster＠open-mesh.org 03 Feb '18

03 Feb '18

Repository : ssh://git@open-mesh.org/doc On branch : master >--------------------------------------------------------------- commit 6d9c54dc93fd6b1ff0f0268df85472e91b906198 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Feb 3 11:10:18 2018 +0100 doc: Simplify sphinx build infrastructure >--------------------------------------------------------------- 6d9c54dc93fd6b1ff0f0268df85472e91b906198 Makefile | 225 +++----------------------------------------------------------- conf.py | 226 ++++++++------------------------------------------------------- 2 files changed, 38 insertions(+), 413 deletions(-) diff --git a/Makefile b/Makefile index 7aae0017..a1fc47d3 100644 --- a/Makefile +++ b/Makefile @@ -1,225 +1,20 @@ -# Makefile for Sphinx documentation +# Minimal makefile for Sphinx documentation # # You can set these variables from the command line. SPHINXOPTS = SPHINXBUILD = sphinx-build -PAPER = +SPHINXPROJ = open-meshorg +SOURCEDIR = . BUILDDIR = _build -# Internal variables. -PAPEROPT_a4 = -D latex_paper_size=a4 -PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . -# the i18n builder cannot share the environment and doctrees with the others -I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . - -.PHONY: help +# Put it first so that "make" without argument is like "make help". help: - @echo "Please use \`make <target>' where <target> is one of" - @echo " html to make standalone HTML files" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " singlehtml to make a single large HTML file" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " applehelp to make an Apple Help Book" - @echo " devhelp to make HTML files and a Devhelp project" - @echo " epub to make an epub" - @echo " epub3 to make an epub3" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " latexpdf to make LaTeX files and run them through pdflatex" - @echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx" - @echo " text to make text files" - @echo " man to make manual pages" - @echo " texinfo to make Texinfo files" - @echo " info to make Texinfo files and run them through makeinfo" - @echo " gettext to make PO message catalogs" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " xml to make Docutils-native XML files" - @echo " pseudoxml to make pseudoxml-XML files for display purposes" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - @echo " coverage to run coverage check of the documentation (if enabled)" - @echo " dummy to check syntax errors of document sources" - -.PHONY: clean -clean: - rm -rf $(BUILDDIR)/* - -.PHONY: html -html: - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." - -.PHONY: dirhtml -dirhtml: - $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." - -.PHONY: singlehtml -singlehtml: - $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml - @echo - @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." - -.PHONY: pickle -pickle: - $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle - @echo - @echo "Build finished; now you can process the pickle files." - -.PHONY: json -json: - $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json - @echo - @echo "Build finished; now you can process the JSON files." - -.PHONY: htmlhelp -htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp - @echo - @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp." - -.PHONY: qthelp -qthelp: - $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp - @echo - @echo "Build finished; now you can run "qcollectiongenerator" with the" \ - ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/open-meshorg.qhcp" - @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/open-meshorg.qhc" - -.PHONY: applehelp -applehelp: - $(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp - @echo - @echo "Build finished. The help book is in $(BUILDDIR)/applehelp." - @echo "N.B. You won't be able to view it unless you put it in" \ - "~/Library/Documentation/Help or install it in your application" \ - "bundle." - -.PHONY: devhelp -devhelp: - $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp - @echo - @echo "Build finished." - @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/open-meshorg" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/open-meshorg" - @echo "# devhelp" - -.PHONY: epub -epub: - $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub - @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub." - -.PHONY: epub3 -epub3: - $(SPHINXBUILD) -b epub3 $(ALLSPHINXOPTS) $(BUILDDIR)/epub3 - @echo - @echo "Build finished. The epub3 file is in $(BUILDDIR)/epub3." - -.PHONY: latex -latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." - @echo "Run \`make' in that directory to run these through (pdf)latex" \ - "(use \`make latexpdf' here to do that automatically)." - -.PHONY: latexpdf -latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through pdflatex..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -.PHONY: latexpdfja -latexpdfja: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through platex and dvipdfmx..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -.PHONY: text -text: - $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text - @echo - @echo "Build finished. The text files are in $(BUILDDIR)/text." - -.PHONY: man -man: - $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man - @echo - @echo "Build finished. The manual pages are in $(BUILDDIR)/man." - -.PHONY: texinfo -texinfo: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo - @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." - @echo "Run \`make' in that directory to run these through makeinfo" \ - "(use \`make info' here to do that automatically)." - -.PHONY: info -info: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo "Running Texinfo files through makeinfo..." - make -C $(BUILDDIR)/texinfo info - @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." - -.PHONY: gettext -gettext: - $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale - @echo - @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." - -.PHONY: changes -changes: - $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes - @echo - @echo "The overview file is in $(BUILDDIR)/changes." - -.PHONY: linkcheck -linkcheck: - $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck - @echo - @echo "Link check complete; look for any errors in the above output " \ - "or in $(BUILDDIR)/linkcheck/output.txt." - -.PHONY: doctest -doctest: - $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest - @echo "Testing of doctests in the sources finished, look at the " \ - "results in $(BUILDDIR)/doctest/output.txt." - -.PHONY: coverage -coverage: - $(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage - @echo "Testing of coverage in the sources finished, look at the " \ - "results in $(BUILDDIR)/coverage/python.txt." - -.PHONY: xml -xml: - $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml - @echo - @echo "Build finished. The XML files are in $(BUILDDIR)/xml." + @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) -.PHONY: pseudoxml -pseudoxml: - $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml - @echo - @echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml." +.PHONY: help Makefile -.PHONY: dummy -dummy: - $(SPHINXBUILD) -b dummy $(ALLSPHINXOPTS) $(BUILDDIR)/dummy - @echo - @echo "Build finished. Dummy builder generates no files." +# Catch-all target: route all unknown targets to Sphinx using the new +# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). +%: Makefile + @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) \ No newline at end of file diff --git a/conf.py b/conf.py index 66972084..a138f3b7 100644 --- a/conf.py +++ b/conf.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # open-mesh.org documentation build configuration file, created by -# sphinx-quickstart on Thu Jul 13 15:21:39 2017. +# sphinx-quickstart on Sat Feb 3 11:01:36 2018. # # This file is execfile()d with the current directory set to its # containing dir. @@ -20,6 +20,7 @@ # import sys # sys.path.insert(0, os.path.abspath('.')) + # -- General configuration ------------------------------------------------ # If your documentation needs a minimal Sphinx version, state it here. @@ -29,7 +30,7 @@ # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. -extensions = ["sphinx.ext.mathjax"] +extensions = ['sphinx.ext.mathjax'] # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -40,16 +41,12 @@ templates_path = ['_templates'] # source_suffix = ['.rst', '.md'] source_suffix = '.rst' -# The encoding of source files. -# -# source_encoding = 'utf-8-sig' - # The master toctree document. master_doc = 'index' # General information about the project. project = u'open-mesh.org' -copyright = u'2017, B.A.T.M.A.N. developers' +copyright = u'2018, B.A.T.M.A.N. developers' author = u'B.A.T.M.A.N. developers' # The version info for the project you're documenting, acts as replacement for @@ -68,48 +65,14 @@ release = u'latest' # Usually you set "language" from the command line for these cases. language = None -# There are two options for replacing |today|: either, you set today to some -# non-false value, then it is used: -# -# today = '' -# -# Else, today_fmt is used as the format for a strftime call. -# -# today_fmt = '%B %d, %Y' - # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. # This patterns also effect to html_static_path and html_extra_path exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] -# The reST default role (used for this markup: `text`) to use for all -# documents. -# -# default_role = None - -# If true, '()' will be appended to :func: etc. cross-reference text. -# -# add_function_parentheses = True - -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). -# -# add_module_names = True - -# If true, sectionauthor and moduleauthor directives will be shown in the -# output. They are ignored by default. -# -# show_authors = False - # The name of the Pygments (syntax highlighting) style to use. pygments_style = 'sphinx' -# A list of ignored prefixes for module index sorting. -# modindex_common_prefix = [] - -# If true, keep warnings as "system message" paragraphs in the built documents. -# keep_warnings = False - # If true, `todo` and `todoList` produce output, else they produce nothing. todo_include_todos = False @@ -127,132 +90,48 @@ html_theme = 'sphinx_rtd_theme' # # html_theme_options = {} -# Add any paths that contain custom themes here, relative to this directory. -# html_theme_path = [] - -# The name for this set of Sphinx documents. -# "<project> v<release> documentation" by default. -# -# html_title = u'open-mesh.org v2017.0' - -# A shorter title for the navigation bar. Default is the same as html_title. -# -# html_short_title = None - -# The name of an image file (relative to this directory) to place at the top -# of the sidebar. -# -# html_logo = None - -# The name of an image file (relative to this directory) to use as a favicon of -# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -# pixels large. -# -# html_favicon = None - # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] -# Add any extra paths that contain custom files (such as robots.txt or -# .htaccess) here, relative to this directory. These files are copied -# directly to the root of the documentation. -# -# html_extra_path = [] - -# If not None, a 'Last updated on:' timestamp is inserted at every page -# bottom, using the given strftime format. -# The empty string is equivalent to '%b %d, %Y'. -# -# html_last_updated_fmt = None - -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -# -# html_use_smartypants = True - -# Custom sidebar templates, maps document names to template names. -# -# html_sidebars = {} - -# Additional templates that should be rendered to pages, maps page names to -# template names. -# -# html_additional_pages = {} - -# If false, no module index is generated. -# -# html_domain_indices = True - -# If false, no index is generated. +# Custom sidebar templates, must be a dictionary that maps document names +# to template names. # -# html_use_index = True - -# If true, the index is split into individual pages for each letter. -# -# html_split_index = False - -# If true, links to the reST sources are added to the pages. -# -# html_show_sourcelink = True - -# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -# -# html_show_sphinx = True - -# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -# -# html_show_copyright = True - -# If true, an OpenSearch description file will be output, and all pages will -# contain a <link> tag referring to it. The value of this option must be the -# base URL from which the finished HTML is served. -# -# html_use_opensearch = '' +# This is required for the alabaster theme +# refs: http://alabaster.readthedocs.io/en/latest/installation.html#sidebars +html_sidebars = { + '**': [ + 'relations.html', # needs 'show_related': True theme option to display + 'searchbox.html', + ] +} -# This is the file name suffix for HTML files (e.g. ".xhtml"). -# html_file_suffix = None -# Language to be used for generating the HTML full-text search index. -# Sphinx supports the following languages: -# 'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja' -# 'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr', 'zh' -# -# html_search_language = 'en' - -# A dictionary with options for the search language support, empty by default. -# 'ja' uses this config value. -# 'zh' user can custom change `jieba` dictionary path. -# -# html_search_options = {'type': 'default'} - -# The name of a javascript file (relative to the configuration directory) that -# implements a search results scorer. If empty, the default will be used. -# -# html_search_scorer = 'scorer.js' +# -- Options for HTMLHelp output ------------------------------------------ # Output file base name for HTML help builder. htmlhelp_basename = 'open-meshorgdoc' + # -- Options for LaTeX output --------------------------------------------- latex_elements = { - # The paper size ('letterpaper' or 'a4paper'). - # - # 'papersize': 'letterpaper', + # The paper size ('letterpaper' or 'a4paper'). + # + # 'papersize': 'letterpaper', - # The font size ('10pt', '11pt' or '12pt'). - # - # 'pointsize': '10pt', + # The font size ('10pt', '11pt' or '12pt'). + # + # 'pointsize': '10pt', - # Additional stuff for the LaTeX preamble. - # - # 'preamble': '', + # Additional stuff for the LaTeX preamble. + # + # 'preamble': '', - # Latex figure (float) alignment - # - # 'figure_align': 'htbp', + # Latex figure (float) alignment + # + # 'figure_align': 'htbp', } # Grouping the document tree into LaTeX files. List of tuples @@ -263,38 +142,6 @@ latex_documents = [ u'B.A.T.M.A.N. developers', 'manual'), ] -# The name of an image file (relative to this directory) to place at the top of -# the title page. -# -# latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -# -# latex_use_parts = False - -# If true, show page references after internal links. -# -# latex_show_pagerefs = False - -# If true, show URL addresses after external links. -# -# latex_show_urls = False - -# Documents to append as an appendix to all manuals. -# -# latex_appendices = [] - -# It false, will not define \strong, \code, itleref, \crossref ... but only -# \sphinxstrong, ..., \sphinxtitleref, ... To help avoid clash with user added -# packages. -# -# latex_keep_old_macro_names = True - -# If false, no module index is generated. -# -# latex_domain_indices = True - # -- Options for manual page output --------------------------------------- @@ -305,10 +152,6 @@ man_pages = [ [author], 1) ] -# If true, show URL addresses after external links. -# -# man_show_urls = False - # -- Options for Texinfo output ------------------------------------------- @@ -321,18 +164,5 @@ texinfo_documents = [ 'Miscellaneous'), ] -# Documents to append as an appendix to all manuals. -# -# texinfo_appendices = [] -# If false, no module index is generated. -# -# texinfo_domain_indices = True - -# How to display URL addresses: 'footnote', 'no', or 'inline'. -# -# texinfo_show_urls = 'footnote' -# If true, do not generate a @detailmenu in the "Top" node's menu. -# -# texinfo_no_detailmenu = False

1 0

[batman-adv] master: batman-adv: annotate ->poll() instances (e89f6ed)
by postmaster＠open-mesh.org 02 Feb '18

02 Feb '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit e89f6ed0009c9ceee7f595427b85d8c4724c93f9 Author: Al Viro <viro(a)zeniv.linux.org.uk> Date: Sun Dec 24 15:30:23 2017 +0100 batman-adv: annotate ->poll() instances Signed-off-by: Al Viro <viro(a)zeniv.linux.org.uk> [sven(a)narfation.org: add compat code] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- e89f6ed0009c9ceee7f595427b85d8c4724c93f9 compat-include/linux/{compiler.h => types.h} | 23 ++++++++++++----------- net/batman-adv/icmp_socket.c | 2 +- net/batman-adv/log.c | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/compat-include/linux/compiler.h b/compat-include/linux/types.h similarity index 67% copy from compat-include/linux/compiler.h copy to compat-include/linux/types.h index 62b6a2f..f33f2bb 100644 --- a/compat-include/linux/compiler.h +++ b/compat-include/linux/types.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich @@ -18,20 +19,20 @@ * of the Linux kernel. */ -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_TYPES_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_TYPES_H_ #include <linux/version.h> -#include_next <linux/compiler.h> +#include_next <linux/types.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) -#define READ_ONCE(x) ACCESS_ONCE(x) +#ifdef __CHECK_POLL +typedef unsigned __bitwise __poll_t; +#else +typedef unsigned __poll_t; +#endif -#define WRITE_ONCE(x, val) ({ \ - ACCESS_ONCE(x) = (val); \ -}) +#endif /* < KERNEL_VERSION(4, 16, 0) */ -#endif /* < KERNEL_VERSION(3, 19, 0) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ */ +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_TYPES_H_ */ diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index b81826e..3396414 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@ -297,7 +297,7 @@ out: return len; } -static unsigned int batadv_socket_poll(struct file *file, poll_table *wait) +static __poll_t batadv_socket_poll(struct file *file, poll_table *wait) { struct batadv_socket_client *socket_client = file->private_data; diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c index 1b959c7..0132696 100644 --- a/net/batman-adv/log.c +++ b/net/batman-adv/log.c @@ -185,7 +185,7 @@ static ssize_t batadv_log_read(struct file *file, char __user *buf, return error; } -static unsigned int batadv_log_poll(struct file *file, poll_table *wait) +static __poll_t batadv_log_poll(struct file *file, poll_table *wait) { struct batadv_priv *bat_priv = file->private_data; struct batadv_priv_debug_log *debug_log = bat_priv->debug_log;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits February 2018