commits October 2016

commits@lists.open-mesh.org

1 participants
127 discussions

[batctl] maint, next: batctl: Work around uclibc collision for __unused (0197d48)
by postmaster＠open-mesh.org 18 Oct '16

18 Oct '16

Repository : ssh://git@open-mesh.org/batctl On branches: maint,next >--------------------------------------------------------------- commit 0197d48e13cf38693c780329d1fbf86f73598b0c Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Sep 4 20:20:40 2016 +0200 batctl: Work around uclibc collision for __unused uclibc on 64 bit systems uses struct members called __unused. These conflict with the definition of __unused in batctl. Such a conflict results in a build error because the struct member will be replaced with the __attribute__((unused)). This can be avoided by renaming it to the Linux kernel name "__maybe_unused". Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 0197d48e13cf38693c780329d1fbf86f73598b0c genl.c | 4 ++-- main.h | 2 +- tp_meter.c | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/genl.c b/genl.c index b6f66fd..36fc27e 100644 --- a/genl.c +++ b/genl.c @@ -34,7 +34,7 @@ #include "batman_adv.h" -static int mcast_error_handler(struct sockaddr_nl *nla __unused, +static int mcast_error_handler(struct sockaddr_nl *nla __maybe_unused, struct nlmsgerr *err, void *arg) { int *ret = arg; @@ -42,7 +42,7 @@ static int mcast_error_handler(struct sockaddr_nl *nla __unused, return NL_STOP; } -static int mcast_ack_handler(struct nl_msg *msg __unused, void *arg) +static int mcast_ack_handler(struct nl_msg *msg __maybe_unused, void *arg) { int *ret = arg; *ret = 0; diff --git a/main.h b/main.h index 01f70e8..12c33b7 100644 --- a/main.h +++ b/main.h @@ -47,7 +47,7 @@ #endif #define __packed __attribute((packed)) /* linux kernel compat */ -#define __unused __attribute__((unused)) +#define __maybe_unused __attribute__((unused)) #define BIT(nr) (1UL << (nr)) /* linux kernel compat */ typedef uint8_t u8; /* linux kernel compat */ diff --git a/tp_meter.c b/tp_meter.c index 43c19da..a402e45 100644 --- a/tp_meter.c +++ b/tp_meter.c @@ -66,7 +66,7 @@ struct tp_cookie { uint32_t cookie; }; -static int tpmeter_nl_print_error(struct sockaddr_nl *nla __unused, +static int tpmeter_nl_print_error(struct sockaddr_nl *nla __maybe_unused, struct nlmsgerr *nlerr, void *arg) { @@ -236,7 +236,8 @@ out: return err; } -static int no_seq_check(struct nl_msg *msg __unused, void *arg __unused) +static int no_seq_check(struct nl_msg *msg __maybe_unused, + void *arg __maybe_unused) { return NL_OK; }

1 0

[batctl] next: batctl: Work around uclibc collision for __unused (7402351)
by postmaster＠open-mesh.org 18 Oct '16

