Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit 6e860b3d5e4147bafcda32bf9b3e769926f232c5
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Nov 25 10:46:50 2019 +0100
batman-adv: Revert "disable ethtool link speed detection when auto negotiation off"
The commit d60b8fc69ef2 ("batman-adv: disable ethtool link speed detection
when auto negotiation off") disabled the usage of ethtool's link_ksetting
when auto negotation was enabled due to invalid values when used with
tun/tap virtual net_devices. According to the patch, automatic measurements
should be used for these kind of interfaces.
But there are major flaws with this argumentation:
* automatic measurements are not implemented
* auto negotiation has nothing to do with the validity of the retrieved
values
The first point has to be fixed by a longer patch series. The "validity"
part of the second point must be addressed in the same patch series by
dropping the usage of ethtool's link_ksetting (thus always doing automatic
measurements over ethernet).
Drop the patch again to have more default values for various net_device
types/configurations. The user can still overwrite them using the
batadv_hardif's BATADV_ATTR_THROUGHPUT_OVERRIDE.
Reported-by: Matthias Schiffer <mschiffer(a)universe-factory.net>
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
6e860b3d5e4147bafcda32bf9b3e769926f232c5
compat-include/linux/ethtool.h | 2 --
net/batman-adv/bat_v_elp.c | 15 +--------------
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/compat-include/linux/ethtool.h b/compat-include/linux/ethtool.h
index 18629acd..6dd2a74c 100644
--- a/compat-include/linux/ethtool.h
+++ b/compat-include/linux/ethtool.h
@@ -21,7 +21,6 @@ struct batadv_ethtool_link_ksettings {
struct {
__u32 speed;
__u8 duplex;
- __u8 autoneg;
} base;
};
@@ -42,7 +41,6 @@ batadv_ethtool_get_link_ksettings(struct net_device *dev,
return ret;
link_ksettings->base.duplex = cmd.duplex;
- link_ksettings->base.autoneg = cmd.autoneg;
link_ksettings->base.speed = ethtool_cmd_speed(&cmd);
return 0;
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index 353e49c4..0bdefa35 100644
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
@@ -127,20 +127,7 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
rtnl_lock();
ret = __ethtool_get_link_ksettings(hard_iface->net_dev, &link_settings);
rtnl_unlock();
-
- /* Virtual interface drivers such as tun / tap interfaces, VLAN, etc
- * tend to initialize the interface throughput with some value for the
- * sake of having a throughput number to export via ethtool. This
- * exported throughput leaves batman-adv to conclude the interface
- * throughput is genuine (reflecting reality), thus no measurements
- * are necessary.
- *
- * Based on the observation that those interface types also tend to set
- * the link auto-negotiation to 'off', batman-adv shall check this
- * setting to differentiate between genuine link throughput information
- * and placeholders installed by virtual interfaces.
- */
- if (ret == 0 && link_settings.base.autoneg == AUTONEG_ENABLE) {
+ if (ret == 0) {
/* link characteristics might change over time */
if (link_settings.base.duplex == DUPLEX_FULL)
hard_iface->bat_v.flags |= BATADV_FULL_DUPLEX;
The annotated tag, batadv-next-for-davem-20200526 has been created
at f78793f8b1637115fdec9ce53da161838c6aa26c (tag)
tagging 9ad346c90509ebd983f60da7d082f261ad329507 (commit)
replaces v5.7-rc2
tagged by Simon Wunderlich
on Tue May 26 11:57:14 2020 +0200
- Shortlog ------------------------------------------------------------
This cleanup patchset includes the following patches:
- Fix revert dynamic lockdep key changes for batman-adv,
by Sven Eckelmann
- use rcu_replace_pointer() where appropriate, by Antonio Quartulli
- Revert "disable ethtool link speed detection when auto negotiation
off", by Sven Eckelmann
-----BEGIN PGP SIGNATURE-----
iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAl7M5/oWHHN3QHNpbW9u
d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoRbjD/9+7kbUOYkMEz1x0izlXdXLSlMK
EVU0iaJAecRxwN1+o7l1XstGIn5+Y77WsjaB9KKaOHOqWddZN8bQ1/b1lpp4s47n
GR650eZcuPjXgSPVmiq86iztRNspOAokuCzFUkVh+AVeLMe/yonSxMpA8QFoYZMD
KLxqxlG1xlPqvI+AULLaXSKWlt2tPNWBdpRwxL7TjupmblBMMwVxvi4G7J2Hxest
PV//Sakm250kZnQXtoTT3vftDwBwoTFNOZGk9j/2gPrkSWx6l1CAOxp0KKP+sHkU
ZlJtqabv0YCFPh17moOCB1Fy/RAvwAgwps1wb3+sK+YSsKg6R5VyAE9eajQx9+nL
ypxLSFMs4JWSE+7qw9g6TnoQa1QsXIKmYNqyy5CwGfLg4F42rzA2obSYVA/I93ny
KG00tqJM5FOaybXH59fKh5pti+PevWtPc1L5N0QCM6RX99dw79QSThx9wI7OeKfy
xLTClx6y0Y2dZC80+zJUQgxDCFnA8+cvNznXNL/TYmf3kqrgUeC1G0prAdBuDfsd
1AKwnVMVsVN4qUmxIrFFQHCtxu39GU2tU5RZy6WIAkpvN9zIYDvlaDOTnxZgfPpw
59FmX/+0Gj9mh9FUWkJkyuZlkqFaztIkRVb10W1kXfALAIgp30pfSYGsDi0+0Y5J
g4/cmMGRYNCN5RcAIg==
=vDHL
-----END PGP SIGNATURE-----
Antonio Quartulli (1):
batman-adv: use rcu_replace_pointer() where appropriate
Cong Wang (1):
net: partially revert dynamic lockdep key changes
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (5):
batman-adv: Fix spelling error in term buffer
batman-adv: trace: Drop unneeded types.h include
batman-adv: Utilize prandom_u32_max for random [0, max) values
batman-adv: Revert "Drop lockdep.h include for soft-interface.c"
batman-adv: Revert "disable ethtool link speed detection when auto negotiation off"
YueHaibing (1):
batman-adv: remove unused inline function batadv_arp_change_timeout
-----------------------------------------------------------------------
--
linux integration
The annotated tag, v5.7-rc7 has been created
at effde58ab3a6dc1211e9395066beba7e2c59d762 (tag)
tagging 9cb1fd0efd195590b828b9b865421ad345a4a145 (commit)
replaces v5.7-rc6
tagged by Linus Torvalds
on Sun May 24 15:33:04 2020 -0700
- Shortlog ------------------------------------------------------------
Linux 5.7-rc7
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl7K9iEeHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGzTAH/0ifZEG4BQ8x/WlB
8YLSLE6QQTSXYi25nyExuJbFkkKY5Tik8M2HD/36xwY/HnZOlH9jH6m0ntqZxpaA
3EU9lr1ct79nCBMYhiJssvz8d9AOZXlyogFW9y2y9pmPjlmUtseZ7yGh1xD465cj
B5Ty2w2W34cs7zF3og2xn5agOJMtWWXLXZ5mRa9EOquKC5zeYyRicmd0T+plYQD6
hbRYmxFfDfppVnBCBARPNN0+NU5JJD94H+8bOuf1tl48XNrLiZMOicmtohKNQ6+W
rZNpJNEGEp7KMtqWH0Nl3hmy3yfZHMwe1DXM/AZDqR7jTHZY4mZ0GEpLyfI9AU4n
34jVHwU=
=SmJ9
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
The annotated tag, v5.7-rc6 has been created
at 191ae8df7494029b5cc540b17fc4526e64ae7c38 (tag)
tagging b9bbe6ed63b2b9f2c9ee5cbd0f2c946a2723f4ce (commit)
replaces v5.7-rc5
tagged by Linus Torvalds
on Sun May 17 16:48:47 2020 -0700
- Shortlog ------------------------------------------------------------
Linux 5.7-rc6
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl7BzV8eHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGg8EH/A2pXMTxtc96RI4S
sttEsUQqbakFS0Z/2tQPpMGr/qW2e5eHgsTX/a3SiUeZiIXk6f4lMFkMuctzBf7p
X77cNEDwGOEdbtCXTsMcmKSde7sP2zCXsPB8xTWLyE6rnaFRgikwwkeqgkIKhp1h
bvOQV0t9HNGvxGAM0iZeOvQAvFl4vd7nS123/MYbir9cugfQUSJRueQ4BiCiJqVE
6cNA7/vFzDJuFGszzIrJ7HXn/IdQMMWHkvTDjgBw0GZw1mDbGFbfbZwOeTz1ojCt
smUQ4tIFxBa/VA5zx7dOy2P2keHbSVf4VLkZRPcceT7OqVS65ETmFDp+qt5NdWM5
vZ8+7/0=
=CyYH
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
The annotated tag, v5.7-rc5 has been created
at b80e93f86a3e9938c9c46c4456d0d6d83c07974e (tag)
tagging 2ef96a5bb12be62ef75b5828c0aab838ebb29cb8 (commit)
replaces v5.7-rc4
tagged by Linus Torvalds
on Sun May 10 15:17:13 2020 -0700
- Shortlog ------------------------------------------------------------
Linux 5.7-rc5
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl64fWkeHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGD5gH/indQKVcyuTsQDKu
3NKZBVye9FTno0sGntkulxYvZ8fpCB6hR/2F/IZSf3tbSH4CwGSlKVST1U3s2PEJ
sfjVRJRIYI5tUTIOkvc2GM9321D1AOvfcEmfUGCDYzC61YTvnycoJSgSU2UlGpaI
T0cXSKE90BbAXInf/JMyk0Vsc+1Xv2X8VkP5PRf4aZLN/+AwYnvUD8L5DDsOyEVo
p9oAy73DXwReMe1j7MQXBHo0bu5DYaXl1nm9TVXxFVlFtKM6DlPZEg2jgUaN5nnw
/W1fXqXoy0wdFIlckCJY2PBYyTdV84s7ks8nYX9mnJy9umDjJaP4XVwH2lLwZuE0
m33C5UU=
=se44
-----END PGP SIGNATURE-----
George Spelvin (1):
batman-adv: fix batadv_nc_random_weight_tq
Xiyu Yang (3):
batman-adv: Fix refcnt leak in batadv_show_throughput_override
batman-adv: Fix refcnt leak in batadv_store_throughput_override
batman-adv: Fix refcnt leak in batadv_v_ogm_process
-----------------------------------------------------------------------
--
linux integration
Repository : ssh://git@diktynna/doc
On branches: backup-redmine/2020-05-09,master
>---------------------------------------------------------------
commit 8f8abd7adb3eb76a3c522a9ab2195f2068dd5874
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Tue Apr 21 17:04:51 2020 +0000
doc: open-mesh/News-draft: stub for 2020.1 release
>---------------------------------------------------------------
8f8abd7adb3eb76a3c522a9ab2195f2068dd5874
open-mesh/News-draft.textile | 73 +++++++++++++++++++++-----------------------
1 file changed, 34 insertions(+), 39 deletions(-)
diff --git a/open-mesh/News-draft.textile b/open-mesh/News-draft.textile
index a9590cf..5fba025 100644
--- a/open-mesh/News-draft.textile
+++ b/open-mesh/News-draft.textile
@@ -1,81 +1,75 @@
-h1. DRAFT: Batman-adv 2020.0 released
+h1. DRAFT: Batman-adv 2020.1 released
-Feb 25th, 2020. Today the B.A.T.M.A.N. team publishes the February 2020 update to batman-adv, batctl and alfred! This release disables the (deprecated) sysfs support by default. The next milestone in this process is the removal of debugfs and sysfs support next year. The B.A.T.M.A.N. V code can now use the PHY transmission rates as another (fallback) source to calculate the expected throughput to specific neighbors. The alfred gps daemon gained support for the gpsd API 9 (libgps >= 3.20). Also several bugfixes and code cleanups are included in this version.
+Apr 28th, 2020. Today the B.A.T.M.A.N. team publishes the April 2020 update to batman-adv, batctl and alfred! TODO
As the kernel module always depends on the Linux kernel it is compiled against, it does not make sense to provide binaries on our website. As usual, you will find the signed tarballs in our download section:
-https://downloads.open-mesh.org/batman/releases/batman-adv-2020.0/
+https://downloads.open-mesh.org/batman/releases/batman-adv-2020.1/
h2. Thanks
Thanks to all people sending in patches:
-* Pankaj Bharadiya <pankaj.laxminarayan.bharadiya(a)intel.com>
-* Ren�� Treffer <treffer(a)measite.de>
+* George Spelvin <lkml(a)sdf.org>
+* Gustavo A. R. Silva <gustavo(a)embeddedor.com>
+* Leonardo M��rlein <me(a)irrelefant.net>
+* Linus Torvalds <torvalds(a)linux-foundation.org>
* Simon Wunderlich <sw(a)simonwunderlich.de>
* Sven Eckelmann <sven(a)narfation.org>
+* Xiyu Yang <xiyuyang19(a)fudan.edu.cn>
and to all those that supported us with good advice or rigorous testing:
-* Peter Green <plugwash(a)p10link.net>
+* Madhuparna Bhowmik <madhuparnabhowmik10(a)gmail.com>
h2. batman-adv
<pre>
$ git describe origin/master
-v2019.5-16-g0b7b07f5
-$ range=v2019.5..v2019.5-16-g0b7b07f5
+v2020.0-11-gb8b3b6b3
+$ range=v2020.0..v2020.0-11-gb8b3b6b3
$ git shortlog --email --no-merges "${range}"
$ git log --no-merges "${range}"|grep -e '\(Reported\|Tested\|Acked\|Reviewed-by\|Co-authored-by\)-by'|sed 's/.*:/*/'|sort|uniq
-
-
-
new kernel support
==================
- batman-adv: Use sizeof_field() macro
- batman-adv: Provide backports-like kernel version helpers
- batman-adv: Drop workaround for Debian's make-kpkg
-
coding style cleanup/refactoring
================================
- batman-adv: Strip dots from variable macro kerneldoc
- batman-adv: Fix typo metAdata
- batman-adv: Annotate bitwise integer pointer casts
- batman-adv: Replace FIELD_SIZEOF with sizeof_field
- batman-adv: Avoid comment line over 80 characters
+ batman-adv: Replace zero-length array with flexible-array member
+ batman-adv: Avoid RCU list-traversal in spinlock
BATMAN V
=========
- batman-adv: ELP - use wifi tx bitrate as fallback throughput
-
bugfixes
========
+ batman-adv: fix batadv_nc_random_weight_tq
+ batman-adv: Fix refcnt leak in batadv_show_throughput_override
+ batman-adv: Fix refcnt leak in batadv_store_throughput_override
+ batman-adv: Fix refcnt leak in batadv_v_ogm_process
various
=======
- batman-adv: Disable CONFIG_BATMAN_ADV_SYSFS by default
-
+ MAINTAINERS: sort field names for all entries
-2020.0 (2020-02-25)
+2020.1 (2020-04-28)
===================
-* support latest kernels (3.16 - 5.6)
+* support latest kernels (3.16 - 5.7-rc2)
* coding style cleanups and refactoring
-* use wifi tx rates as fallback for the B.A.T.M.A.N. V throughput estimation
-* disable deprecated sysfs support by default
* bugs squashed:
- - fix crash during the scheduling of OGMs for removed interfaces
+ - fix reference leaks in throughput_override sysfs file
+ - fix reference leak in B.A.T.M.A.N. V OGM error handling
+ - fix network coding random weighting
</pre>
@@ -84,8 +78,8 @@ h2. batctl
<pre>
$ git describe origin/master
-v2019.5-2-g83e319f
-$ range=v2019.5..v2019.5-2-g83e319f
+v2020.0-3-g2c4980f
+$ range=v2020.0..v2020.0-3-g2c4980f
$ git shortlog --email --no-merges "${range}"
$ git log --no-merges "${range}"|grep -e '\(Reported\|Tested\|Acked\|Reviewed-by\|Co-authored-by\)-by'|sed 's/.*:/*/'|sort|uniq
@@ -93,11 +87,14 @@ $ git log --no-merges "${range}"|grep -e '\(Reported\|Tested\|Acked\|Reviewed-by
bugfix
======
+ batctl: Return EXIT_FAILURE when throughputmeter failed
-2020.0 (2020-02-25)
+2020.1 (2020-04-28)
===================
-* (no changes)
+* bugs squashed:
+
+ - Fix error code on throughputmeter errors
</pre>
@@ -105,18 +102,16 @@ h2. alfred
<pre>
$ git describe origin/master
-v2019.5-3-g060d699
-$ range=v2019.5..v2019.5-3-g060d699
+v2020.0-1-ga4adede
+$ range=v2020.0..v2020.0-1-ga4adede
$ git shortlog --email --no-merges "${range}"
$ git log --no-merges "${range}"|grep -e '\(Reported\|Tested\|Acked\|Reviewed-by\|Co-authored-by\)-by'|sed 's/.*:/*/'|sort|uniq
- alfred-gpsd: Fix build against gpsd ABI 9.0
-
-2020.0 (2020-02-25)
+2020.1 (2020-04-28)
===================
-* fix build against gpsd API 9.0
+* (no changes)
</pre>