[PATCH] Add batman-adv patch to remove gw mode switch message

mail at adrianschmutzler.de mail at adrianschmutzler.de
Mi Jul 11 21:58:48 CEST 2018


Hallo Fabian,

Reviewed-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
Tested-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>

Eine Anmerkung unten.

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces at freifunk.net] On Behalf
> Of Fabian Bläse
> Sent: Mittwoch, 11. Juli 2018 15:16
> To: franken-dev at freifunk.net
> Subject: [PATCH] Add batman-adv patch to remove gw mode switch
> message
> 
> Signed-off-by: Fabian Bläse <fabian at blaese.de>
> ---
>  ...adv-patch-to-remove-gw-mode-switch-messag.patch | 47
> ++++++++++++++++++++++
>  buildscript                                        |  3 +-
>  2 files changed, 49 insertions(+), 1 deletion(-)  create mode 100644
> build_patches/routing/0002-Add-batman-adv-patch-to-remove-gw-mode-
> switch-messag.patch
> 
> diff --git a/build_patches/routing/0002-Add-batman-adv-patch-to-remove-
> gw-mode-switch-messag.patch b/build_patches/routing/0002-Add-batman-
> adv-patch-to-remove-gw-mode-switch-messag.patch
> new file mode 100644
> index 0000000..9ad09fc
> --- /dev/null
> +++ b/build_patches/routing/0002-Add-batman-adv-patch-to-remove-gw-
> mode-
> +++ switch-messag.patch
> @@ -0,0 +1,47 @@
> +From e775f12c11d425611ba490c98ab84fb6cf4f0c01 Mon Sep 17 00:00:00
> 2001
> +From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian at blaese.de>
> +Date: Wed, 11 Jul 2018 13:39:06 +0200
> +Subject: [PATCH] Add batman-adv patch to remove gw mode switch
> message
> +
> +Signed-off-by: Fabian Bläse <fabian at blaese.de>
> +---
> + .../0001-Remove-gw-mode-switch-message.patch  | 26
> +++++++++++++++++++
> + 1 file changed, 26 insertions(+)
> + create mode 100644
> +batman-adv/patches/0001-Remove-gw-mode-switch-message.patch
> +
> +diff --git
> +a/batman-adv/patches/0001-Remove-gw-mode-switch-message.patch
> +b/batman-adv/patches/0001-Remove-gw-mode-switch-message.patch

In dem Ordner liegen ja schon Patches, wenn ich mich nicht irre?

https://github.com/openwrt-routing/packages/tree/master/batman-adv/patches

Ich würde daher den Patch entweder an den Anfang setzen 0000-* oder ans Ende mit 0100-*.

Die sysfs.c wird sonst nicht modifiziert, also sollte der Patch in keinem Fall kaputt gehen. Da das nur der Name der Datei ist, sollte man das direkt in diesem Patch einfach editieren können, ohne das was kaputt geht (und nicht mehr alle Stufen durchpfriemeln).

Beste Grüße

Adrian


> +new file mode 100644
> +index 0000000..3fcd99c
> +--- /dev/null
> ++++ b/batman-adv/patches/0001-Remove-gw-mode-switch-
> message.patch
> +@@ -0,0 +1,26 @@
> ++From 5a99aa98460605dcc649c43b85ae87e36d326cdf Mon Sep 17 00:00:00
> 2001
> ++From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian at blaese.de>
> ++Date: Wed, 11 Jul 2018 13:37:08 +0200
> ++Subject: [PATCH] Remove gw mode switch message
> ++
> ++Signed-off-by: Fabian Bläse <fabian at blaese.de>
> ++---
> ++ net/batman-adv/sysfs.c | 3 ---
> ++ 1 file changed, 3 deletions(-)
> ++
> ++diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index
> ++f2eef43b..dc529d50 100644
> ++--- a/net/batman-adv/sysfs.c
> +++++ b/net/batman-adv/sysfs.c
> ++@@ -508,9 +508,6 @@ static ssize_t batadv_store_gw_mode(struct
> kobject *kobj,
> ++ 		break;
> ++ 	}
> ++
> ++-	batadv_info(net_dev, "Changing gw mode from: %s to: %s\n",
> ++-		    curr_gw_mode_str, buff);
> ++-
> ++ 	/* Invoking batadv_gw_reselect() is not enough to really de-select
> the
> ++ 	 * current GW. It will only instruct the gateway client code to perform
> ++ 	 * a re-election the next time that this is needed.
> ++--
> ++2.18.0
> ++
> +--
> +2.18.0
> +
> diff --git a/buildscript b/buildscript
> index 95ae31d..6d78ba1 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -39,7 +39,8 @@ GLUON_PKGS="kmod-batman-adv-legacy micrond
> simple-tc uradvd"
>  ROUTING=(routing
>           https://git.openwrt.org/feed/routing.git
>           d11075cd40a88602bf4ba2b275f72100ddcb4767
> -         "0001-alfred-Support-interface-IDs-with-more-than-two-digi.patch") #
> lede-17.01
> +         "0001-alfred-Support-interface-IDs-with-more-than-two-digi.patch"
> +
> + "0002-Add-batman-adv-patch-to-remove-gw-mode-switch-
> messag.patch") #
> + lede-17.01
>  ROUTING_PKGS="kmod-batman-adv batctl alfred"
> 
>  FFF=(fff)
> --
> 2.11.0




Mehr Informationen über die Mailingliste franken-dev