18 Oct '16

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 7402351d3bef02d8dac2e9b68a9e3eca472fd33d Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Sep 4 20:23:31 2016 +0200 batctl: Work around uclibc collision for __unused uclibc on 64 bit systems uses struct members called __unused. These conflict with the definition of __unused in batctl. Such a conflict results in a build error because the struct member will be replaced with the __attribute__((unused)). This can be avoided by renaming it to the Linux kernel name "__maybe_unused". Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Tested-by: Andreas Pape <apape(a)phoenixcontact.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 7402351d3bef02d8dac2e9b68a9e3eca472fd33d genl.c | 4 ++-- main.h | 2 +- netlink.c | 10 +++++----- tp_meter.c | 5 +++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/genl.c b/genl.c index b6f66fd..36fc27e 100644 --- a/genl.c +++ b/genl.c @@ -34,7 +34,7 @@ #include "batman_adv.h" -static int mcast_error_handler(struct sockaddr_nl *nla __unused, +static int mcast_error_handler(struct sockaddr_nl *nla __maybe_unused, struct nlmsgerr *err, void *arg) { int *ret = arg; @@ -42,7 +42,7 @@ static int mcast_error_handler(struct sockaddr_nl *nla __unused, return NL_STOP; } -static int mcast_ack_handler(struct nl_msg *msg __unused, void *arg) +static int mcast_ack_handler(struct nl_msg *msg __maybe_unused, void *arg) { int *ret = arg; *ret = 0; diff --git a/main.h b/main.h index 6365cdb..dbde6dd 100644 --- a/main.h +++ b/main.h @@ -47,7 +47,7 @@ #endif #define __packed __attribute((packed)) /* linux kernel compat */ -#define __unused __attribute__((unused)) +#define __maybe_unused __attribute__((unused)) #define BIT(nr) (1UL << (nr)) /* linux kernel compat */ typedef uint8_t u8; /* linux kernel compat */ diff --git a/netlink.c b/netlink.c index e8e94b2..8fce3d8 100644 --- a/netlink.c +++ b/netlink.c @@ -134,9 +134,9 @@ static int missing_mandatory_attrs(struct nlattr *attrs[], return 0; } -static int print_error(struct sockaddr_nl *nla __unused, +static int print_error(struct sockaddr_nl *nla __maybe_unused, struct nlmsgerr *nlerr, - void *arg __unused) + void *arg __maybe_unused) { if (nlerr->error != -EOPNOTSUPP) fprintf(stderr, "Error received: %s\n", @@ -147,7 +147,7 @@ static int print_error(struct sockaddr_nl *nla __unused, return NL_STOP; } -static int stop_callback(struct nl_msg *msg, void *arg __unused) +static int stop_callback(struct nl_msg *msg, void *arg __maybe_unused) { struct nlmsghdr *nlh = nlmsg_hdr(msg); int *error = nlmsg_data(nlh); @@ -345,7 +345,7 @@ static const int routing_algos_mandatory[] = { BATADV_ATTR_ALGO_NAME, }; -static int routing_algos_callback(struct nl_msg *msg, void *arg __unused) +static int routing_algos_callback(struct nl_msg *msg, void *arg __maybe_unused) { struct nlattr *attrs[BATADV_ATTR_MAX+1]; struct nlmsghdr *nlh = nlmsg_hdr(msg); @@ -1286,7 +1286,7 @@ int netlink_print_bla_backbone(char *mesh_iface, char *orig_iface, int read_opts bla_backbone_callback); } -static int nlquery_error_cb(struct sockaddr_nl *nla __unused, +static int nlquery_error_cb(struct sockaddr_nl *nla __maybe_unused, struct nlmsgerr *nlerr, void *arg) { struct nlquery_opts *query_opts = arg; diff --git a/tp_meter.c b/tp_meter.c index 43c19da..a402e45 100644 --- a/tp_meter.c +++ b/tp_meter.c @@ -66,7 +66,7 @@ struct tp_cookie { uint32_t cookie; }; -static int tpmeter_nl_print_error(struct sockaddr_nl *nla __unused, +static int tpmeter_nl_print_error(struct sockaddr_nl *nla __maybe_unused, struct nlmsgerr *nlerr, void *arg) { @@ -236,7 +236,8 @@ out: return err; } -static int no_seq_check(struct nl_msg *msg __unused, void *arg __unused) +static int no_seq_check(struct nl_msg *msg __maybe_unused, + void *arg __maybe_unused) { return NL_OK; }

1 0

[batctl] maint, next: batctl: optchar variable uses wrong type (e397137)
by postmaster＠open-mesh.org 18 Oct '16

18 Oct '16

Repository : ssh://git@open-mesh.org/batctl On branches: maint,next >--------------------------------------------------------------- commit e397137aa9f4417ec21b4ba3db59b4f4e55b72fd Author: Andreas Pape <APape(a)phoenixcontact.com> Date: Thu Sep 15 10:41:00 2016 +0200 batctl: optchar variable uses wrong type The variable "optchar" used char instead of int leading to a non working batctl tp command on some platforms. These platforms are using ABIs with unsigned as default char type. getopt will return a negative value whenever it is finished parsing. But these platforms will then store it in an unsigned char and thus are not able to interpret later as end of the parsing loop (-1). The tpmeter code will therefore always print the usage information and terminate batctl with an error code. Signed-off-by: Andreas Pape <apape(a)phoenixcontact.com> [sven(a)narfation.org: Replaced commit message] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- e397137aa9f4417ec21b4ba3db59b4f4e55b72fd tp_meter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tp_meter.c b/tp_meter.c index a402e45..f95b839 100644 --- a/tp_meter.c +++ b/tp_meter.c @@ -396,7 +396,7 @@ int tp_meter(char *mesh_iface, int argc, char **argv) int ret = EXIT_FAILURE; int found_args = 1, read_opt = USE_BAT_HOSTS; uint32_t time = 0; - char optchar; + int optchar; struct nl_sock *listen_sock = NULL; struct tp_result result = { .error = 0,

