From 5eda02f74c5f41ff753e096deee091c4c15c018f Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Fri, 20 Aug 2021 12:02:17 +0200 Subject: [PATCH] batman-adv: Refresh patches with quilt The test builds are now requiring quilt refreshed patches instead of git patches. Otherwise the build check will not even try to build something. Signed-off-by: Sven Eckelmann --- ...v-genetlink-move-to-smaller-ops-wher.patch | 16 ++++++---------- ...v-Add-new-include-for-min-max-helper.patch | 19 ------------------- ...uild-of-multicast-code-against-Linux.patch | 6 ++---- 3 files changed, 8 insertions(+), 33 deletions(-) diff --git a/batman-adv/patches/0001-Revert-batman-adv-genetlink-move-to-smaller-ops-wher.patch b/batman-adv/patches/0001-Revert-batman-adv-genetlink-move-to-smaller-ops-wher.patch index 667ef41..ba8254e 100644 --- a/batman-adv/patches/0001-Revert-batman-adv-genetlink-move-to-smaller-ops-wher.patch +++ b/batman-adv/patches/0001-Revert-batman-adv-genetlink-move-to-smaller-ops-wher.patch @@ -12,11 +12,9 @@ or newer - otherwise it will not work as expected. This reverts commit 725b4ef5be840cfcd0ca33b9393c14dee40c10f7. -diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h -index 56a9ab22c062b1d0d01ef9d09ce796075d3d6df7..8f542bef10dc0f2682ab2d428c90df9ab97977ce 100644 --- a/compat-include/net/genetlink.h +++ b/compat-include/net/genetlink.h -@@ -31,17 +31,15 @@ void batadv_genl_dump_check_consistent(struct netlink_callback *cb, +@@ -31,17 +31,15 @@ void batadv_genl_dump_check_consistent(s #endif /* LINUX_VERSION_IS_LESS(4, 15, 0) */ @@ -48,7 +46,7 @@ index 56a9ab22c062b1d0d01ef9d09ce796075d3d6df7..8f542bef10dc0f2682ab2d428c90df9a unsigned int n_mcgrps; struct module *module; -@@ -96,32 +94,24 @@ static inline int batadv_genl_register_family(struct batadv_genl_family *family) +@@ -96,32 +94,24 @@ static inline int batadv_genl_register_f family->family.pre_doit = family->pre_doit; family->family.post_doit = family->post_doit; family->family.mcgrps = family->mcgrps; @@ -89,7 +87,7 @@ index 56a9ab22c062b1d0d01ef9d09ce796075d3d6df7..8f542bef10dc0f2682ab2d428c90df9a family->family.ops = ops; family->copy_ops = ops; -@@ -136,7 +126,7 @@ typedef struct genl_ops batadv_genl_ops_old; +@@ -136,7 +126,7 @@ typedef struct genl_ops batadv_genl_ops_ #define batadv_post_doit(__x, __y, __z) \ batadv_post_doit(const batadv_genl_ops_old *ops, __y, __z) @@ -98,7 +96,7 @@ index 56a9ab22c062b1d0d01ef9d09ce796075d3d6df7..8f542bef10dc0f2682ab2d428c90df9a #define genl_family batadv_genl_family #define genl_register_family(family) \ -@@ -160,6 +150,6 @@ batadv_genl_unregister_family(struct batadv_genl_family *family) +@@ -160,6 +150,6 @@ batadv_genl_unregister_family(struct bat genlmsg_multicast_netns(&(_family)->family, _net, _skb, _portid, \ _group, _flags) @@ -106,11 +104,9 @@ index 56a9ab22c062b1d0d01ef9d09ce796075d3d6df7..8f542bef10dc0f2682ab2d428c90df9a +#endif /* LINUX_VERSION_IS_LESS(5, 2, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_NET_GENETLINK_H_ */ -diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c -index b6cc746e01a641bfb75eba219ffa0c29b1b20dd5..e7822d72fe2ccf7d50dc0351fb8530db8e740afd 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c -@@ -1359,7 +1359,7 @@ static void batadv_post_doit(const struct genl_ops *ops, struct sk_buff *skb, +@@ -1359,7 +1359,7 @@ static void batadv_post_doit(const struc } } @@ -119,7 +115,7 @@ index b6cc746e01a641bfb75eba219ffa0c29b1b20dd5..e7822d72fe2ccf7d50dc0351fb8530db { .cmd = BATADV_CMD_GET_MESH, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, -@@ -1493,8 +1493,8 @@ struct genl_family batadv_netlink_family __ro_after_init = { +@@ -1493,8 +1493,8 @@ struct genl_family batadv_netlink_family .pre_doit = batadv_pre_doit, .post_doit = batadv_post_doit, .module = THIS_MODULE, diff --git a/batman-adv/patches/0002-Revert-batman-adv-Add-new-include-for-min-max-helper.patch b/batman-adv/patches/0002-Revert-batman-adv-Add-new-include-for-min-max-helper.patch index 6d1577d..6f4b56f 100644 --- a/batman-adv/patches/0002-Revert-batman-adv-Add-new-include-for-min-max-helper.patch +++ b/batman-adv/patches/0002-Revert-batman-adv-Add-new-include-for-min-max-helper.patch @@ -9,9 +9,6 @@ This reverts commit 1810de05310d5c5e9140f870ac21052f38bc06b8. Signed-off-by: Sven Eckelmann -diff --git a/compat-include/linux/minmax.h b/compat-include/linux/minmax.h -deleted file mode 100644 -index 9b7269e8a760361c1650b947c77702f0bdcd73d9..0000000000000000000000000000000000000000 --- a/compat-include/linux/minmax.h +++ /dev/null @@ -1,20 +0,0 @@ @@ -35,8 +32,6 @@ index 9b7269e8a760361c1650b947c77702f0bdcd73d9..00000000000000000000000000000000 -#endif - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_ */ -diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c -index b98aea958e3d6999d7eaf065230182d539384c3b..fd7f30f5f3033fd1a9e21518a71e66b557212374 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -15,7 +15,6 @@ @@ -47,8 +42,6 @@ index b98aea958e3d6999d7eaf065230182d539384c3b..fd7f30f5f3033fd1a9e21518a71e66b5 #include #include #include -diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c -index 423c2d17170387bfe89b83c4e20f06d525a36b30..4d8e3fdb4427a431cab903bc8a20edb816079fd7 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -18,7 +18,6 @@ @@ -59,8 +52,6 @@ index 423c2d17170387bfe89b83c4e20f06d525a36b30..4d8e3fdb4427a431cab903bc8a20edb8 #include #include #include -diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c -index a0a9636d17406362f879f342300a18e75424efa5..89ba88322c9c11acc49a9dcd9877ad8767fe713b 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -18,7 +18,6 @@ @@ -71,8 +62,6 @@ index a0a9636d17406362f879f342300a18e75424efa5..89ba88322c9c11acc49a9dcd9877ad87 #include #include #include -diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c -index a5d9d800082bade3a1d52cc040557e41f963fac3..96873d47fac5cb9b4fbfa217eedf1f92818b0e98 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -14,8 +14,8 @@ @@ -85,8 +74,6 @@ index a5d9d800082bade3a1d52cc040557e41f963fac3..96873d47fac5cb9b4fbfa217eedf1f92 #include #include #include -diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c -index 55d97e18aa4a9540692618c458d0ae2a743be6bb..3f97c1218908b7ba16a0707d7e54c589ca1a36a5 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -17,7 +17,6 @@ @@ -97,8 +84,6 @@ index 55d97e18aa4a9540692618c458d0ae2a743be6bb..3f97c1218908b7ba16a0707d7e54c589 #include #include #include -diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c -index 3ddd66e4c29ef532de33c7182cc0cc470b33fd4f..c552bc4168d0abd7bf6d23e570d583806fb162b1 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -23,7 +23,6 @@ @@ -109,8 +94,6 @@ index 3ddd66e4c29ef532de33c7182cc0cc470b33fd4f..c552bc4168d0abd7bf6d23e570d58380 #include #include #include -diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c -index e7822d72fe2ccf7d50dc0351fb8530db8e740afd..27f78f0c4aea025b964301e20f972031ab8ad478 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -23,7 +23,6 @@ @@ -121,8 +104,6 @@ index e7822d72fe2ccf7d50dc0351fb8530db8e740afd..27f78f0c4aea025b964301e20f972031 #include #include #include -diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c -index 789c851732b78ad9d1515f7b171219cc770c7045..46b774c08c947def8f72f260224254b01c3a387d 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -23,7 +23,6 @@ diff --git a/batman-adv/patches/0003-batman-adv-Fix-build-of-multicast-code-against-Linux.patch b/batman-adv/patches/0003-batman-adv-Fix-build-of-multicast-code-against-Linux.patch index 7a290db..46f9d1d 100644 --- a/batman-adv/patches/0003-batman-adv-Fix-build-of-multicast-code-against-Linux.patch +++ b/batman-adv/patches/0003-batman-adv-Fix-build-of-multicast-code-against-Linux.patch @@ -5,11 +5,9 @@ Subject: batman-adv: Fix build of multicast code against Linux < 5.13 Fixes: 007b4c4b031f ("batman-adv: convert ifmcaddr6 to RCU") Signed-off-by: Sven Eckelmann -diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c -index 923e2197c2db008ba1cd9b80422ec8481c6a8185..004dc67de076d524784988d2fc8ec7396a00042b 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c -@@ -423,9 +423,14 @@ batadv_mcast_mla_softif_get_ipv6(struct net_device *dev, +@@ -423,9 +423,14 @@ batadv_mcast_mla_softif_get_ipv6(struct return 0; } @@ -24,7 +22,7 @@ index 923e2197c2db008ba1cd9b80422ec8481c6a8185..004dc67de076d524784988d2fc8ec739 if (IPV6_ADDR_MC_SCOPE(&pmc6->mca_addr) < IPV6_ADDR_SCOPE_LINKLOCAL) continue; -@@ -454,6 +459,9 @@ batadv_mcast_mla_softif_get_ipv6(struct net_device *dev, +@@ -454,6 +459,9 @@ batadv_mcast_mla_softif_get_ipv6(struct hlist_add_head(&new->list, mcast_list); ret++; } -- 2.30.2