aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/main.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-08-08 11:28:40 -0700
committerDavid S. Miller <davem@davemloft.net>2019-08-08 11:28:40 -0700
commitb3a598eb0d6b5c88ef8284c5dc95986eea365054 (patch)
tree21a3ee04b333c4ec52a73045aba305f3a5b5c58f /net/batman-adv/main.h
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff)
parentbatman-adv: BATMAN_V: aggregate OGMv2 packets (diff)
downloadlinux-dev-b3a598eb0d6b5c88ef8284c5dc95986eea365054.tar.xz
linux-dev-b3a598eb0d6b5c88ef8284c5dc95986eea365054.zip
Merge tag 'batadv-next-for-davem-20190808' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says: ==================== This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Replace usage of strlcpy with strscpy, by Sven Eckelmann - Add OGMv2 per-interface queue and aggregations, by Linus Luessing (2 patches) ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/main.h')
-rw-r--r--net/batman-adv/main.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 3d4c04d87ff3..6967f2e4c3f4 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -13,7 +13,7 @@
#define BATADV_DRIVER_DEVICE "batman-adv"
#ifndef BATADV_SOURCE_VERSION
-#define BATADV_SOURCE_VERSION "2019.3"
+#define BATADV_SOURCE_VERSION "2019.4"
#endif
/* B.A.T.M.A.N. parameters */