1 0

[batman-adv] master, next: Merge branch 'maint' into next (01e5b85)
by postmaster＠open-mesh.org 18 Oct '16

18 Oct '16

Repository : ssh://git@open-mesh.org/batman-adv On branches: master,next >--------------------------------------------------------------- commit 01e5b859b7ce3c779e52070dc45b845c5b052561 Merge: 801d51e fcf6a3a Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Oct 18 13:03:05 2016 +0200 Merge branch 'maint' into next >--------------------------------------------------------------- 01e5b859b7ce3c779e52070dc45b845c5b052561 net/batman-adv/log.h | 2 +- net/batman-adv/originator.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[batman-adv] master: Merge branch 'next' (b9b8345)
by postmaster＠open-mesh.org 18 Oct '16

18 Oct '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit b9b834585eb8e4c0a6bfe2903e88a1962627dddb Merge: 917539e 01e5b85 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Oct 18 13:03:33 2016 +0200 Merge branch 'next' >--------------------------------------------------------------- b9b834585eb8e4c0a6bfe2903e88a1962627dddb .gitignore | 10 ++++------ Makefile | 32 ++++++++++++++++++++++++++++---- compat-include/net/genetlink.h | 6 ++++++ compat-patches/README | 23 +++++++++++++++++++++++ compat-patches/replacements.sh | 8 ++++++++ compat-sources/Makefile | 6 +++--- net/batman-adv/debugfs.h | 2 -- net/batman-adv/log.h | 2 +- net/batman-adv/netlink.c | 4 ++-- net/batman-adv/originator.c | 2 +- 10 files changed, 76 insertions(+), 19 deletions(-)

1 0

[batman-adv] master, next: batman-adv: Introduce compat-patches support (66ac14a)
by postmaster＠open-mesh.org 18 Oct '16

18 Oct '16

