[batman-adv] next: Merge branch 'maint' into next (e2dd65c)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : next
>---------------------------------------------------------------
commit e2dd65cd88fcdc3445b7d5edf9fcc819ff58bd2e
Merge: 3cb3f12 0479211
Author: Marek Lindner <mareklindner(a)neomailbox.ch>
Date: Tue May 17 17:12:39 2016 +0800
Merge branch 'maint' into next
>---------------------------------------------------------------
e2dd65cd88fcdc3445b7d5edf9fcc819ff58bd2e
net/batman-adv/translation-table.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
6 years
[batman-adv] maint: batman-adv: replace WARN with rate limited output on non-existing VLAN (0479211)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : maint
>---------------------------------------------------------------
commit 04792115d24408a72bf8fccd5c4059478fc15eae
Author: Simon Wunderlich <sw(a)simonwunderlich.de>
Date: Thu May 12 18:52:03 2016 +0200
batman-adv: replace WARN with rate limited output on non-existing VLAN
If a VLAN tagged frame is received and the corresponding VLAN is not
configured on the soft interface, it will splat a WARN on every packet
received. This is a quite annoying behaviour for some scenarios, e.g. if
bat0 is bridged with eth0, and there are arbitrary VLAN tagged frames
from Ethernet coming in without having any VLAN configuration on bat0.
The code should probably create vlan objects on the fly and
transparently transport these VLAN-tagged Ethernet frames, but until
this is done, at least the WARN splat should be replaced by a rate
limited output.
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
04792115d24408a72bf8fccd5c4059478fc15eae
net/batman-adv/translation-table.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 9b4551a..48adb91 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -650,8 +650,10 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr,
/* increase the refcounter of the related vlan */
vlan = batadv_softif_vlan_get(bat_priv, vid);
- if (WARN(!vlan, "adding TT local entry %pM to non-existent VLAN %d",
- addr, BATADV_PRINT_VID(vid))) {
+ if (!vlan) {
+ net_ratelimited_function(batadv_info, soft_iface,
+ "adding TT local entry %pM to non-existent VLAN %d\n",
+ addr, BATADV_PRINT_VID(vid));
kfree(tt_local);
tt_local = NULL;
goto out;
6 years
[batctl] master: batctl: adding multicast debug level (55042b3)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batctl
On branch : master
>---------------------------------------------------------------
commit 55042b3a3bbf80dc8f3f36bf64339a825b809a0d
Author: Linus Lüssing <linus.luessing(a)web.de>
Date: Fri May 13 17:30:15 2016 +0200
batctl: adding multicast debug level
This patch adds the multicast debug level to check for own
multicast flag changes for instance.
Signed-off-by: Linus Lüssing <linus.luessing(a)web.de>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
55042b3a3bbf80dc8f3f36bf64339a825b809a0d
README | 1 +
man/batctl.8 | 6 +++---
sys.c | 5 +++++
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/README b/README
index f87c551..b5de8a6 100644
--- a/README
+++ b/README
@@ -390,6 +390,7 @@ $ batctl loglevel
[ ] messages related to bridge loop avoidance (bla)
[ ] messages related to arp snooping and distributed arp table (dat)
[ ] messages related to network coding (nc)
+[ ] messages related to multicast (mcast)
batctl nc_nodes
===============
diff --git a/man/batctl.8 b/man/batctl.8
index e804a08..f8955d0 100644
--- a/man/batctl.8
+++ b/man/batctl.8
@@ -98,9 +98,9 @@ level. Level 'none' disables all verbose logging. Level 'batman' enables message
Level 'routes' enables messages related to routes being added / changed / deleted. Level 'tt' enables messages related to
translation table operations. Level 'bla' enables messages related to the bridge loop avoidance. Level 'dat' enables
messages related to ARP snooping and the Distributed Arp Table. Level 'nc' enables messages related to network coding.
-Level 'all' enables all messages. The messages are sent to the batman-adv debug log. Use \fBbatctl log\fP to retrieve it.
-Make sure to have debugging output enabled when compiling the module otherwise the output as well as the loglevel options
-won't be available.
+Level 'mcast' enables messages related to multicast optimizations. Level 'all' enables all messages. The messages
+are sent to the batman-adv debug log. Use \fBbatctl log\fP to retrieve it. Make sure to have debugging output enabled
+when compiling the module otherwise the output as well as the loglevel options won't be available.
.br
.IP "\fBlog\fP|\fBl\fP [\fB\-n\fP]\fP"
batctl will read the batman-adv debug log which has to be compiled into the kernel module. If "\-n" is given batctl will not
diff --git a/sys.c b/sys.c
index afa8533..ca837f6 100644
--- a/sys.c
+++ b/sys.c
@@ -277,6 +277,7 @@ static void log_level_usage(void)
fprintf(stderr, " \t bla Messages related to bridge loop avoidance\n");
fprintf(stderr, " \t dat Messages related to arp snooping and distributed arp table\n");
fprintf(stderr, " \t nc Messages related to network coding\n");
+ fprintf(stderr, " \t mcast Messages related to multicast\n");
}
int handle_loglevel(char *mesh_iface, int argc, char **argv)
@@ -321,6 +322,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv)
log_level |= BIT(4);
else if (strcmp(argv[i], "nc") == 0)
log_level |= BIT(5);
+ else if (strcmp(argv[i], "mcast") == 0)
+ log_level |= BIT(6);
else {
log_level_usage();
goto out;
@@ -354,6 +357,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv)
"messages related to arp snooping and distributed arp table", "dat");
printf("[%c] %s (%s)\n", (log_level & BIT(5)) ? 'x' : ' ',
"messages related to network coding", "nc");
+ printf("[%c] %s (%s)\n", (log_level & BIT(6)) ? 'x' : ' ',
+ "messages related to multicast", "mcast");
out:
free(path_buff);
6 years
[linux-merge]linux integration; annotated tag, v4.6, created. v4.6
by postmaster＠open-mesh.org
The annotated tag, v4.6 has been created
at a902836aade7b56f8dc31f50f9c6ca6d0fa01e45 (tag)
tagging 2dcd0af568b0cf583645c8a317dd12e344b1c72a (commit)
replaces v4.6-rc7
tagged by Linus Torvalds
on Sun May 15 15:43:23 2016 -0700
- Shortlog ------------------------------------------------------------
Linux 4.6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJXOPuLAAoJEHm+PkMAQRiGWN4H/R5BGUa9xhK8Lqe8LEupA7An
6JJ+AML5w9KwLFprzBtOLhHDoGauESJ9SxmHe628ur3d54FKeysQsdXRfiIVKwwr
yx3Sm/ZVt99qkDKR/iWz7E0lfvCa9g1isMqMIX+XuJAI/QjN+th7ljLpiBMhCqZB
yJaozYtKAO3ipr8oJAH96Vkn6EcSBmO/WxPfiDd5vlrRsGz8EU2NevLDbCWKOgDb
okgSpGoE0VK1hujunszTYCC3MeBIiWhlJgtthtVkv9oJQfzTfo1ExiB4kCPLJmem
yb5PzS0WL8hnafEPAflOR3dAuh1erTec8RXo9XYTxwLBbFd7+QdwnISOxS3wj7k=
=wlTZ
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
6 years
[batctl] master: batctl: add netlink command to query generic mesh information files (ecb33cc)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batctl
On branch : master
>---------------------------------------------------------------
commit ecb33cce6967dde3475dae90f65defb7d4ee9939
Author: Matthias Schiffer <mschiffer(a)universe-factory.net>
Date: Mon May 9 18:41:09 2016 +0200
batctl: add netlink command to query generic mesh information files
BATADV_CMD_GET_MESH_INFO is used to query basic information about a
batman-adv softif (name, index and MAC address for both the softif and
the primary hardif; routing algorithm; batman-adv version).
Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net>
Signed-off-by: Andrew Lunn <andrew(a)lunn.ch>
[sven.eckelmann(a)open-mesh.com: Reduce the number of changes to
BATADV_CMD_GET_MESH_INFO, add missing kerneldoc, add policy for attributes]
Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
ecb33cce6967dde3475dae90f65defb7d4ee9939
batman_adv.h | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/batman_adv.h b/batman_adv.h
index ba611a7..a908140 100644
--- a/batman_adv.h
+++ b/batman_adv.h
@@ -24,12 +24,28 @@
* enum batadv_nl_attrs - batman-adv netlink attributes
*
* @BATADV_ATTR_UNSPEC: unspecified attribute to catch errors
+ * @BATADV_ATTR_VERSION: batman-adv version string
+ * @BATADV_ATTR_ALGO_NAME: name of routing algorithm
+ * @BATADV_ATTR_MESH_IFINDEX: index of the batman-adv interface
+ * @BATADV_ATTR_MESH_IFNAME: name of the batman-adv interface
+ * @BATADV_ATTR_MESH_ADDRESS: mac address of the batman-adv interface
+ * @BATADV_ATTR_HARD_IFINDEX: index of the non-batman-adv interface
+ * @BATADV_ATTR_HARD_IFNAME: name of the non-batman-adv interface
+ * @BATADV_ATTR_HARD_ADDRESS: mac address of the non-batman-adv interface
* @__BATADV_ATTR_AFTER_LAST: internal use
* @NUM_BATADV_ATTR: total number of batadv_nl_attrs available
* @BATADV_ATTR_MAX: highest attribute number currently defined
*/
enum batadv_nl_attrs {
BATADV_ATTR_UNSPEC,
+ BATADV_ATTR_VERSION,
+ BATADV_ATTR_ALGO_NAME,
+ BATADV_ATTR_MESH_IFINDEX,
+ BATADV_ATTR_MESH_IFNAME,
+ BATADV_ATTR_MESH_ADDRESS,
+ BATADV_ATTR_HARD_IFINDEX,
+ BATADV_ATTR_HARD_IFNAME,
+ BATADV_ATTR_HARD_ADDRESS,
/* add attributes above here, update the policy in netlink.c */
__BATADV_ATTR_AFTER_LAST,
NUM_BATADV_ATTR = __BATADV_ATTR_AFTER_LAST,
@@ -40,11 +56,13 @@ enum batadv_nl_attrs {
* enum batadv_nl_commands - supported batman-adv netlink commands
*
* @BATADV_CMD_UNSPEC: unspecified command to catch errors
+ * @BATADV_CMD_GET_MESH_INFO: Query basic information about batman-adv device
* @__BATADV_CMD_AFTER_LAST: internal use
* @BATADV_CMD_MAX: highest used command number
*/
enum batadv_nl_commands {
BATADV_CMD_UNSPEC,
+ BATADV_CMD_GET_MESH_INFO,
/* add new commands above here */
__BATADV_CMD_AFTER_LAST,
BATADV_CMD_MAX = __BATADV_CMD_AFTER_LAST - 1
6 years
[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org
The annotated tag, batman-adv-fix-for-davem has been updated
to 7256a56520bad339789f37389155bf60b2a0b1b4 (tag)
from fa9554905e3c6db1e10ec8525e8bdd61dc0e078b (which is now obsolete)
tagging 6b892c1cb0805acee5d4ddd9e7878ed076c1b7c7 (commit)
replaces v4.6-rc7
tagged by Antonio Quartulli
on Sun May 15 23:05:54 2016 +0800
- Shortlog ------------------------------------------------------------
During the Wireless Battle Mesh v9 in Porto (PT) at the beginning of
May, we managed to uncover and fix some important bugs in our
new B.A.T.M.A.N. V algorithm. These are the most critical fixes we
came up with aimed to avoid easy kernel crashes:
- avoid potential crash due to NULL pointer dereference in
B.A.T.M.A.N. V routine when a neigh_ifinfo object is not found, by
Sven Eckelmann
- avoid crash due to double kref_put on neigh_node object in
B.A.T.M.A.N. V routine leading to use-after-free, by Sven
Eckelmann (this crash can be always replicated)
- avoid use-after-free of skb when counting outgoing bytes, by Florian
Westphal
- fix neigh_ifinfo object reference counting imbalance when using
B.A.T.M.A.N. V, by Sven Eckelmann. Such imbalance may lead to the
impossibility of releasing the related netdev object on shutdown.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJXOJCAAAoJEJ4aZjxxc6bKmvAP/jyzehlkXYdboebRtFsdDF33
0nMGvU1S+N/12GAzUWl87S7XXCYqWcB+pBx4sf9tB7v+meVWaAOHl1oEXuQtjDh9
d9Ld/e6XijKT0FQAbkI7nKm1kU/OZ6uUJoq35w0m0WNBwtEpbi0OA9A1vv01Tphh
LYznP3PEqvriEP1HExwUhD4UsJtDYxJhsxQKAXY014ip7iqA2eyP/sbjM8pfC9+g
yo384a0vDUqSc4ld8Y0LLocijitims8piES80jyHo7/LH83MswXOW3zhfVCd2hFX
8lL6GHmv7jTmhUktWLMywUjbbXtQnPTPlEw4qh1rFm56k/npSUiQ/8fDfa/MD+y3
jaWfwsG8aPd3YdxKpjrQ/aPwajnuL8VUL1+/xmlriOXrcV7qpAWZOU+8nHsAiwWo
HUYGiWetD01rgvXR1YsZU+5j0iklKuN7tTY5UBAC4ScucNit5lwYn6XW66uLWHUO
wIBPftO2qUvZU44rpczmJUPneb1xj4MQvJckzRPqzPrZVa89Lg5Q6OT+v/muZTW/
WPocCgj/x1JNAuC6NBvldtEm+2sAOWPmAK+wmEjKyCd/ro/q+f8wcuhqZg+H6FTh
Ua9pvESzqdypruBHMT2J7Y+XWDt9Ik6UcLFwEgyW/4a5JzNdvTkmuYMVIKfaZ8b9
66TQWh150r9oWr+GRTNv
=+t+0
-----END PGP SIGNATURE-----
Florian Westphal (1):
batman-adv: fix skb deref after free
Sven Eckelmann (3):
batman-adv: Avoid nullptr derefence in batadv_v_neigh_is_sob
batman-adv: Fix double neigh_node_put in batadv_v_ogm_route_update
batman-adv: Fix refcnt leak in batadv_v_neigh_*
-----------------------------------------------------------------------
--
linux integration
6 years
[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org
The annotated tag, batman-adv-fix-for-davem has been updated
to fa9554905e3c6db1e10ec8525e8bdd61dc0e078b (tag)
from 45883a313c8beceb04b8d9e9f277101beee0448f (which is now obsolete)
tagging 6b892c1cb0805acee5d4ddd9e7878ed076c1b7c7 (commit)
replaces v4.6-rc7
tagged by Antonio Quartulli
on Sun May 15 22:48:37 2016 +0800
- Shortlog ------------------------------------------------------------
During the Wireless Battle Mesh v9 in Porto (PT) at the beginning of
May, we manage to uncover and fix some important bugs in our
new B.A.T.M.A.N. V algorithm. These are the most critical fixes we
came up with:
- avoid potential crash due to NULL pointer dereference in
B.A.T.M.A.N. V routine when a neigh_ifinfo object is not found, by
Sven Eckelmann
- avoid crash due to double kref_put on neigh_node object in
B.A.T.M.A.N. V routine leading to use-after-free, by Sven
Eckelmann (this crash can be always replicated)
- avoid use-after-free of skb when counting outgoing bytes, by Florian
Westphal
- fix neigh_ifinfo object reference counting imbalance when using
B.A.T.M.A.N. V, by Sven Eckelmann. Such imbalance may lead to the
impossibility of releasing the related netdev object on shutdown.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJXOI62AAoJEJ4aZjxxc6bK13UQAL55EL37ucgxLqRu7HtEOGGj
DB5MRjixIvpD16a229thSaQkudrEQzixco7Kv81tiK7tUglEcrMuLIPA14e5SOuv
2OZsrxjXjESLtujpVMvELkuh9e5uur8EAiZPjjySP2KEt6bcSNSBoIjT/sWBv2j9
0ieM4/wfLy9tvEE445h0uXNKKNoqU/WQk/ofbLZg4RImmF1oEwZJ863fxUwfTbbW
LhWa2eoUg13uoIhymWijtiA4G/tuaFWhydz+stNzWW0d6O8Gahjwhtjjr8jROGA4
rhQlbesyUdMMgcZE9muWXcFmSC+X88aRLPXfKLmxFscAVp/HFWC8lBs6frp7v8mK
NcMr2zS+FyFawHSUuiss1k9yqUTbnrfuoxkwPK89W16aWlF3eP+iiEMaxSbETJ3F
Z4aDAfKP9XdcXiTaawx5izDwwQbR6VOwzWrAzS8idXaFy8Q7yVZp61yUrFX248Rd
M+hvvgRp0+mBpsGf0lVAWuBqeZmCRGHmFPlFLNvAIQER3FKfTi3ba+bER9+GP6F2
QpvfMp/ogCsNzqDgX5Ks0Be7XeFnaeG8Xl+IHHGa1JycUhwgNlX6pOOOTgyy+kso
6/nidEIQX4HJJ0QevboSOgXiAH37XmysTvydIXVZPVCofflfm5lWUTxklrlvLaSc
YDkgR5v1C0b9hv4POoZs
=oNMJ
-----END PGP SIGNATURE-----
Florian Westphal (1):
batman-adv: fix skb deref after free
Sven Eckelmann (3):
batman-adv: Avoid nullptr derefence in batadv_v_neigh_is_sob
batman-adv: Fix double neigh_node_put in batadv_v_ogm_route_update
batman-adv: Fix refcnt leak in batadv_v_neigh_*
-----------------------------------------------------------------------
--
linux integration
6 years
[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, created. batman-adv-fix-for-davem
by postmaster＠open-mesh.org
The annotated tag, batman-adv-fix-for-davem has been created
at 45883a313c8beceb04b8d9e9f277101beee0448f (tag)
tagging 6b892c1cb0805acee5d4ddd9e7878ed076c1b7c7 (commit)
replaces v4.6-rc7
tagged by Antonio Quartulli
on Sun May 15 16:42:55 2016 +0800
- Shortlog ------------------------------------------------------------
During the Wireless Battle Mesh v9 in Porto at the beginning of
May, we manage to uncover and fix some important bugs in our
new algorithm B.A.T.M.A.N. V. These are the most critical fixes we
came up with:
- avoid crash due to NULL pointer dereference when using new
routing algorithm B.A.T.M.A.N. V, by Sven Eckelmann
- avoid crash due to double kref_put on neigh_node object leading
to use-after-free when using B.A.T.M.A.N. V, by Sven Eckelmann
- avoid use-after-free of skb when counting outgoing bytes, by Florian
Westphal
- fix reference counting imbalance of neigh_ifinfo objects to avoid
having an hanging netdev when using B.A.T.M.A.N. V, by Sven Eckelmann
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJXOIvpAAoJEJ4aZjxxc6bK4yEP/0dVxVFtfL8MwRM7d6cX/JvB
sxjV1hwR2mQhKVVbfJ08bc3BMHdUrDzQSp9YcIS+xGlJRSvzKzGiYq1NIxoqeRHG
LwTW0Pte8NUiRW6PggKn71j4dWhGcqsqeSjSJgTknXfVWTXn7vbh+b1cVACoz6wD
mlJgx0jr8mta3KBb+X/cgEPH41ABXyY1oV+OBNqq3ipY9zOwZAXyJcjt8UG17XvK
xEunmt/N+krEubELSM+uit17VECUGBIZYXY4YdG86zk53S12n2K3u37ejNyvj2g7
SAmszr2EQ9fNVXmqrDyC3WUG2bDDjhajU+HJ5PuHyAy53Dsdz0jLZwlv9ulu172l
ureAwFXLpIUIn3+8Xq/s75jbId09XuuhEqwB7KYIqj+w6ESMPlwlkh9kWxN+9kH6
Jg74ar4wle2pm7AYURZjo4S1zJyM2e5j6PtlYSmdsGIlJjpnEN2cZhV2zuFQZu13
JaX51r7ASN3dVdtTxThIECOVShnbT3jXHr//vxDZjCYA0y997RypDdvqkBTWADhA
r1Twvg98wBwAnqqjF/oCazYVnTeWD37qmm399PxdKxWiOeyD0L5h2ngis9UnA+dC
Bd6MQJ7LMnVMA/OUXNISdiTO7ZfmlVt0hVp6sqSkI66VYBBTGEy8hxL0q+7GXcBx
oQZhi7eEHexWQzNMOY8J
=TU6f
-----END PGP SIGNATURE-----
Florian Westphal (1):
batman-adv: fix skb deref after free
Sven Eckelmann (3):
batman-adv: Avoid nullptr derefence in batadv_v_neigh_is_sob
batman-adv: Fix double neigh_node_put in batadv_v_ogm_route_update
batman-adv: Fix refcnt leak in batadv_v_neigh_*
-----------------------------------------------------------------------
--
linux integration
6 years
[batctl] master: batctl: Include frame priority in fragment header (7e3a301)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batctl
On branch : master
>---------------------------------------------------------------
commit 7e3a301b51a15597a6d1b9595263ac4212929a68
Author: Andrew Lunn <andrew(a)lunn.ch>
Date: Mon May 9 20:03:36 2016 +0200
batctl: Include frame priority in fragment header
Unfragmented frames which traverse a node have their skb->priority set
by looking at the IP ToS byte, or the 802.1p header. However for
fragments this is not possible, only one of the fragments will contain
the headers. Instead, place the priority into the fragment header and
on receiving a fragment, use this information to set the skb->priority
for when the fragment is forwarded.
Signed-off-by: Andrew Lunn <andrew(a)lunn.ch>
Reviewed-by: Simon Wunderlich <sw(a)simonwunderlich.de>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
7e3a301b51a15597a6d1b9595263ac4212929a68
packet.h | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/packet.h b/packet.h
index 372128d..7156779 100644
--- a/packet.h
+++ b/packet.h
@@ -420,6 +420,7 @@ struct batadv_unicast_4addr_packet {
* @dest: final destination used when routing fragments
* @orig: originator of the fragment used when merging the packet
* @no: fragment number within this sequence
+ * @priority: priority of frame, from ToS IP precedence or 802.1p
* @reserved: reserved byte for alignment
* @seqno: sequence identification
* @total_size: size of the merged packet
@@ -430,9 +431,11 @@ struct batadv_frag_packet {
u8 ttl;
#if defined(__BIG_ENDIAN_BITFIELD)
u8 no:4;
- u8 reserved:4;
+ u8 priority:3;
+ u8 reserved:1;
#elif defined(__LITTLE_ENDIAN_BITFIELD)
- u8 reserved:4;
+ u8 reserved:1;
+ u8 priority:3;
u8 no:4;
#else
#error "unknown bitfield endianness"
6 years
[openwrt-feed-devel] master: batman-adv-devel: add libnl-genl library path (cf75533)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/openwrt-feed-devel
On branch : master
>---------------------------------------------------------------
commit cf7553327be5d1ac9329b73c7f8ecedaa5e7441b
Author: Marek Lindner <mareklindner(a)neomailbox.ch>
Date: Fri May 13 15:47:03 2016 +0800
batman-adv-devel: add libnl-genl library path
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
cf7553327be5d1ac9329b73c7f8ecedaa5e7441b
batctl-devel/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/batctl-devel/Makefile b/batctl-devel/Makefile
index 3530471..0ecca65 100644
--- a/batctl-devel/Makefile
+++ b/batctl-devel/Makefile
@@ -67,7 +67,8 @@ MAKE_BATCTL_ENV += \
CPPFLAGS="$(TARGET_CPPFLAGS)" \
CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
- LIBNL_NAME="libnl-tiny"
+ LIBNL_NAME="libnl-tiny" \
+ LIBNL_GENL_NAME="libnl-tiny"
MAKE_BATCTL_ARGS += \
REVISION="$(PKG_VERSION)" \
6 years