Repository : ssh://git@open-mesh.org/batctl
Branch 'maint' now includes:
a738c35 batctl: add support for the bla backbone table in debugfs
b02e69f Merge branch 'next'
d3bcb9c batctl: rename bridge loop avoidance claim types
a7d1ac6 batctl: purge redundant statistic code
4f6745d batctl: unify debug table handling and remove redundant code
5ec3a91 batctl: unify settings handling and remove redundant code
40cc393 batctl: beef up man page
b7b9484 Merge branch 'next'
dc51362 batctl: more detailed error messages when file can't be opened
7325845 batctl: Use BIT(x) macro to calculate bit positions
acd06db batctl: detect not yet announced clients
678022a Merge tag 'v2012.3.0'
87a09cf batctl: Start new development cycle
The annotated tag, batman-adv-for-davem has been updated
to 7ec78bd46f552d46d4ba9bcbdb0b519b966ef170 (tag)
from 3de8bb601b096a1651b1192cd29d5c1292f756b8 (which is now obsolete)
tagging 0aca86cd92282359d2f7202804bd92e7d092c04e (commit)
replaces batman-adv-fix-for-davem
tagged by Antonio Quartulli
on Mon Oct 29 09:49:48 2012 +0100
- Shortlog ------------------------------------------------------------
included changes:
- some code cleanups and minor fixes (3 of them were reported by Coverity)
- 'struct hard_iface' re-shaping to improve multi-protocol support
- ECTP packets silent drop
- transfer the WIFI flag on clients in case of roaming
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iEYEABECAAYFAlCOQzIACgkQpGgxIkP9cwdjVgCgmTSMNhAOvIWG/8dV6iiAvDeP
bwIAnjZb5QeF/d4L+lRuqw5hMVTEQnJo
=SAxj
-----END PGP SIGNATURE-----
Antonio Quartulli (8):
batman-adv: use check_unicast_packet() in recv_roam_adv()
batman-adv: return proper value in case of hash_add failure
batman-adv: properly store the roaming time
batman-adv: print packets re-routing on DBG_TT and ratelimit it
batman-adv: check for more space before accessing the skb
batman-adv: properly convert flag into a boolean value
batman-adv: pass the WIFI flag from the local to global entry
batman-adv: add kernel-doc for enum batadv_dbg_level
Marek Lindner (2):
batman-adv: split hard_iface struct for each routing protocol
batman-adv: consolidate duplicated primary_if checking code
Simon Wunderlich (1):
batman-adv: don't allow ECTP traffic on batman-adv
Sven Eckelmann (5):
batman-adv: Remove unused define BAT_ATTR_HIF_UINT
batman-adv: Set special lockdep classes to avoid lockdep warning
batman-adv: Remove extra check in batadv_bit_get_packet
batman-adv: Check return value of try_module_get
batman-adv: Only increase refcounter once for alternate router
-----------------------------------------------------------------------
--
linux integration
The annotated tag, batman-adv-for-davem has been created
at 3de8bb601b096a1651b1192cd29d5c1292f756b8 (tag)
tagging 2186a06ac573db625b5864d1feb963c2bf0dacac (commit)
replaces batman-adv-fix-for-davem
tagged by Antonio Quartulli
on Sun Oct 28 11:27:54 2012 +0100
- Shortlog ------------------------------------------------------------
included changes:
- some code cleanups and minor fixes (3 of them were reported by Coverity)
- 'struct hard_iface' re-shaping to improve multi-protocol support
- ECTP packets silent drop
- transfer the WIFI flag on clients in case of roaming
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iEYEABECAAYFAlCNCLAACgkQpGgxIkP9cweKrQCgmQUdMM4RLqEOqWLsJilC3JYC
LGUAnREr+aSoH4Pz0ypk+uJSHie9lwKh
=3Igs
-----END PGP SIGNATURE-----
Antonio Quartulli (8):
batman-adv: use check_unicast_packet() in recv_roam_adv()
batman-adv: return proper value in case of hash_add failure
batman-adv: properly store the roaming time
batman-adv: print packets re-routing on DBG_TT and ratelimit it
batman-adv: check for more space before accessing the skb
batman-adv: properly convert flag into a boolean value
batman-adv: pass the WIFI flag from the local to global entry
batman-adv: add kernel-doc for enum batadv_dbg_level
Marek Lindner (3):
batman-adv: split hard_iface struct for each routing protocol
batman-adv: separate BATADV_ATTR_HIF_UINT sysfs name from hard-iface variable
batman-adv: consolidate duplicated primary_if checking code
Simon Wunderlich (1):
batman-adv: don't allow ECTP traffic on batman-adv
Sven Eckelmann (4):
batman-adv: Set special lockdep classes to avoid lockdep warning
batman-adv: Remove extra check in batadv_bit_get_packet
batman-adv: Check return value of try_module_get
batman-adv: Only increase refcounter once for alternate router
-----------------------------------------------------------------------
--
linux integration
The following commit has been merged in the merge/master branch:
commit 24937d754e29a26b0690955585dc99a7fd830db0
Author: Antonio Quartulli <ordex(a)autistici.org>
Date: Sun Oct 28 11:23:42 2012 +0100
batman-adv: Add BATMAN_ADV_DAT config option in Kconfig
Signed-off-by: Antonio Quartulli <ordex(a)autistici.org>
diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig
index 22dcfbe..8d8afb1 100644
--- a/net/batman-adv/Kconfig
+++ b/net/batman-adv/Kconfig
@@ -26,6 +26,16 @@ config BATMAN_ADV_BLA
more than one mesh node in the same LAN, you can safely remove
this feature and save some space.
+config BATMAN_ADV_DAT
+ bool "Distributed ARP Table"
+ depends on BATMAN_ADV && INET
+ default n
+ help
+ This option enables DAT (Distributed ARP Table), a DHT based
+ mechanism that increases ARP reliability on sparse wireless
+ mesh networks. If you think that your network does not need
+ this option you can safely remove it and save some space.
+
config BATMAN_ADV_DEBUG
bool "B.A.T.M.A.N. debugging"
depends on BATMAN_ADV
--
linux integration
The following commit has been merged in the merge/master branch:
commit e3cd03fec8c528d8bf049bcb9ad58e7bf4dd5d6d
Author: Antonio Quartulli <ordex(a)autistici.org>
Date: Sun Oct 28 11:23:23 2012 +0100
batman-adv: add LIBCRC32C dependancy in Kconfig
Signed-off-by: Antonio Quartulli <ordex(a)autistici.org>
diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig
index 53f5244..22dcfbe 100644
--- a/net/batman-adv/Kconfig
+++ b/net/batman-adv/Kconfig
@@ -6,6 +6,7 @@ config BATMAN_ADV
tristate "B.A.T.M.A.N. Advanced Meshing Protocol"
depends on NET
select CRC16
+ select LIBCRC32C
default n
help
B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is
--
linux integration
The annotated tag, batman-adv-for-davem has been created
at abbda767d4aab1f19b4bc5c4140878e860a1b49c (tag)
tagging 2186a06ac573db625b5864d1feb963c2bf0dacac (commit)
replaces batman-adv-fix-for-davem
tagged by Antonio Quartulli
on Sat Oct 27 17:13:50 2012 +0200
- Shortlog ------------------------------------------------------------
included changes:
- some code cleanups and minor fixes (3 of them were reported by Coverity)
- 'struct hard_iface' re-shaping to improve multi-protocol support
- ECTP packets silent drop
- transfer the WIFI flag on clients in case of roaming
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iEYEABECAAYFAlCL/BQACgkQpGgxIkP9cwc8PwCcCL5ZVzvYm1D0YxN0S1IRSi/h
kjQAn1i5NEhEWH1asfOkQTTjvj5XmegZ
=vTUl
-----END PGP SIGNATURE-----
Antonio Quartulli (8):
batman-adv: use check_unicast_packet() in recv_roam_adv()
batman-adv: return proper value in case of hash_add failure
batman-adv: properly store the roaming time
batman-adv: print packets re-routing on DBG_TT and ratelimit it
batman-adv: check for more space before accessing the skb
batman-adv: properly convert flag into a boolean value
batman-adv: pass the WIFI flag from the local to global entry
batman-adv: add kernel-doc for enum batadv_dbg_level
Marek Lindner (3):
batman-adv: split hard_iface struct for each routing protocol
batman-adv: separate BATADV_ATTR_HIF_UINT sysfs name from hard-iface variable
batman-adv: consolidate duplicated primary_if checking code
Simon Wunderlich (1):
batman-adv: don't allow ECTP traffic on batman-adv
Sven Eckelmann (4):
batman-adv: Set special lockdep classes to avoid lockdep warning
batman-adv: Remove extra check in batadv_bit_get_packet
batman-adv: Check return value of try_module_get
batman-adv: Only increase refcounter once for alternate router
-----------------------------------------------------------------------
--
linux integration