Repository : ssh://git@open-mesh.org/batman-adv On branches: master,next >--------------------------------------------------------------- commit 66ac14a09445b6066de6a8ae4382d8f981466ae3 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Oct 9 08:57:28 2016 +0200 batman-adv: Introduce compat-patches support compat-includes/compat.h can usually be used to solve compatibility problems with older kernels. This works well for functions, defines/enums and sometimes even structures that were introduced. But this can fail when structs changed. Some of these can be solved in crude ways but sometimes it is unavoidable to have a version specific code. Unfortunately, this kind of code is not acceptable in the kernel and thus the compat infrastructure of the external module has to do add it automatically before the source is compiled. This process works by creating a build directory which is prefilled with the source from net/batman-adv/. The patches from compat-patches/ will be applied on top of this copy and then the code is compiled. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 66ac14a09445b6066de6a8ae4382d8f981466ae3 .gitignore | 10 ++++------ Makefile | 31 +++++++++++++++++++++++++++---- compat-patches/README | 23 +++++++++++++++++++++++ compat-sources/Makefile | 6 +++--- 4 files changed, 57 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 4c03561..15a99aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,8 @@ +/build/ /compat-autoconf.h /compat-autoconf.h.tmp /compat-sources/**/.* /compat-sources/**/*.o -/net/batman-adv/.* -/net/batman-adv/batman-adv.ko -/net/batman-adv/batman-adv.mod.c -/net/batman-adv/modules.order -/net/batman-adv/Module.symvers -/net/batman-adv/*.o +/modules.order +/Module.symvers +/.tmp_versions diff --git a/Makefile b/Makefile index d42bb56..b105290 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,7 @@ export CONFIG_BATMAN_ADV_MCAST=y export CONFIG_BATMAN_ADV_BATMAN_V=n PWD:=$(shell pwd) +BUILD_DIR=$(PWD)/build KERNELPATH ?= /lib/modules/$(shell uname -r)/build # sanity check: does KERNELPATH exist? ifeq ($(shell cd $(KERNELPATH) && pwd),) @@ -41,6 +42,14 @@ endif export KERNELPATH RM ?= rm -f +MKDIR := mkdir -p +PATCH_FLAGS = --batch --fuzz=0 --forward --strip=1 --unified --version-control=never -g0 --remove-empty-files --no-backup-if-mismatch --reject-file=- +PATCH := patch $(PATCH_FLAGS) -i +CP := cp -fpR + +SOURCE = $(wildcard net/batman-adv/*.[ch]) net/batman-adv/Makefile +SOURCE_BUILD = $(wildcard $(BUILD_DIR)/net/batman-adv/*.[ch]) $(BUILD_DIR)/net/batman-adv/Makefile +SOURCE_STAMP = $(BUILD_DIR)/net/batman-adv/.compat-prepared REVISION= $(shell if [ -d "$(PWD)/.git" ]; then \ echo $$(git --git-dir="$(PWD)/.git" describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ @@ -57,7 +66,7 @@ endif include $(PWD)/compat-sources/Makefile -obj-y += net/batman-adv/ +obj-y += build/net/batman-adv/ export batman-adv-y @@ -76,18 +85,32 @@ BUILD_FLAGS := \ CONFIG_BATMAN_ADV_BATMAN_V=$(CONFIG_BATMAN_ADV_BATMAN_V) \ INSTALL_MOD_DIR=updates/ -all: config +all: config $(SOURCE_STAMP) $(MAKE) -C $(KERNELPATH) $(BUILD_FLAGS) modules clean: $(RM) compat-autoconf.h* - $(MAKE) -C $(KERNELPATH) $(BUILD_FLAGS) clean + $(RM) -r $(BUILD_DIR) -install: config +install: config $(SOURCE_STAMP) $(MAKE) -C $(KERNELPATH) $(BUILD_FLAGS) modules_install depmod -a config: $(PWD)/gen-compat-autoconf.sh $(PWD)/compat-autoconf.h +$(SOURCE_STAMP): $(SOURCE) compat-patches/* + $(MKDIR) $(BUILD_DIR)/net/batman-adv/ + @$(RM) $(SOURCE_BUILD) + @$(CP) $(SOURCE) $(BUILD_DIR)/net/batman-adv/ + @set -e; \ + patches="$$(ls -1 compat-patches/|grep '.patch$$'|sort)"; \ + for i in $${patches}; do \ + echo ' COMPAT_PATCH '$${i};\ + cd $(BUILD_DIR); \ + $(PATCH) ../compat-patches/$${i}; \ + cd - > /dev/null; \ + done + touch $(SOURCE_STAMP) + .PHONY: all clean install config diff --git a/compat-patches/README b/compat-patches/README new file mode 100644 index 0000000..3bbddb3 --- /dev/null +++ b/compat-patches/README @@ -0,0 +1,23 @@ +WARNING +======= + +Please avoid using the compat-patches/ to implement support for old kernels. +This should be the last resort. + + * it is nearly always possible to use compat-includes/ to do the same with a + lot less problems + + * maintaining these patches is *censored* + +GENERATING A PATCH +================== + +If it not possible to avoid a patch then please make the patch as small as +possible. Even refactor the code which has to be patched to reduce the +size/number of the changes. + +Please use git-format-patches to generate them and order same inside via the +XXXX- prefix of the patch name. + + git format-patch --abbrev=7 -U3 --diff-algorithm=histogram --no-signature \ + --format=format:'From: %an <%ae>%nDate: %aD%nSubject: [PATCH] %B' -1 diff --git a/compat-sources/Makefile b/compat-sources/Makefile index a45c202..c8bae49 100644 --- a/compat-sources/Makefile +++ b/compat-sources/Makefile @@ -1,3 +1,3 @@ -batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += ../../compat-sources/net/core/skbuff.o -batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += ../../compat-sources/net/ipv4/igmp.o -batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += ../../compat-sources/net/ipv6/mcast_snoop.o +batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += ../../../compat-sources/net/core/skbuff.o +batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += ../../../compat-sources/net/ipv4/igmp.o +batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += ../../../compat-sources/net/ipv6/mcast_snoop.o

1 0

[batman-adv] master, next: batman-adv: make netlink attributes const (801d51e)
by postmaster＠open-mesh.org 18 Oct '16

18 Oct '16

