[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20161108, updated. batadv-next-for-davem-20161108
by postmaster@open-mesh.org
The annotated tag, batadv-next-for-davem-20161108 has been updated
to 993cf46d7e4e6559be44d7e97f34f10a2593f3de (tag)
from fc6d8bb3039bcf19e0472eacdf2143711a6516df (which is now obsolete)
tagging 33581cefe4d182d99e9f8a66156507b06e7c9265 (commit)
replaces v4.8
tagged by Simon Wunderlich
on Tue Nov 8 17:39:34 2016 +0100
- Shortlog ------------------------------------------------------------
This feature and cleanup patchset includes the following changes:
- netlink and code cleanups by Sven Eckelmann (3 patches)
- Cleanup and minor fixes by Linus Luessing (3 patches)
- Speed up multicast update intervals, by Linus Luessing
- Avoid (re)broadcast in meshes for some easy cases,
by Linus Luessing
- Clean up tx return state handling, by Sven Eckelmann (6 patches)
- Fix some special mac address handling cases, by Sven Eckelmann
(3 patches)
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdBQJYIf/PFhxzd0BzaW1vbnd1bmRlcmxpY2guZGUACgkQoSvjmEKS
nqHEQRAAgRUuv9K7JPDNCnAEU8E/HgnatnsohlNlZ3ltpfOdVu07pmQmCwmJq99I
/Gei+2yF2AXGUNUuVglKcaslzudMkaiZIgAQ8QwpwFoYFWOUP93O2eeNk9ELjlNI
eHUpYt0Iw1wkn7HVBkzcq57ROMHbuj/DnLRgwEu0kDHOWrGJWxFvABtEA+R1/mBa
BsZ61J211YR1NHGyUUDUI8ZvBUIiN5qYhkLE+ZAkTR/y30kFeN2nFe9emCS7jDjo
v1wU3nSfYV+7riQTCPvSZTUDY/5Y3V8Y/CZ72kQdf5gurAv5MIX1YzQxW2+S7byI
nMYf4vCRhL8SZcDmcQh4Xo8fRuAuuLBU7KZzFUvXW9AtmYQbONdW+0rQ2knpCfmq
g1AVzvVkZfcFE7HFKMhC4DG1cv6TlUGuXZ3DJuHpkcN6Ed7h+IqFWU8d1yDLKWUd
DJF0dczbGfMFCEZV12hh0Briv+rXe4eKN0ik0ham0XLbcgWiZ68EtZ8Ulp0X991O
nEXkGuyWtjaEuo1/UjvgI3rEZljr1kIThf962sQC45WB5gwtUsXtI5NlKRz20zFu
2fJEO2H4FcOp7IftMBF0qwaWaYt0UQ8T7UYrRqBswyhbuYTXFF1VPhncnRXp/8jZ
M/ri2/3VmWiOv2B4Acj5VETY5PRgt2CyUPwdu9V0luFwI51RaxM=
=oC0V
-----END PGP SIGNATURE-----
Andrew Lunn (5):
batman-adv: Handle parent interfaces in a different netns
batman-adv: Suppress debugfs entries for netns's
batman-adv: add B.A.T.M.A.N. IV bat_gw_dump implementations
batman-adv: add B.A.T.M.A.N. Dump BLA claims via netlink
batman-adv: Indicate netlink socket can be used with netns.
Antonio Quartulli (5):
batman-adv: make the GW selection class algorithm specific
batman-adv: make GW election code protocol specific
batman-adv: B.A.T.M.A.N. V - implement GW selection logic
batman-adv: disable sysfs knobs when GW-mode is not implemented
batman-adv: remove unsed argument from batadv_dbg_arp() function
David S. Miller (2):
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge tag 'batadv-next-for-davem-20161027' of git://git.open-mesh.org/linux-merge
Jarod Wilson (1):
net: use core MTU range checking in misc drivers
Johannes Berg (3):
genetlink: no longer support using static family IDs
genetlink: statically initialize families
genetlink: mark families as __ro_after_init
Linus Lüssing (10):
batman-adv: Remove unused primary_if and bat_priv variables
batman-adv: Introduce forward packet creation helper
batman-adv: Use bitwise instead of arithmetic operator for flags
batman-adv: fix batadv_forw_packet kerneldoc for list attribute
batman-adv: Allow selecting BATMAN V if CFG80211 is not built
batman-adv: Add wrapper for ARP reply creation
batman-adv: Remove unnecessary lockdep in batadv_mcast_mla_list_free
batman-adv: Remove unused skb_reset_mac_header()
batman-adv: Use own timer for multicast TT and TVLV updates
batman-adv: Simple (re)broadcast avoidance
Markus Elfring (1):
batman-adv: Less function calls in batadv_is_ap_isolated() after error detection
Markus Pargmann (1):
batman-adv: iv_ogm, Reduce code duplication
Masahiro Yamada (1):
treewide: remove redundant #include <linux/kconfig.h>
Matthias Schiffer (6):
batman-adv: netlink: add routing_algo query
batman-adv: netlink: hardif query
batman-adv: netlink: add translation table query
batman-adv: netlink: add originator and neighbor table queries
batman-adv: add B.A.T.M.A.N. IV bat_{orig, neigh}_dump implementations
batman-adv: add B.A.T.M.A.N. V bat_{orig, neigh}_dump implementations
Simon Wunderlich (3):
batman-adv: Start new development cycle
batman-adv: add backbone table netlink support
batman-adv: Start new development cycle
Sven Eckelmann (53):
batman-adv: Document optional batadv_algo_ops
batman-adv: Define module rtnl link name
batman-adv: Modify mesh_iface outside sysfs context
batman-adv: Revert "postpone sysfs removal when unregistering"
batman-adv: Avoid sysfs name collision for netns moves
batman-adv: use kmem_cache for translation table
batman-adv: Remove orig_node reference handling from send_skb_unicast
batman-adv: Fix consistency of update route messages
batman-adv: Provide TTVN in the mesh_info netlink msg
batman-adv: netlink: add gateway table queries
batman-adv: add B.A.T.M.A.N. V bat_gw_dump implementations
batman-adv: Provide bla group in the mesh_info netlink msg
batman-adv: Place kref_get for orig_node_vlan near use
batman-adv: Place kref_get for orig_ifinfo near use
batman-adv: Place kref_get for tt_orig_list_entry near use
batman-adv: Place kref_get for neigh_ifinfo near use
batman-adv: Place kref_get for neigh_node near use
batman-adv: Place kref_get for orig_node near use
batman-adv: Place kref_get for tt_local_entry near use
batman-adv: Place kref_get for tt_common near use
batman-adv: Place kref_get for bla_claim near use
batman-adv: Place kref_get for bla_backbone_gw near use
batman-adv: Place kref_get for dat_entry near use
batman-adv: Place kref_get for gw_node near use
batman-adv: Place kref_get for hard_iface near use
batman-adv: Place kref_get for softif_vlan near use
batman-adv: Place kref_get for nc_node near use
batman-adv: Place kref_get for nc_path near use
batman-adv: Place kref_get for tvlv_container near use
batman-adv: Place kref_get for tvlv_handler near use
batman-adv: Keep batadv netdev when hardif disappears
batman-adv: Allow to disable debugfs support
batman-adv: Remove unused function batadv_hash_delete
batman-adv: Move batadv_sum_counter to soft-interface.c
batman-adv: Remove unused batadv_icmp_user_cmd_type
batman-adv: Remove needless init of variables on stack
batman-adv: Use proper name for fragments list head
batman-adv: Use proper name for gateway list head
batman-adv: Use octal permissions instead of macros
batman-adv: Avoid precedence issues in macros
batman-adv: Revert "use core MTU range checking in misc drivers"
batman-adv: Introduce missing headers for genetlink restructure
batman-adv: Mark batadv_netlink_ops as const
batman-adv: Close two alignment holes in batadv_hard_iface
batman-adv: use consume_skb for non-dropped packets
batman-adv: Count all non-success TX packets as dropped
batman-adv: Consume skb in batadv_frag_send_packet
batman-adv: Consume skb in batadv_send_skb_to_orig
batman-adv: Consume skb in receive handlers
batman-adv: Remove dev_queue_xmit return code exception
batman-adv: Disallow mcast src address for data frames
batman-adv: Disallow zero and mcast src address for mgmt frames
batman-adv: Reject unicast packet with zero/mcast dst address
kbuild test robot (1):
batman-adv: fix boolreturn.cocci warnings
stephen hemminger (1):
batman: make netlink attributes const
-----------------------------------------------------------------------
--
linux integration
5 years, 7 months
[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20161108, created. batadv-next-for-davem-20161108
by postmaster@open-mesh.org
The annotated tag, batadv-next-for-davem-20161108 has been created
at fc6d8bb3039bcf19e0472eacdf2143711a6516df (tag)
tagging b94b9eaadd586361b8cba9c30eb18cb1344ff02a (commit)
replaces v4.8
tagged by Simon Wunderlich
on Tue Nov 8 17:36:44 2016 +0100
- Shortlog ------------------------------------------------------------
This feature and cleanup patchset includes the following changes:
- netlink and code cleanups by Sven Eckelmann (3 patches)
- Cleanup and minor fixes by Linus Luessing (3 patches)
- Speed up multicast update intervals, by Linus Luessing
- Avoid (re)broadcast in meshes for some easy cases,
by Linus Luessing
- Clean up tx return state handling, by Sven Eckelmann (6 patches)
- Fix some special mac address handling cases, by Sven Eckelmann
(3 patches)
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdBQJYIf8xFhxzd0BzaW1vbnd1bmRlcmxpY2guZGUACgkQoSvjmEKS
nqFuLw/+OYD3Xd2taY6MhrM5RLRMmfn6cIeqgBIION1MrX4swuc1SH+mpSSAwvdM
c6Xj9ReGdQDK7a2trig/J4+Buwf1U9lYxbqXHOuePQmAhy9Q+PHFw4O69TbdSl9Z
QKYdxL5hhafuT8RpXtSmpm1M6XzkjxlMsU7DhhByVco8UeaMY3g3oUMtmD2iao1C
bamxtsMFmDjwhqIjXARzcVVvNjbq5GaxDQEAtJVhsEshZNeWwfe6ull6ACB3kDwi
ma9EhL1nOX2EM6BtUVnKmEZ80K0tNoYnE//reWnGm0Xuuxhrrs8u7QfNjzCm9l93
/uN+Zn47rZrARLfSJ58+N7vmrWG4R2t5tj/AAeVymyszQzdwKyiM4v3by5fFehfa
xmzsA3egk7+ugJcjid8714ow3P7sx7LRnFppivbR6DwPZpwga6YvZO9tSZilMSlx
77p4piY/81JVLG8msDVm7J/v2eGlgZAHQXIeVwBoFDtDIJVObmA7qZ/bAFmfxyEK
8ZnN3ivR/GL+gjWOslZC4entfrj7F982365pZjuXTTNz1QUbQLLZeBVmI6BJ9cjk
6smgWMWaIzdW9NVFwxNsh5mSWq/QvsCBk0IMdRnb2YveLrBggDpuK9lIjTkoNA0W
2LRIIAs4eLs1ZcpQOktdnTeV9zFrySC2Gnepc4oVZrz/7Xw2hHI=
=QUZw
-----END PGP SIGNATURE-----
Andrew Lunn (5):
batman-adv: Handle parent interfaces in a different netns
batman-adv: Suppress debugfs entries for netns's
batman-adv: add B.A.T.M.A.N. IV bat_gw_dump implementations
batman-adv: add B.A.T.M.A.N. Dump BLA claims via netlink
batman-adv: Indicate netlink socket can be used with netns.
Antonio Quartulli (5):
batman-adv: make the GW selection class algorithm specific
batman-adv: make GW election code protocol specific
batman-adv: B.A.T.M.A.N. V - implement GW selection logic
batman-adv: disable sysfs knobs when GW-mode is not implemented
batman-adv: remove unsed argument from batadv_dbg_arp() function
David S. Miller (2):
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge tag 'batadv-next-for-davem-20161027' of git://git.open-mesh.org/linux-merge
Jarod Wilson (1):
net: use core MTU range checking in misc drivers
Johannes Berg (3):
genetlink: no longer support using static family IDs
genetlink: statically initialize families
genetlink: mark families as __ro_after_init
Linus Lüssing (10):
batman-adv: Remove unused primary_if and bat_priv variables
batman-adv: Introduce forward packet creation helper
batman-adv: Use bitwise instead of arithmetic operator for flags
batman-adv: fix batadv_forw_packet kerneldoc for list attribute
batman-adv: Allow selecting BATMAN V if CFG80211 is not built
batman-adv: Add wrapper for ARP reply creation
batman-adv: Remove unnecessary lockdep in batadv_mcast_mla_list_free
batman-adv: Remove unused skb_reset_mac_header()
batman-adv: Use own timer for multicast TT and TVLV updates
batman-adv: Simple (re)broadcast avoidance
Marek Lindner (3):
batman-adv: refactor wifi interface detection
batman-adv: additional checks for virtual interfaces on top of WiFi
batman-adv: retrieve B.A.T.M.A.N. V WiFi neighbor stats from real interface
Markus Elfring (1):
batman-adv: Less function calls in batadv_is_ap_isolated() after error detection
Markus Pargmann (1):
batman-adv: iv_ogm, Reduce code duplication
Masahiro Yamada (1):
treewide: remove redundant #include <linux/kconfig.h>
Matthias Schiffer (6):
batman-adv: netlink: add routing_algo query
batman-adv: netlink: hardif query
batman-adv: netlink: add translation table query
batman-adv: netlink: add originator and neighbor table queries
batman-adv: add B.A.T.M.A.N. IV bat_{orig, neigh}_dump implementations
batman-adv: add B.A.T.M.A.N. V bat_{orig, neigh}_dump implementations
Simon Wunderlich (3):
batman-adv: Start new development cycle
batman-adv: add backbone table netlink support
batman-adv: Start new development cycle
Sven Eckelmann (57):
batman-adv: Document optional batadv_algo_ops
batman-adv: Define module rtnl link name
batman-adv: Modify mesh_iface outside sysfs context
batman-adv: Revert "postpone sysfs removal when unregistering"
batman-adv: Avoid sysfs name collision for netns moves
batman-adv: use kmem_cache for translation table
batman-adv: Remove orig_node reference handling from send_skb_unicast
batman-adv: Fix consistency of update route messages
batman-adv: Provide TTVN in the mesh_info netlink msg
batman-adv: netlink: add gateway table queries
batman-adv: add B.A.T.M.A.N. V bat_gw_dump implementations
batman-adv: Provide bla group in the mesh_info netlink msg
batman-adv: Place kref_get for orig_node_vlan near use
batman-adv: Place kref_get for orig_ifinfo near use
batman-adv: Place kref_get for tt_orig_list_entry near use
batman-adv: Place kref_get for neigh_ifinfo near use
batman-adv: Place kref_get for neigh_node near use
batman-adv: Place kref_get for orig_node near use
batman-adv: Place kref_get for tt_local_entry near use
batman-adv: Place kref_get for tt_common near use
batman-adv: Place kref_get for bla_claim near use
batman-adv: Place kref_get for bla_backbone_gw near use
batman-adv: Place kref_get for dat_entry near use
batman-adv: Place kref_get for gw_node near use
batman-adv: Place kref_get for hard_iface near use
batman-adv: Place kref_get for softif_vlan near use
batman-adv: Place kref_get for nc_node near use
batman-adv: Place kref_get for nc_path near use
batman-adv: Place kref_get for tvlv_container near use
batman-adv: Place kref_get for tvlv_handler near use
batman-adv: Keep batadv netdev when hardif disappears
batman-adv: Allow to disable debugfs support
batman-adv: Remove unused function batadv_hash_delete
batman-adv: Move batadv_sum_counter to soft-interface.c
batman-adv: Remove unused batadv_icmp_user_cmd_type
batman-adv: Remove needless init of variables on stack
batman-adv: Use proper name for fragments list head
batman-adv: Use proper name for gateway list head
batman-adv: Use octal permissions instead of macros
batman-adv: Avoid precedence issues in macros
batman-adv: Revert "use core MTU range checking in misc drivers"
batman-adv: Introduce missing headers for genetlink restructure
batman-adv: Mark batadv_netlink_ops as const
batman-adv: Close two alignment holes in batadv_hard_iface
batman-adv: use consume_skb for non-dropped packets
batman-adv: Count all non-success TX packets as dropped
batman-adv: Consume skb in batadv_frag_send_packet
batman-adv: Consume skb in batadv_send_skb_to_orig
batman-adv: Consume skb in receive handlers
batman-adv: Remove dev_queue_xmit return code exception
batman-adv: Disallow mcast src address for data frames
batman-adv: Disallow zero and mcast src address for mgmt frames
batman-adv: Reject unicast packet with zero/mcast dst address
batman-adv: Return non-const ptr in batadv_getlink_net
batman-adv: Cache the type of wifi device for each hardif
batman-adv: Update wifi flags on upper link change
batman-adv: Add module alias for batadv netlink family
kbuild test robot (1):
batman-adv: fix boolreturn.cocci warnings
stephen hemminger (1):
batman: make netlink attributes const
-----------------------------------------------------------------------
--
linux integration
5 years, 7 months
[alfred] master: alfred: Check batadv interfaces via netlink (2310c47)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/alfred
On branch : master
>---------------------------------------------------------------
commit 2310c47f0ad7aadff0adac6f9879bf849c3a6356
Author: Jean-Jacques Sarton <jj.sarton(a)t-online.de>
Date: Sun Nov 6 10:37:38 2016 +0100
alfred: Check batadv interfaces via netlink
alfred is checking the status of the mesh interface before it starts. The
mesh interface has to have accessible debugfs files "transtable_global" and
"originators" before alfred will accept it.
batman-adv will not create debugfs entries for network namespaces. Thus
this check has to be modified to first check via netlink if the interface
is providing the same information without debugfs. If it does then no check
for the debugfs files is necessary anymore.
Signed-off-by: Jean-Jacques Sarton <jj.sarton(a)t-online.de>
[sven(a)narfation.org: fixed commit message, mark debugfs function static,
fix whitespaces, fix unused init of variable, only fallback to debugfs on
EOPNOTSUPP, rewritten batadv_interface_check_netlink, fix return of
batadv_interface_check]
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
2310c47f0ad7aadff0adac6f9879bf849c3a6356
batadv_query.c | 16 +++++++++++++++-
netlink.c | 25 +++++++++++++++++++++++++
netlink.h | 1 +
3 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/batadv_query.c b/batadv_query.c
index a671b79..c17132f 100644
--- a/batadv_query.c
+++ b/batadv_query.c
@@ -136,7 +136,7 @@ int ipv6_to_mac(const struct in6_addr *addr, struct ether_addr *mac)
return 0;
}
-int batadv_interface_check(const char *mesh_iface)
+static int batadv_interface_check_debugfs(const char *mesh_iface)
{
char full_path[MAX_PATH + 1];
FILE *f;
@@ -166,6 +166,20 @@ int batadv_interface_check(const char *mesh_iface)
return 0;
}
+int batadv_interface_check(const char *mesh_iface)
+{
+ int ret;
+
+ enable_net_admin_capability(1);
+ ret = batadv_interface_check_netlink(mesh_iface);
+ enable_net_admin_capability(0);
+
+ if (ret == -EOPNOTSUPP)
+ ret = batadv_interface_check_debugfs(mesh_iface);
+
+ return ret;
+}
+
static int translate_mac_debugfs(const char *mesh_iface,
const struct ether_addr *mac,
struct ether_addr *mac_out)
diff --git a/netlink.c b/netlink.c
index 1b5695c..73fab28 100644
--- a/netlink.c
+++ b/netlink.c
@@ -365,3 +365,28 @@ int get_tq_netlink(const char *mesh_iface, const struct ether_addr *mac,
return 0;
}
+
+static int check_nlcmd_cb(struct nl_msg *msg __unused, void *arg __unused)
+{
+ return NL_STOP;
+}
+
+int batadv_interface_check_netlink(const char *mesh_iface)
+{
+ struct nlquery_opts opts = {
+ .err = 0,
+ };
+ int ret;
+
+ ret = netlink_query_common(mesh_iface, BATADV_CMD_GET_ORIGINATORS,
+ check_nlcmd_cb, &opts);
+ if (ret < 0)
+ return ret;
+
+ ret = netlink_query_common(mesh_iface, BATADV_CMD_GET_TRANSTABLE_GLOBAL,
+ check_nlcmd_cb, &opts);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
diff --git a/netlink.h b/netlink.h
index b08e872..9bc75a1 100644
--- a/netlink.h
+++ b/netlink.h
@@ -49,6 +49,7 @@ int translate_mac_netlink(const char *mesh_iface, const struct ether_addr *mac,
struct ether_addr *mac_out);
int get_tq_netlink(const char *mesh_iface, const struct ether_addr *mac,
uint8_t *tq);
+int batadv_interface_check_netlink(const char *mesh_iface);
extern struct nla_policy batadv_netlink_policy[];
5 years, 7 months
[batman-adv] master: batman-adv: Revert "Add support for coccinelle in compat-patches" (c941add)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit c941addb62c3763bb7fd308aba746a5cf6976763
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Oct 31 08:36:29 2016 +0100
batman-adv: Revert "Add support for coccinelle in compat-patches"
The coccinelle in Debian Jessie seems to be broken. It fails to parse
the patches and thus makes it impossible to use the out-of-tree
module in these systems. Therefore drop it for now.
This reverts commit cd6361c9f4ea19e1318c6549f863a21921154896.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
c941addb62c3763bb7fd308aba746a5cf6976763
Makefile | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile
index 67f1988..b852a17 100644
--- a/Makefile
+++ b/Makefile
@@ -40,19 +40,11 @@ ifeq ($(shell cd $(KERNELPATH) && pwd),)
$(warning $(KERNELPATH) is missing, please set KERNELPATH)
endif
-ifeq ($(origin SPATCH), undefined)
- SPATCH = spatch
- ifeq ($(shell which $(SPATCH) 2>/dev/null),)
- $(error $(SPATCH) (coccinelle) not found)
- endif
-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
-SPATCH_FLAGS := --in-place --relax-include-path --use-coccigrep --very-quiet
CP := cp -fpR
LN := ln -sf
@@ -114,17 +106,12 @@ $(SOURCE_STAMP): $(SOURCE) compat-patches/* compat-patches/replacements.sh
@$(RM) $(SOURCE_BUILD)
@$(CP) $(SOURCE) $(BUILD_DIR)/net/batman-adv/
@set -e; \
- patches="$$(ls -1 compat-patches/|grep -e '.patch$$' -e '.cocci$$'|sort)"; \
+ patches="$$(ls -1 compat-patches/|grep '.patch$$'|sort)"; \
for i in $${patches}; do \
- echo ' COMPAT_PATCH '$${i}; \
- if echo $${i}|grep '.patch$$'; then \
- cd $(BUILD_DIR); \
- $(PATCH) ../compat-patches/$${i}; \
- cd - > /dev/null; \
- fi; \
- if echo $${i}|grep '.cocci$$'; then echo $$(pwd); \
- $(SPATCH) $(SPATCH_FLAGS) --dir $(BUILD_DIR) --sp-file compat-patches/$${i} > /dev/null; \
- fi; \
+ echo ' COMPAT_PATCH '$${i};\
+ cd $(BUILD_DIR); \
+ $(PATCH) ../compat-patches/$${i}; \
+ cd - > /dev/null; \
done
compat-patches/replacements.sh
touch $(SOURCE_STAMP)
5 years, 7 months
[batman-adv] master: batman-adv: Revert "compat: Move netlink const compat to coccinelle" (d67fc94)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit d67fc9440d458aabce6c680ac3f0e7c9a06da301
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Oct 31 08:36:27 2016 +0100
batman-adv: Revert "compat: Move netlink const compat to coccinelle"
The coccinelle in Debian Jessie seems to be broken. It fails to parse
the patches and thus makes it impossible to use the out-of-tree
module in these systems. Therefore drop it for now.
This reverts commit 2f9f52d1dfc417201028cc65f91aaddc5eaf493a.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
d67fc9440d458aabce6c680ac3f0e7c9a06da301
Makefile | 3 ++-
compat-patches/0002-genl-const.INFO | 15 ---------------
compat-patches/0002-genl-const.cocci | 10 ----------
compat-patches/replacements.sh | 9 +++++++++
4 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/Makefile b/Makefile
index e9c499f..67f1988 100644
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,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/
@$(LN) ../Makefile $(BUILD_DIR)/Makefile
@$(RM) $(SOURCE_BUILD)
@@ -126,6 +126,7 @@ $(SOURCE_STAMP): $(SOURCE) compat-patches/*
$(SPATCH) $(SPATCH_FLAGS) --dir $(BUILD_DIR) --sp-file compat-patches/$${i} > /dev/null; \
fi; \
done
+ compat-patches/replacements.sh
touch $(SOURCE_STAMP)
.PHONY: all clean install config
diff --git a/compat-patches/0002-genl-const.INFO b/compat-patches/0002-genl-const.INFO
deleted file mode 100644
index 192c5c6..0000000
--- a/compat-patches/0002-genl-const.INFO
+++ /dev/null
@@ -1,15 +0,0 @@
-Newer kernels make generic netlink ops and multicast groups
-const, but older can't have that. We therefore introduce
-__genl_const, which can be defined depending on the kernel.
-
-What kernel versions require this?
-
-XXX: try to SmPLify
-
-The struct genl_ops gave the *option* to make it const via:
-mcgrof@ergon ~/linux (git::master)$ git describe --contains f84f771d9
-v3.13-rc1~33^2~32^2~2
-
-The struct genl_multicast_group was *forced* to be const via:
-mcgrof@ergon ~/linux (git::master)$ git describe --contains 2a94fe48f
-v3.13-rc1~33^2^2
diff --git a/compat-patches/0002-genl-const.cocci b/compat-patches/0002-genl-const.cocci
deleted file mode 100644
index 36c71d6..0000000
--- a/compat-patches/0002-genl-const.cocci
+++ /dev/null
@@ -1,10 +0,0 @@
-@@
-attribute __genl_const;
-@@
-(
--const struct genl_multicast_group
-+__genl_const struct genl_multicast_group
-|
--const struct genl_ops
-+__genl_const struct genl_ops
-)
diff --git a/compat-patches/replacements.sh b/compat-patches/replacements.sh
new file mode 100755
index 0000000..7dcb953
--- /dev/null
+++ b/compat-patches/replacements.sh
@@ -0,0 +1,9 @@
+#! /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/' \
+ -e 's/^static const struct genl_ops batadv_netlink_ops/static __genl_const struct genl_ops batadv_netlink_ops/' \
+ build/net/batman-adv/netlink.c
5 years, 7 months
[batman-adv] master: batman-adv: Revert "compat: Port netlink port hack to coccinelle" (a72b0cb)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit a72b0cb8c4d799388d3e27ed8c955aa0030fbab1
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Oct 31 08:36:28 2016 +0100
batman-adv: Revert "compat: Port netlink port hack to coccinelle"
The coccinelle in Debian Jessie seems to be broken. It fails to parse
the patches and thus makes it impossible to use the out-of-tree
module in these systems. Therefore drop it for now.
This reverts commit 57ed6cbca85a0a681a0fa8b4690259429f3ea9a5.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
a72b0cb8c4d799388d3e27ed8c955aa0030fbab1
compat-include/linux/netlink.h | 20 +++++++++++++-------
compat-include/net/genetlink.h | 11 -----------
compat-patches/0001-netlink-portid.cocci | 17 -----------------
compat.h | 6 ++++++
4 files changed, 19 insertions(+), 35 deletions(-)
diff --git a/compat-include/linux/netlink.h b/compat-include/linux/netlink.h
index ca2bdf0..4f2185d 100644
--- a/compat-include/linux/netlink.h
+++ b/compat-include/linux/netlink.h
@@ -26,13 +26,19 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0)
-#define netlink_notify_portid(__notify) (__notify->pid)
-#define NETLINK_CB_PORTID(__skb) NETLINK_CB(__skb).pid
-
-#else
-
-#define netlink_notify_portid(__notify) (__notify->portid)
-#define NETLINK_CB_PORTID(__skb) NETLINK_CB(__skb).portid
+#include <net/scm.h>
+
+struct batadv_netlink_skb_parms {
+ struct ucred creds; /* Skb credentials */
+ union {
+ __u32 portid;
+ __u32 pid;
+ };
+ __u32 dst_group;
+};
+
+#undef NETLINK_CB
+#define NETLINK_CB(skb) (*(struct batadv_netlink_skb_parms *)&((skb)->cb))
#endif /* < KERNEL_VERSION(3, 7, 0) */
diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h
index b057e6c..2e8e17a 100644
--- a/compat-include/net/genetlink.h
+++ b/compat-include/net/genetlink.h
@@ -24,17 +24,6 @@
#include <linux/version.h>
#include_next <net/genetlink.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0)
-
-#define genl_info_snd_portid(__genl_info) (__genl_info->snd_pid)
-
-#else
-
-#define genl_info_snd_portid(__genl_info) (__genl_info->snd_portid)
-
-#endif /* < KERNEL_VERSION(3, 7, 0) */
-
-
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
#include <linux/export.h>
diff --git a/compat-patches/0001-netlink-portid.cocci b/compat-patches/0001-netlink-portid.cocci
deleted file mode 100644
index 5fc504e..0000000
--- a/compat-patches/0001-netlink-portid.cocci
+++ /dev/null
@@ -1,17 +0,0 @@
-@@
-struct netlink_notify *notify;
-@@
--notify->portid
-+netlink_notify_portid(notify)
-
-@@
-struct genl_info *info;
-@@
--info->snd_portid
-+genl_info_snd_portid(info)
-
-@@
-expression skb;
-@@
--NETLINK_CB(skb).portid
-+NETLINK_CB_PORTID(skb)
diff --git a/compat.h b/compat.h
index 78de7ea..d987577 100644
--- a/compat.h
+++ b/compat.h
@@ -67,6 +67,12 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\
#endif /* < KERNEL_VERSION(3, 3, 0) */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0)
+
+#define snd_portid snd_pid
+
+#endif /* < KERNEL_VERSION(3, 7, 0) */
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
#define batadv_interface_set_mac_addr(x, y) \
5 years, 7 months
[batman-adv] master: batman-adv: Revert "compat: Move get_link_net patch to coccinelle" (7fb3f5c)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 7fb3f5c4a6b3756387ba58d945a24d168a049229
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Oct 31 08:36:25 2016 +0100
batman-adv: Revert "compat: Move get_link_net patch to coccinelle"
The coccinelle in Debian Jessie seems to be broken. It fails to parse
the patches and thus makes it impossible to use the out-of-tree
module in these systems. Therefore drop it for now.
This reverts commit 3b79cd3d9b3eb920d17233b5270ee7162d55587e.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
7fb3f5c4a6b3756387ba58d945a24d168a049229
compat-patches/0004-get_link_net.cocci | 13 -------------
compat.h | 7 +++++++
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/compat-patches/0004-get_link_net.cocci b/compat-patches/0004-get_link_net.cocci
deleted file mode 100644
index 7520bb6..0000000
--- a/compat-patches/0004-get_link_net.cocci
+++ /dev/null
@@ -1,13 +0,0 @@
-@@
-identifier netdev, fallback_net;
-@@
-
- static struct net *batadv_getlink_net(const struct net_device *netdev,
- struct net *fallback_net)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)
-+ return fallback_net;
-+#else
- ...
-+#endif
- }
diff --git a/compat.h b/compat.h
index 2865eeb..245621f 100644
--- a/compat.h
+++ b/compat.h
@@ -145,4 +145,11 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\
#endif /* < KERNEL_VERSION(3, 15, 0) */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)
+
+/* WARNING for batadv_getlink_net */
+#define get_link_net get_xstats_size || 1 || netdev->rtnl_link_ops->get_xstats_size
+
+#endif /* < KERNEL_VERSION(4, 0, 0) */
+
#endif /* _NET_BATMAN_ADV_COMPAT_H_ */
5 years, 7 months
[batman-adv] master: batman-adv: Revert "compat: Replace IFF_NO_QUEUE with coccinelle" (80c8988)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 80c8988e598e73def8590ea4ac5905bdb7b1f8b9
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Oct 31 08:36:26 2016 +0100
batman-adv: Revert "compat: Replace IFF_NO_QUEUE with coccinelle"
The coccinelle in Debian Jessie seems to be broken. It fails to parse
the patches and thus makes it impossible to use the out-of-tree
module in these systems. Therefore drop it for now.
This reverts commit 541c087012bd6b57d37f041aedc4d0b4440a96d1.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
80c8988e598e73def8590ea4ac5905bdb7b1f8b9
compat-patches/0003-iff-no-queue.cocci | 9 ---------
compat.h | 6 ++++++
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/compat-patches/0003-iff-no-queue.cocci b/compat-patches/0003-iff-no-queue.cocci
deleted file mode 100644
index 9c95b85..0000000
--- a/compat-patches/0003-iff-no-queue.cocci
+++ /dev/null
@@ -1,9 +0,0 @@
-@@
-expression E;
-@@
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
- E->priv_flags |= IFF_NO_QUEUE;
-+#else
-+E->tx_queue_len = 0;
-+#endif
diff --git a/compat.h b/compat.h
index 245621f..78de7ea 100644
--- a/compat.h
+++ b/compat.h
@@ -152,4 +152,10 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\
#endif /* < KERNEL_VERSION(4, 0, 0) */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+
+#define IFF_NO_QUEUE 0; dev->tx_queue_len = 0
+
+#endif /* < KERNEL_VERSION(4, 3, 0) */
+
#endif /* _NET_BATMAN_ADV_COMPAT_H_ */
5 years, 7 months
[batman-adv] master: batman-adv: Revert "compat: Move vid api wrapper to coccinelle" (be1dd23)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit be1dd23242285f1c8be41ea89422dc71ee48dd0e
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Oct 31 08:36:24 2016 +0100
batman-adv: Revert "compat: Move vid api wrapper to coccinelle"
The coccinelle in Debian Jessie seems to be broken. It fails to parse
the patches and thus makes it impossible to use the out-of-tree
module in these systems. Therefore drop it for now.
This reverts commit 7f40f382af1125698ad149d1b743c2de70a5ad5c.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
be1dd23242285f1c8be41ea89422dc71ee48dd0e
compat-include/linux/netdevice.h | 6 ---
compat-patches/0005-vid-callbacks.cocci | 74 ---------------------------------
compat.h | 54 ++++++++++++++++++++++++
3 files changed, 54 insertions(+), 80 deletions(-)
diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h
index 0536549..e71e614 100644
--- a/compat-include/linux/netdevice.h
+++ b/compat-include/linux/netdevice.h
@@ -28,12 +28,6 @@
#include <linux/netdev_features.h>
-#define __vid_api_returntype void
-
-#else
-
-#define __vid_api_returntype int
-
#endif /* < KERNEL_VERSION(3, 3, 0) */
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
diff --git a/compat-patches/0005-vid-callbacks.cocci b/compat-patches/0005-vid-callbacks.cocci
deleted file mode 100644
index 2cebc0e..0000000
--- a/compat-patches/0005-vid-callbacks.cocci
+++ /dev/null
@@ -1,74 +0,0 @@
-@ add_assignment @
-identifier batadv_interface_add_vid, batadv_netdev_ops;
-@@
-
- struct net_device_ops batadv_netdev_ops = {
- .ndo_vlan_rx_add_vid = batadv_interface_add_vid,
- };
-
-@ kill_assignment @
-identifier batadv_interface_kill_vid, batadv_netdev_ops;
-@@
-
- struct net_device_ops batadv_netdev_ops = {
- .ndo_vlan_rx_kill_vid = batadv_interface_kill_vid,
- };
-
-@ add_vid @
-identifier add_assignment.batadv_interface_add_vid;
-type be16;
-identifier dev, proto, vid;
-@@
-
--batadv_interface_add_vid
-+batadv_interface_add_vid_orig
- (struct net_device *dev, be16 proto,
- unsigned short vid)
- { ... }
-
-+static __vid_api_returntype batadv_interface_add_vid(struct net_device *dev,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
-+ be16 proto,
-+#endif
-+ unsigned short vid)
-+{
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
-+ be16 proto = htons(ETH_P_8021Q);
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
-+ batadv_interface_add_vid_orig(dev, proto, vid);
-+#else
-+ return batadv_interface_add_vid_orig(dev, proto, vid);
-+#endif
-+}
-
-
-@ kill_vid @
-identifier kill_assignment.batadv_interface_kill_vid;
-type be16;
-identifier dev, proto, vid;
-@@
-
--batadv_interface_kill_vid
-+batadv_interface_kill_vid_orig
- (struct net_device *dev, be16 proto,
- unsigned short vid)
- { ... }
-
-+static __vid_api_returntype batadv_interface_kill_vid(struct net_device *dev,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
-+ be16 proto,
-+#endif
-+ unsigned short vid)
-+{
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
-+ be16 proto = htons(ETH_P_8021Q);
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
-+ batadv_interface_kill_vid_orig(dev, proto, vid);
-+#else
-+ return batadv_interface_kill_vid_orig(dev, proto, vid);
-+#endif
-+}
diff --git a/compat.h b/compat.h
index d59fb5f..2865eeb 100644
--- a/compat.h
+++ b/compat.h
@@ -42,6 +42,31 @@
#endif /* < KERNEL_VERSION(3, 9, 0) */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+
+#define batadv_interface_add_vid(x, y, z) \
+__batadv_interface_add_vid(struct net_device *dev, __be16 proto,\
+ unsigned short vid);\
+static void batadv_interface_add_vid(struct net_device *dev, unsigned short vid)\
+{\
+ __batadv_interface_add_vid(dev, htons(ETH_P_8021Q), vid);\
+}\
+static int __batadv_interface_add_vid(struct net_device *dev, __be16 proto,\
+ unsigned short vid)
+
+#define batadv_interface_kill_vid(x, y, z) \
+__batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\
+ unsigned short vid);\
+static void batadv_interface_kill_vid(struct net_device *dev,\
+ unsigned short vid)\
+{\
+ __batadv_interface_kill_vid(dev, htons(ETH_P_8021Q), vid);\
+}\
+static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\
+ unsigned short vid)
+
+#endif /* < KERNEL_VERSION(3, 3, 0) */
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
#define batadv_interface_set_mac_addr(x, y) \
@@ -70,6 +95,35 @@ static int __batadv_interface_tx(struct sk_buff *skb, \
#endif /* < KERNEL_VERSION(3, 9, 0) */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)
+
+#define batadv_interface_add_vid(x, y, z) \
+__batadv_interface_add_vid(struct net_device *dev, __be16 proto,\
+ unsigned short vid);\
+static int batadv_interface_add_vid(struct net_device *dev, unsigned short vid)\
+{\
+ return __batadv_interface_add_vid(dev, htons(ETH_P_8021Q), vid);\
+}\
+static int __batadv_interface_add_vid(struct net_device *dev, __be16 proto,\
+ unsigned short vid)
+
+#define batadv_interface_kill_vid(x, y, z) \
+__batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\
+ unsigned short vid);\
+static int batadv_interface_kill_vid(struct net_device *dev,\
+ unsigned short vid)\
+{\
+ return __batadv_interface_kill_vid(dev, htons(ETH_P_8021Q), vid);\
+}\
+static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\
+ unsigned short vid)
+
+#endif /* >= KERNEL_VERSION(3, 3, 0) */
+
+#endif /* < KERNEL_VERSION(3, 10, 0) */
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0)
/* the expected behaviour of this function is to return 0 on success, therefore
5 years, 7 months
[linux-merge]linux integration; annotated tag, v4.9-rc4, created. v4.9-rc4
by postmaster@open-mesh.org
The annotated tag, v4.9-rc4 has been created
at f0b8a0182b2f3a7139d8d041e06bc11c1ba6e912 (tag)
tagging bc33b0ca11e3df467777a4fa7639ba488c9d4911 (commit)
replaces v4.9-rc3
tagged by Linus Torvalds
on Sat Nov 5 16:23:46 2016 -0700
- Shortlog ------------------------------------------------------------
Linux 4.9-rc4
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJYHmoCAAoJEHm+PkMAQRiG7RMIAI2i7Y5hpL5yCxK5AFaL4u/G
KxXfp1B1UanUTgjOmd7zGqtDYcFX9t7GTTUFixQ7/9Opr4PD9qbnatoDGSc3xjbT
msDgA1B78F1/Q3kHWfeGq32MihQ4mj5NwUCo+igUcUvvWG7mHgzErj/Nh5RoobQX
p/izdpTbrw3GX6xXB8olbG7XWHaVye/+TT3q6+gmgm8I/QEujcLeGoycE0zlhPN8
FG/JX76At/+ZM2Py7Oxo3k+oKL9CHrtOQYDp/wN0uslV5eYvvkZz0/M1HMOGZt+c
gZU5jzM17K7C4Nzo06WAuBU9wUBGc25m+cPicLlOmljnzfU+f50SKaDjZq3p7QI=
=2KUF
-----END PGP SIGNATURE-----
Linus Lüssing (1):
batman-adv: fix splat on disabling an interface
Sven Eckelmann (2):
batman-adv: Modify neigh_list only with rcu-list functions
batman-adv: Add BATADV_DBG_TP_METER to BATADV_DBG_ALL
-----------------------------------------------------------------------
--
linux integration
5 years, 8 months