From 40b75193bc546e163323aa983b594dca71f15e2b Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Thu, 23 May 2019 19:08:04 +0200 Subject: [PATCH] batman-adv: Reorder patches Signed-off-by: Sven Eckelmann --- ...atman-adv-Use-explicit-tvlv-padding-for-ELP-packets.patch | 5 +---- ...atman-adv-Expand-merged-fragment-buffer-for-full-pa.patch | 5 +---- ...tman-adv-Avoid-WARN-on-net_device-without-parent-i.patch} | 0 ...tman-adv-Force-mac-header-to-start-of-data-on-xmit.patch} | 0 ...batman-adv-fix-uninit-value-in-batadv_interface_tx.patch} | 0 ...tman-adv-Reduce-claim-hash-refcnt-only-for-removed.patch} | 0 ...tman-adv-Reduce-tt_local-hash-refcnt-only-for-remo.patch} | 0 ...tman-adv-Reduce-tt_global-hash-refcnt-only-for-rem.patch} | 0 8 files changed, 2 insertions(+), 8 deletions(-) rename batman-adv/patches/{0022-batman-adv-Avoid-WARN-on-net_device-without-parent-i.patch => 0024-batman-adv-Avoid-WARN-on-net_device-without-parent-i.patch} (100%) rename batman-adv/patches/{0023-batman-adv-Force-mac-header-to-start-of-data-on-xmit.patch => 0025-batman-adv-Force-mac-header-to-start-of-data-on-xmit.patch} (100%) rename batman-adv/patches/{0024-batman-adv-fix-uninit-value-in-batadv_interface_tx.patch => 0026-batman-adv-fix-uninit-value-in-batadv_interface_tx.patch} (100%) rename batman-adv/patches/{0025-batman-adv-Reduce-claim-hash-refcnt-only-for-removed.patch => 0027-batman-adv-Reduce-claim-hash-refcnt-only-for-removed.patch} (100%) rename batman-adv/patches/{0026-batman-adv-Reduce-tt_local-hash-refcnt-only-for-remo.patch => 0028-batman-adv-Reduce-tt_local-hash-refcnt-only-for-remo.patch} (100%) rename batman-adv/patches/{0027-batman-adv-Reduce-tt_global-hash-refcnt-only-for-rem.patch => 0029-batman-adv-Reduce-tt_global-hash-refcnt-only-for-rem.patch} (100%) diff --git a/batman-adv/patches/0022-batman-adv-Use-explicit-tvlv-padding-for-ELP-packets.patch b/batman-adv/patches/0022-batman-adv-Use-explicit-tvlv-padding-for-ELP-packets.patch index 3285e47..2f6c1f9 100644 --- a/batman-adv/patches/0022-batman-adv-Use-explicit-tvlv-padding-for-ELP-packets.patch +++ b/batman-adv/patches/0022-batman-adv-Use-explicit-tvlv-padding-for-ELP-packets.patch @@ -1,6 +1,6 @@ From: Sven Eckelmann Date: Tue, 30 Oct 2018 12:17:10 +0100 -Subject: [PATCH] batman-adv: Use explicit tvlv padding for ELP packets +Subject: batman-adv: Use explicit tvlv padding for ELP packets The announcement messages of batman-adv COMPAT_VERSION 15 have the possibility to announce additional information via a dynamic TVLV part. @@ -21,9 +21,6 @@ Reported-by: Linus Lüssing Signed-off-by: Sven Eckelmann Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/974337ee9773c4bd0a2d5c322306cf2bea445e11 ---- - net/batman-adv/bat_v_elp.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 83b46654449df72ceda6ca3177f72e7faf0603ab..9aa3c7b2e9bad6c50b2939b6dbf5a9a2e713b93b 100644 diff --git a/batman-adv/patches/0023-batman-adv-Expand-merged-fragment-buffer-for-full-pa.patch b/batman-adv/patches/0023-batman-adv-Expand-merged-fragment-buffer-for-full-pa.patch index 7133976..6bdb6bc 100644 --- a/batman-adv/patches/0023-batman-adv-Expand-merged-fragment-buffer-for-full-pa.patch +++ b/batman-adv/patches/0023-batman-adv-Expand-merged-fragment-buffer-for-full-pa.patch @@ -1,6 +1,6 @@ From: Sven Eckelmann Date: Wed, 7 Nov 2018 23:09:12 +0100 -Subject: [PATCH] batman-adv: Expand merged fragment buffer for full packet +Subject: batman-adv: Expand merged fragment buffer for full packet The complete size ("total_size") of the fragmented packet is stored in the fragment header and in the size of the fragment chain. When the fragments @@ -25,9 +25,6 @@ Co-authored-by: Linus Lüssing Signed-off-by: Sven Eckelmann Origin: other, https://patchwork.open-mesh.org/patch/17616/ ---- - net/batman-adv/fragmentation.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 0fddc17106bd8a0e3f064fee9adba7c226f34682..5b71a289d04fc80de6c20e7a24d621727c77825a 100644 diff --git a/batman-adv/patches/0022-batman-adv-Avoid-WARN-on-net_device-without-parent-i.patch b/batman-adv/patches/0024-batman-adv-Avoid-WARN-on-net_device-without-parent-i.patch similarity index 100% rename from batman-adv/patches/0022-batman-adv-Avoid-WARN-on-net_device-without-parent-i.patch rename to batman-adv/patches/0024-batman-adv-Avoid-WARN-on-net_device-without-parent-i.patch diff --git a/batman-adv/patches/0023-batman-adv-Force-mac-header-to-start-of-data-on-xmit.patch b/batman-adv/patches/0025-batman-adv-Force-mac-header-to-start-of-data-on-xmit.patch similarity index 100% rename from batman-adv/patches/0023-batman-adv-Force-mac-header-to-start-of-data-on-xmit.patch rename to batman-adv/patches/0025-batman-adv-Force-mac-header-to-start-of-data-on-xmit.patch diff --git a/batman-adv/patches/0024-batman-adv-fix-uninit-value-in-batadv_interface_tx.patch b/batman-adv/patches/0026-batman-adv-fix-uninit-value-in-batadv_interface_tx.patch similarity index 100% rename from batman-adv/patches/0024-batman-adv-fix-uninit-value-in-batadv_interface_tx.patch rename to batman-adv/patches/0026-batman-adv-fix-uninit-value-in-batadv_interface_tx.patch diff --git a/batman-adv/patches/0025-batman-adv-Reduce-claim-hash-refcnt-only-for-removed.patch b/batman-adv/patches/0027-batman-adv-Reduce-claim-hash-refcnt-only-for-removed.patch similarity index 100% rename from batman-adv/patches/0025-batman-adv-Reduce-claim-hash-refcnt-only-for-removed.patch rename to batman-adv/patches/0027-batman-adv-Reduce-claim-hash-refcnt-only-for-removed.patch diff --git a/batman-adv/patches/0026-batman-adv-Reduce-tt_local-hash-refcnt-only-for-remo.patch b/batman-adv/patches/0028-batman-adv-Reduce-tt_local-hash-refcnt-only-for-remo.patch similarity index 100% rename from batman-adv/patches/0026-batman-adv-Reduce-tt_local-hash-refcnt-only-for-remo.patch rename to batman-adv/patches/0028-batman-adv-Reduce-tt_local-hash-refcnt-only-for-remo.patch diff --git a/batman-adv/patches/0027-batman-adv-Reduce-tt_global-hash-refcnt-only-for-rem.patch b/batman-adv/patches/0029-batman-adv-Reduce-tt_global-hash-refcnt-only-for-rem.patch similarity index 100% rename from batman-adv/patches/0027-batman-adv-Reduce-tt_global-hash-refcnt-only-for-rem.patch rename to batman-adv/patches/0029-batman-adv-Reduce-tt_global-hash-refcnt-only-for-rem.patch -- 2.30.2