Repository : ssh://git@open-mesh.org/batman-adv On branches: master,next >--------------------------------------------------------------- commit 801d51e947da78bc542b30ee8e6971f941f8f66b Author: stephen hemminger <stephen(a)networkplumber.org> Date: Sun Oct 9 08:57:30 2016 +0200 batman-adv: make netlink attributes const Signed-off-by: Stephen Hemminger <stephen(a)networkplumber.org> [sven(a)narfation.org: Add compat-patch script] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 801d51e947da78bc542b30ee8e6971f941f8f66b compat-include/net/genetlink.h | 6 ++++++ compat-patches/replacements.sh | 5 +++++ net/batman-adv/netlink.c | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h index b48e37a..72a8991 100644 --- a/compat-include/net/genetlink.h +++ b/compat-include/net/genetlink.h @@ -152,6 +152,12 @@ batadv_genl_register_family_with_ops_grps(struct genl_family *family, return batadv_genl_register_family(family); } +#define __genl_const + +#else + +#define __genl_const const + #endif /* < KERNEL_VERSION(3, 13, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_NET_GENETLINK_H_ */ diff --git a/compat-patches/replacements.sh b/compat-patches/replacements.sh index c7875c0..669b0ff 100755 --- a/compat-patches/replacements.sh +++ b/compat-patches/replacements.sh @@ -1,3 +1,8 @@ #! /bin/sh set -e + +# for kernel < 3.13 to make netlink compat code work +sed -i \ + -e 's/^static const struct genl_multicast_group batadv_netlink_mcgrps/static __genl_const struct genl_multicast_group batadv_netlink_mcgrps/' \ + build/net/batman-adv/netlink.c diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 18831e7..64cb6ac 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -62,11 +62,11 @@ enum batadv_netlink_multicast_groups { BATADV_NL_MCGRP_TPMETER, }; -static struct genl_multicast_group batadv_netlink_mcgrps[] = { +static const struct genl_multicast_group batadv_netlink_mcgrps[] = { [BATADV_NL_MCGRP_TPMETER] = { .name = BATADV_NL_MCAST_GROUP_TPMETER }, }; -static struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { +static const struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { [BATADV_ATTR_VERSION] = { .type = NLA_STRING }, [BATADV_ATTR_ALGO_NAME] = { .type = NLA_STRING }, [BATADV_ATTR_MESH_IFINDEX] = { .type = NLA_U32 },

1 0

[batman-adv] master: batman-adv: remove unsed argument from batadv_dbg_arp() function (917539e)
by postmaster＠open-mesh.org 18 Oct '16

18 Oct '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 917539ed1ca1b7e6046b44adc35d8264f33e20fb Author: Antonio Quartulli <a(a)unstable.cc> Date: Sun Sep 25 08:46:36 2016 +0800 batman-adv: remove unsed argument from batadv_dbg_arp() function The argument "type" passed to the batadv_dbg_arp() function is never used. Remove it. Signed-off-by: Antonio Quartulli <a(a)unstable.cc> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 917539ed1ca1b7e6046b44adc35d8264f33e20fb net/batman-adv/distributed-arp-table.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index e257efd..cbb4f32 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -369,12 +369,11 @@ out: * batadv_dbg_arp - print a debug message containing all the ARP packet details * @bat_priv: the bat priv with all the soft interface information * @skb: ARP packet - * @type: ARP type * @hdr_size: size of the possible header before the ARP packet * @msg: message to print together with the debugging information */ static void batadv_dbg_arp(struct batadv_priv *bat_priv, struct sk_buff *skb, - u16 type, int hdr_size, char *msg) + int hdr_size, char *msg) { struct batadv_unicast_4addr_packet *unicast_4addr_packet; struct batadv_bcast_packet *bcast_pkt; @@ -441,7 +440,7 @@ static void batadv_dbg_arp(struct batadv_priv *bat_priv, struct sk_buff *skb, #else static void batadv_dbg_arp(struct batadv_priv *bat_priv, struct sk_buff *skb, - u16 type, int hdr_size, char *msg) + int hdr_size, char *msg) { } @@ -983,8 +982,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, if (type != ARPOP_REQUEST) goto out; - batadv_dbg_arp(bat_priv, skb, type, hdr_size, - "Parsing outgoing ARP REQUEST"); + batadv_dbg_arp(bat_priv, skb, hdr_size, "Parsing outgoing ARP REQUEST"); ip_src = batadv_arp_ip_src(skb, hdr_size); hw_src = batadv_arp_hw_src(skb, hdr_size); @@ -1075,8 +1073,7 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, ip_src = batadv_arp_ip_src(skb, hdr_size); ip_dst = batadv_arp_ip_dst(skb, hdr_size); - batadv_dbg_arp(bat_priv, skb, type, hdr_size, - "Parsing incoming ARP REQUEST"); + batadv_dbg_arp(bat_priv, skb, hdr_size, "Parsing incoming ARP REQUEST"); batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid); @@ -1149,8 +1146,7 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv, if (type != ARPOP_REPLY) return; - batadv_dbg_arp(bat_priv, skb, type, hdr_size, - "Parsing outgoing ARP REPLY"); + batadv_dbg_arp(bat_priv, skb, hdr_size, "Parsing outgoing ARP REPLY"); hw_src = batadv_arp_hw_src(skb, hdr_size); ip_src = batadv_arp_ip_src(skb, hdr_size); @@ -1195,8 +1191,7 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, if (type != ARPOP_REPLY) goto out; - batadv_dbg_arp(bat_priv, skb, type, hdr_size, - "Parsing incoming ARP REPLY"); + batadv_dbg_arp(bat_priv, skb, hdr_size, "Parsing incoming ARP REPLY"); hw_src = batadv_arp_hw_src(skb, hdr_size); ip_src = batadv_arp_ip_src(skb, hdr_size);

