The annotated tag, batadv-next-for-davem-20180319 has been deleted
was 43e576babe557a3c90c85e2098f5c7db8b1ddb4b
-----------------------------------------------------------------------
tag batadv-next-for-davem-20180319
This feature/cleanup patchset includes the following patches:
- avoid redundant multicast TT entries, by Linus Luessing
- add netlink support for distributed arp table cache and multicast flags,
by Linus Luessing (2 patches)
-----BEGIN PGP SIGNATURE-----
iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAlqv59kWHHN3QHNpbW9u
d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoSBaD/9r/oJC+Q/3Eu6DTAAiS7Jx2IpQ
kOwU7l4hkGK8mBZ098CkmHTBY+zurqYwcokCHhKJO5mqJEpvlM27PuQxzqWSBMMO
FWFax2YlKPpJp+/f/rSD9HS73RTY7npv6l5/eFg6+0WSQET04PjLB1KxPrO5u1+Z
JujrAxp0GEyMoVQgMy9uloedkpizhADyYSZzDDXnHhq1NiAPU87cjrTLv/xdtdp7
TvbNfobhZUmKZ951yaRlDmE+mH8IoTQoY7HD/JANnduYeFJAlIPnHQEQa8+5tLwO
qWUeLa4Acv5MhO2KjbKQpu5r2dFbs0x+jmsja8xBmgNWO5meKh/aE8TKGJeDVQEW
TTynEivf82suiquCIZ573fBnliJkipffg32ZHgtNGrh54hh+YU7Sts0t9Lsou4ar
aOU6lup3MHFysf3s9hK6y9TzSqwFJ8Mak0UFsa03r0Ub8am6bKHTqMFaCgN0aK9P
vBL4atSvJVguwPlzxLMi44K4NxqEVfa41dZ7nQ99P3BFzWwSvph3i4lu+cxGxwI7
4kgWU5Cz8T51dH7g8j3vUish36DzwQtUsKLWZVpV+DV4BaHJ/rLyqeug3ffUrWRk
p0bFU7wBAv8rKeFPd30m2tdJ/nMo+rDbN6Tm9n43tK4NWKOGBndhCoNhjfrzhM8U
un6Iy7taISgeElZ5fQ==
=HVxO
-----END PGP SIGNATURE-----
53dd9a68ba683986ec90497586f94b941bb748a0 batman-adv: add multicast flags netlink support
-----------------------------------------------------------------------
--
linux integration
The annotated tag, batadv-net-for-davem-20180319 has been deleted
was f7d0ee1175d1fa1046e7592b628b7b9ac3ab3de9
-----------------------------------------------------------------------
tag batadv-net-for-davem-20180319
Here are some batman-adv bugfixes:
- fix possible IPv6 packet loss when multicast extension is used, by Linus Luessing
- fix SKB handling issues for TTVN and DAT, by Matthias Schiffer (two patches)
- fix include for eventpoll, by Sven Eckelmann
- fix skb checksum for ttvn reroutes, by Sven Eckelmann
-----BEGIN PGP SIGNATURE-----
iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAlqv5tcWHHN3QHNpbW9u
d3VuZGVybGljaC5kZQAKCRChK+OYQpKeob7PD/wPnjVmFl6uQlRHfOfUBzGvW9hU
ASakGylzfZTXzP2VviMJ+7JehXQgediM4caTr/8jWhJFeVxu5jmeYzv8nzOlwZJ/
PjNlX+ChuIAWv1wyxHI3YWwj7Y1Ox9Lp8Gs7m5UbmfyiZEtb+ybHjvPzZ/FMfhWo
hOgbndSpFKfwFuXFkXyitektBcKTiFUyjk9U22v91XCQZZzMb8KqougVBE+bdg0w
N8LfgKXVC448sUNKTEczhji7bFuJwR+Sogx1TwIIsyfT2Tp4JXY3A7M1LDwAL/Rc
nTu9L58vk4qUouRjIQJ7rhhoxdPSrD5p3oinzVnLvJBxgOS3pxegY3asX8sRMXsj
bgolIGCZ9vDfA21WXqa3RyjUiBEx9UId6W++h+22kVqVHt5tqIFK2nVQ6IInOXwB
kzd3UDrRBLgRdBpwlu/ii9rn68MOEdLNpL3Seo9DkViJESfLn1ODnFA1Y2rFoK6S
cVeYl1DVj4SQSXjNilqYhFZoTEo/kxN5KhgHRXzujTv6MCHVa2SnCZaXS5EXp8n6
u4gpPc363Isj17A+UVlmHmmzA6d8Jqe8veVvET0xSvQPHmE7eepMkJU9hIUNXfcv
fENmQnU10pS1keJqS6xuR6k2RxMoofYRUPpKEigCcH7z/0GytWQc6QVGmo19LD9b
GNcWAhKI453pc1IuUA==
=hsM8
-----END PGP SIGNATURE-----
fc04fdb2c8a894283259f5621d31d75610701091 batman-adv: Fix skbuff rcsum on packet reroute
-----------------------------------------------------------------------
--
linux integration
Repository : ssh://git@open-mesh.org/batctl
On branch : master
>---------------------------------------------------------------
commit d325ed25fb38de8b731679aafa491ac915b823e0
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Mar 19 18:50:05 2018 +0100
batctl: Add tp debug log messages switch
The switch to enable/disable throughput meter debug messages in `batctl
log` is supported since batman-adv 2016.3 but was never adopted in batctl.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
d325ed25fb38de8b731679aafa491ac915b823e0
README.rst | 1 +
man/batctl.8 | 7 ++++---
sys.c | 7 ++++++-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/README.rst b/README.rst
index 256e153..4c0f544 100644
--- a/README.rst
+++ b/README.rst
@@ -428,6 +428,7 @@ Example::
[ ] messages related to arp snooping and distributed arp table (dat)
[ ] messages related to network coding (nc)
[ ] messages related to multicast (mcast)
+ [ ] messages related to throughput meter (tp)
batctl nc_nodes
diff --git a/man/batctl.8 b/man/batctl.8
index 7cf66ca..d5fc530 100644
--- a/man/batctl.8
+++ b/man/batctl.8
@@ -107,9 +107,10 @@ level. Level 'none' disables all verbose logging. Level 'batman' enables message
Level 'routes' enables messages related to routes being added / changed / deleted. Level 'tt' enables messages related to
translation table operations. Level 'bla' enables messages related to the bridge loop avoidance. Level 'dat' enables
messages related to ARP snooping and the Distributed Arp Table. Level 'nc' enables messages related to network coding.
-Level 'mcast' enables messages related to multicast optimizations. Level 'all' enables all messages. The messages
-are sent to the batman-adv debug log. Use \fBbatctl log\fP to retrieve it. Make sure to have debugging output enabled
-when compiling the module otherwise the output as well as the loglevel options won't be available.
+Level 'mcast' enables messages related to multicast optimizations. Level 'tp' enables messages related to throughput meter.
+Level 'all' enables all messages. The messages are sent to the batman-adv debug log. Use \fBbatctl log\fP to retrieve it.
+Make sure to have debugging output enabled when compiling the module otherwise the output as well as the loglevel options
+won't be available.
.br
.IP "\fBlog\fP|\fBl\fP [\fB\-n\fP]\fP"
batctl will read the batman-adv debug log which has to be compiled into the kernel module. If "\-n" is given batctl will not
diff --git a/sys.c b/sys.c
index 068aa31..e0c2073 100644
--- a/sys.c
+++ b/sys.c
@@ -132,6 +132,7 @@ static void log_level_usage(void)
fprintf(stderr, " \t dat Messages related to arp snooping and distributed arp table\n");
fprintf(stderr, " \t nc Messages related to network coding\n");
fprintf(stderr, " \t mcast Messages related to multicast\n");
+ fprintf(stderr, " \t tp Messages related to throughput meter\n");
}
int handle_loglevel(char *mesh_iface, int argc, char **argv)
@@ -169,7 +170,7 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv)
log_level = 0;
break;
} else if (strcmp(argv[i], "all") == 0) {
- log_level = 127;
+ log_level = 255;
break;
} else if (strcmp(argv[i], "batman") == 0)
log_level |= BIT(0);
@@ -185,6 +186,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv)
log_level |= BIT(5);
else if (strcmp(argv[i], "mcast") == 0)
log_level |= BIT(6);
+ else if (strcmp(argv[i], "tp") == 0)
+ log_level |= BIT(7);
else {
log_level_usage();
goto out;
@@ -220,6 +223,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv)
"messages related to network coding", "nc");
printf("[%c] %s (%s)\n", (log_level & BIT(6)) ? 'x' : ' ',
"messages related to multicast", "mcast");
+ printf("[%c] %s (%s)\n", (log_level & BIT(7)) ? 'x' : ' ',
+ "messages related to throughput meter", "tp");
out:
free(path_buff);
Repository : ssh://git@open-mesh.org/batctl
On branch : master
>---------------------------------------------------------------
commit 8fb0c951fdf73dd468bd66ee0343b70ff469f375
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Mar 19 18:40:16 2018 +0100
batctl: Enable mcast log level with "all"
The BIT(6) has to be set when the "all" loglevel is used to really get all
the log output which is known to batctl.
Fixes: 55042b3a3bbf ("batctl: adding multicast debug level")
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
8fb0c951fdf73dd468bd66ee0343b70ff469f375
sys.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys.c b/sys.c
index bf77b7d..068aa31 100644
--- a/sys.c
+++ b/sys.c
@@ -169,7 +169,7 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv)
log_level = 0;
break;
} else if (strcmp(argv[i], "all") == 0) {
- log_level = 63;
+ log_level = 127;
break;
} else if (strcmp(argv[i], "batman") == 0)
log_level |= BIT(0);
The annotated tag, v4.16-rc6 has been created
at 49d8069446d565d0a796edc048b273620e74bdee (tag)
tagging c698ca5278934c0ae32297a8725ced2e27585d7f (commit)
replaces v4.16-rc5
tagged by Linus Torvalds
on Sun Mar 18 17:48:54 2018 -0700
- Shortlog ------------------------------------------------------------
Linux 4.16-rc6
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlqvCPYeHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGOaAH/171cgZGFEXSONxK
3O1AAv61wN5K/ISMt6mnelWR6fZg195FarOx0Rnq7Ot8OWuVa8CGcyT4vX4Z7nb9
SVMQKNMPCVQE4WCDOv6S0njChmRC0BxBoVJtTN9fhywdYgX1KcaTS/drMRHACF5n
rB9eouMQScfMzKGAW08gp5NvEGJ6W1SLX7La3/u0751dYisdJSP7+vFZNxUrGXEA
yIPOQjFu0Tfo8GXz/BwC678RZVzVLN0sE6+/vM7zNnoDlsRVkdDIVMo3UiVqm/NK
B37/TlZz8CYoapoKnRRB5giXnSPDSXtsikbGy3mcy0u5imGe+ZgdjrdYSaLk31cR
NVZY08k=
=pu3X
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
The annotated tag, batadv-next-for-davem-20180319 has been created
at 43e576babe557a3c90c85e2098f5c7db8b1ddb4b (tag)
tagging 53dd9a68ba683986ec90497586f94b941bb748a0 (commit)
replaces batadv-next-for-davem-20180302
tagged by Simon Wunderlich
on Mon Mar 19 17:39:53 2018 +0100
- Shortlog ------------------------------------------------------------
This feature/cleanup patchset includes the following patches:
- avoid redundant multicast TT entries, by Linus Luessing
- add netlink support for distributed arp table cache and multicast flags,
by Linus Luessing (2 patches)
-----BEGIN PGP SIGNATURE-----
iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAlqv59kWHHN3QHNpbW9u
d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoSBaD/9r/oJC+Q/3Eu6DTAAiS7Jx2IpQ
kOwU7l4hkGK8mBZ098CkmHTBY+zurqYwcokCHhKJO5mqJEpvlM27PuQxzqWSBMMO
FWFax2YlKPpJp+/f/rSD9HS73RTY7npv6l5/eFg6+0WSQET04PjLB1KxPrO5u1+Z
JujrAxp0GEyMoVQgMy9uloedkpizhADyYSZzDDXnHhq1NiAPU87cjrTLv/xdtdp7
TvbNfobhZUmKZ951yaRlDmE+mH8IoTQoY7HD/JANnduYeFJAlIPnHQEQa8+5tLwO
qWUeLa4Acv5MhO2KjbKQpu5r2dFbs0x+jmsja8xBmgNWO5meKh/aE8TKGJeDVQEW
TTynEivf82suiquCIZ573fBnliJkipffg32ZHgtNGrh54hh+YU7Sts0t9Lsou4ar
aOU6lup3MHFysf3s9hK6y9TzSqwFJ8Mak0UFsa03r0Ub8am6bKHTqMFaCgN0aK9P
vBL4atSvJVguwPlzxLMi44K4NxqEVfa41dZ7nQ99P3BFzWwSvph3i4lu+cxGxwI7
4kgWU5Cz8T51dH7g8j3vUish36DzwQtUsKLWZVpV+DV4BaHJ/rLyqeug3ffUrWRk
p0bFU7wBAv8rKeFPd30m2tdJ/nMo+rDbN6Tm9n43tK4NWKOGBndhCoNhjfrzhM8U
un6Iy7taISgeElZ5fQ==
=HVxO
-----END PGP SIGNATURE-----
Linus Lüssing (3):
batman-adv: Avoid redundant multicast TT entries
batman-adv: add DAT cache netlink support
batman-adv: add multicast flags netlink support
-----------------------------------------------------------------------
--
linux integration
The annotated tag, batadv-net-for-davem-20180319 has been created
at f7d0ee1175d1fa1046e7592b628b7b9ac3ab3de9 (tag)
tagging fc04fdb2c8a894283259f5621d31d75610701091 (commit)
replaces batadv-net-for-davem-20180302
tagged by Simon Wunderlich
on Mon Mar 19 17:35:35 2018 +0100
- Shortlog ------------------------------------------------------------
Here are some batman-adv bugfixes:
- fix possible IPv6 packet loss when multicast extension is used, by Linus Luessing
- fix SKB handling issues for TTVN and DAT, by Matthias Schiffer (two patches)
- fix include for eventpoll, by Sven Eckelmann
- fix skb checksum for ttvn reroutes, by Sven Eckelmann
-----BEGIN PGP SIGNATURE-----
iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAlqv5tcWHHN3QHNpbW9u
d3VuZGVybGljaC5kZQAKCRChK+OYQpKeob7PD/wPnjVmFl6uQlRHfOfUBzGvW9hU
ASakGylzfZTXzP2VviMJ+7JehXQgediM4caTr/8jWhJFeVxu5jmeYzv8nzOlwZJ/
PjNlX+ChuIAWv1wyxHI3YWwj7Y1Ox9Lp8Gs7m5UbmfyiZEtb+ybHjvPzZ/FMfhWo
hOgbndSpFKfwFuXFkXyitektBcKTiFUyjk9U22v91XCQZZzMb8KqougVBE+bdg0w
N8LfgKXVC448sUNKTEczhji7bFuJwR+Sogx1TwIIsyfT2Tp4JXY3A7M1LDwAL/Rc
nTu9L58vk4qUouRjIQJ7rhhoxdPSrD5p3oinzVnLvJBxgOS3pxegY3asX8sRMXsj
bgolIGCZ9vDfA21WXqa3RyjUiBEx9UId6W++h+22kVqVHt5tqIFK2nVQ6IInOXwB
kzd3UDrRBLgRdBpwlu/ii9rn68MOEdLNpL3Seo9DkViJESfLn1ODnFA1Y2rFoK6S
cVeYl1DVj4SQSXjNilqYhFZoTEo/kxN5KhgHRXzujTv6MCHVa2SnCZaXS5EXp8n6
u4gpPc363Isj17A+UVlmHmmzA6d8Jqe8veVvET0xSvQPHmE7eepMkJU9hIUNXfcv
fENmQnU10pS1keJqS6xuR6k2RxMoofYRUPpKEigCcH7z/0GytWQc6QVGmo19LD9b
GNcWAhKI453pc1IuUA==
=hsM8
-----END PGP SIGNATURE-----
Linus Lüssing (1):
batman-adv: Fix multicast packet loss with a single WANT_ALL_IPV4/6 flag
Matthias Schiffer (2):
batman-adv: update data pointers after skb_cow()
batman-adv: fix header size check in batadv_dbg_arp()
Sven Eckelmann (2):
batman-adv: Add missing include for EPOLL* constants
batman-adv: Fix skbuff rcsum on packet reroute
-----------------------------------------------------------------------
--
linux integration