1 0

[batman-adv] master, next: batman-adv: Use simple script to patch minor compat problems (17018a9)
by postmaster＠open-mesh.org 18 Oct '16

18 Oct '16

Repository : ssh://git@open-mesh.org/batman-adv On branches: master,next >--------------------------------------------------------------- commit 17018a99bc68f49ea1da199c9c1b290e3b2c42ed Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Oct 9 08:57:29 2016 +0200 batman-adv: Use simple script to patch minor compat problems Unified diff base patches have the problem that they fix only a single line and depend on the surrounding. This approach can fail relative often when the surrounding code will be changed often. Thus semantic patches (like spatch from coccinelle) or simple find+replace scripts are better for this approach. Introduce a simple script file which will store these kind of find+replace instructions. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 17018a99bc68f49ea1da199c9c1b290e3b2c42ed Makefile | 3 ++- compat-patches/replacements.sh | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b105290..7ef2569 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ install: config $(SOURCE_STAMP) config: $(PWD)/gen-compat-autoconf.sh $(PWD)/compat-autoconf.h -$(SOURCE_STAMP): $(SOURCE) compat-patches/* +$(SOURCE_STAMP): $(SOURCE) compat-patches/* compat-patches/replacements.sh $(MKDIR) $(BUILD_DIR)/net/batman-adv/ @$(RM) $(SOURCE_BUILD) @$(CP) $(SOURCE) $(BUILD_DIR)/net/batman-adv/ @@ -111,6 +111,7 @@ $(SOURCE_STAMP): $(SOURCE) compat-patches/* $(PATCH) ../compat-patches/$${i}; \ cd - > /dev/null; \ done + compat-patches/replacements.sh touch $(SOURCE_STAMP) .PHONY: all clean install config diff --git a/compat-patches/replacements.sh b/compat-patches/replacements.sh new file mode 100755 index 0000000..c7875c0 --- /dev/null +++ b/compat-patches/replacements.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +set -e

1 0

[batman-adv] master: batman-adv: Allow selecting BATMAN V if CFG80211 is not built (aeb194c)
by postmaster＠open-mesh.org 18 Oct '16

18 Oct '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit aeb194c3a45fef9cc094e3509066bb2fa6627c05 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Tue Sep 20 15:59:17 2016 +0200 batman-adv: Allow selecting BATMAN V if CFG80211 is not built With the new stub for cfg80211_get_station(), we can now build the BATMAN V protocol even with a kernel that was built without any wireless support. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- aeb194c3a45fef9cc094e3509066bb2fa6627c05 compat-include/net/cfg80211.h | 24 ++++++++++++++++++++++++ net/batman-adv/Kconfig | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/compat-include/net/cfg80211.h b/compat-include/net/cfg80211.h new file mode 100644 index 0000000..8dbbf0e --- /dev/null +++ b/compat-include/net/cfg80211.h @@ -0,0 +1,24 @@ +#ifndef _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_ +#define _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_ + +#include <linux/version.h> +#include_next <net/cfg80211.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) + +#if !IS_ENABLED(CONFIG_CFG80211) + +#define cfg80211_get_station(dev, mac_addr, sinfo) \ + batadv_cfg80211_get_station(dev, mac_addr, sinfo) + +static inline int batadv_cfg80211_get_station(struct net_device *dev, + const u8 *mac_addr, + struct station_info *sinfo) +{ + return -ENOENT; +} +#endif + +#endif /* < KERNEL_VERSION(4, 8, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_ */ diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index f20742c..b73b96a 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -17,7 +17,7 @@ config BATMAN_ADV config BATMAN_ADV_BATMAN_V bool "B.A.T.M.A.N. V protocol (experimental)" - depends on BATMAN_ADV && CFG80211=y || (CFG80211=m && BATMAN_ADV=m) + depends on BATMAN_ADV && !(CFG80211=m && BATMAN_ADV=y) default n help This option enables the B.A.T.M.A.N. V protocol, the successor

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits October 2016