[linux-merge]; annotated tag, v4.4-rc3, created. v4.4-rc3
by postmaster@open-mesh.org
The annotated tag, v4.4-rc3 has been created
at 5da763dbd025698748c4f98be1f39a65f38a329e (tag)
tagging 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 (commit)
replaces v4.4-rc2
tagged by Linus Torvalds
on Sun Nov 29 18:58:35 2015 -0800
- Shortlog ------------------------------------------------------------
Linux 4.4-rc3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJWW7tbAAoJEHm+PkMAQRiGMkUH/3v+Sr9cxZoSHVM5u5S+CeSO
77gFt3iUsIP/GNwwM88QSjKVwDZIhJJZeGSzvSGyaEIG0Fdz0tot11BIopU4rOm7
Tkw/k2mSEvHlg9VMpkOWYEnbjkQXv/DlBc6hDIeBfdz2dZW/LTleFWT9ECRedGri
L5FwqjSUu1HBcb1bq4Xu6SGrntOrxkKXl43Uek0Cjtaf1KeGPjfcSX8X+g3ZuDBq
HSfXdbNyL2wZkPxuYYyztQCoO50j+wy587PNf51QgYim3HkseH9fRD1PDb+qTObW
uRii7XAFtyJNF5e8AVQ8m1Hq4gDG/yXSf2xYbADxg9KTTdKwWxtfgd0QSJg+yyQ=
=uo0O
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
5 years, 4 months
[batctl] next's head updated: Merge branch 'next' (0ae7bce)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batctl
Branch 'next' now includes:
bf133f0 batctl: add neighbor table support
9d05a4d batctl: Fix kerneldoc parsing of structs/enums
3ba1664 batctl: Remove kerneldoc for missing parameters
20a46cb batctl: Fix names in kerneldoc of functions
e3bbef5 batctl: remove leftovers of unused BATADV_PRIMARIES_FIRST_HOP flag
2dddf83 batctl: Fix kerneldoc of main functions
0ae7bce Merge branch 'next'
5 years, 4 months
[batman-adv] master: batman-adv: add seqno maximum age and protection start flag parameters (544f94c)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 544f94cd3b26ffe66a7c5de96c7f640dd28bacc0
Author: Simon Wunderlich <simon(a)open-mesh.com>
Date: Mon Nov 23 19:57:22 2015 +0100
batman-adv: add seqno maximum age and protection start flag parameters
To allow future use of the window protected function with different
maximum sequence numbers, add a parameter to set this value which
was previously hardcoded. Another parameter added for future use is a
flag to return whether the protection window has started.
While at it, also fix the kerneldoc.
Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
544f94cd3b26ffe66a7c5de96c7f640dd28bacc0
net/batman-adv/bat_iv_ogm.c | 3 ++-
net/batman-adv/main.h | 3 +++
net/batman-adv/routing.c | 13 ++++++++++---
net/batman-adv/routing.h | 3 ++-
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index a594496..12bdffa 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -1313,7 +1313,8 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
/* signalize caller that the packet is to be dropped. */
if (!hlist_empty(&orig_node->neigh_list) &&
batadv_window_protected(bat_priv, seq_diff,
- &orig_ifinfo->batman_seqno_reset)) {
+ BATADV_TQ_LOCAL_WINDOW_SIZE,
+ &orig_ifinfo->batman_seqno_reset, NULL)) {
ret = BATADV_PROTECTED;
goto out;
}
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 34f56ef..a58dc2f 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -35,6 +35,9 @@
/* Time To Live of broadcast messages */
#define BATADV_TTL 50
+/* maximum sequence number age of broadcast messages */
+#define BATADV_BCAST_MAX_AGE 64
+
/* purge originators after time in seconds if no valid packet comes in
* -> TODO: check influence on BATADV_TQ_LOCAL_WINDOW_SIZE
*/
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 1fb1be3..0ba5993 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -146,23 +146,29 @@ out:
* @bat_priv: the bat priv with all the soft interface information
* @seq_num_diff: difference between the current/received sequence number and
* the last sequence number
+ * @seq_old_max_diff: maximum age of sequence number not considered as restart
* @last_reset: jiffies timestamp of the last reset, will be updated when reset
* is detected
+ * @protection_started: is set to true if the protection window was started,
+ * doesn't change otherwise.
*
* Return:
* 0 if the packet is to be accepted.
* 1 if the packet is to be ignored.
*/
int batadv_window_protected(struct batadv_priv *bat_priv, s32 seq_num_diff,
- unsigned long *last_reset)
+ s32 seq_old_max_diff, unsigned long *last_reset,
+ bool *protection_started)
{
- if (seq_num_diff <= -BATADV_TQ_LOCAL_WINDOW_SIZE ||
+ if (seq_num_diff <= -seq_old_max_diff ||
seq_num_diff >= BATADV_EXPECTED_SEQNO_RANGE) {
if (!batadv_has_timed_out(*last_reset,
BATADV_RESET_PROTECTION_MS))
return 1;
*last_reset = jiffies;
+ if (protection_started)
+ *protection_started = true;
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
"old packet received, start protection\n");
}
@@ -1073,7 +1079,8 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,
/* check whether the packet is old and the host just restarted. */
if (batadv_window_protected(bat_priv, seq_diff,
- &orig_node->bcast_seqno_reset))
+ BATADV_BCAST_MAX_AGE,
+ &orig_node->bcast_seqno_reset, NULL))
goto spin_unlock;
/* mark broadcast in flood history, update window position
diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h
index 204bbe4..5315fb3 100644
--- a/net/batman-adv/routing.h
+++ b/net/batman-adv/routing.h
@@ -52,6 +52,7 @@ batadv_find_router(struct batadv_priv *bat_priv,
struct batadv_orig_node *orig_node,
struct batadv_hard_iface *recv_if);
int batadv_window_protected(struct batadv_priv *bat_priv, s32 seq_num_diff,
- unsigned long *last_reset);
+ s32 seq_old_max_diff, unsigned long *last_reset,
+ bool *protection_started);
#endif /* _NET_BATMAN_ADV_ROUTING_H_ */
5 years, 4 months
[batman-adv] master: batman-adv: add kerneldoc for batadv_iv_ogm_aggr_packet (879ffa2)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 879ffa28b33ec0c86bb0ced55a2471381360b68d
Author: Simon Wunderlich <simon(a)open-mesh.com>
Date: Mon Nov 23 19:57:21 2015 +0100
batman-adv: add kerneldoc for batadv_iv_ogm_aggr_packet
Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
879ffa28b33ec0c86bb0ced55a2471381360b68d
net/batman-adv/bat_iv_ogm.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index ad678f0..a594496 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -394,7 +394,14 @@ static u8 batadv_hop_penalty(u8 tq, const struct batadv_priv *bat_priv)
return new_tq;
}
-/* is there another aggregated packet here? */
+/**
+ * batadv_iv_ogm_aggr_packet - checks if there is another OGM attached
+ * @buff_pos: current position in the skb
+ * @packet_len: total length of the skb
+ * @tvlv_len: tvlv length of the previously considered OGM
+ *
+ * Return: true if there is enough space for another OGM, false otherwise.
+ */
static bool batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len,
__be16 tvlv_len)
{
5 years, 4 months
[alfred] tag 'v2015.2' created
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/alfred
New tag : v2015.2
Referencing: 244d59a553687a53b877a478cf78024552c5496c
5 years, 4 months
[alfred] master, simon/release-2015.2: Update CHANGELOG for upcoming release (d2dc0f6)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/alfred
On branches: master,simon/release-2015.2
>---------------------------------------------------------------
commit d2dc0f621c6698d00d5d5fae971f7945282eea48
Author: Simon Wunderlich <sw(a)simonwunderlich.de>
Date: Mon Nov 23 20:36:05 2015 +0100
Update CHANGELOG for upcoming release
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
d2dc0f621c6698d00d5d5fae971f7945282eea48
CHANGELOG | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 86111f2..8919d64 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+alfred 2015.2:
+
+ * mention libcap in the README
+ * Fix typos
+
+ -- Mon, 23 Nov 2015 20:35:20 +0100
+
alfred 2015.1:
* add support to run on interfaces with multiple link-local addresses
5 years, 4 months
[alfred] master, simon/release-2015.2: alfred: Start new development cycle (f7fba57)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/alfred
On branches: master,simon/release-2015.2
>---------------------------------------------------------------
commit f7fba574543eb9a150255db67d2b5189fdb8f56c
Author: Simon Wunderlich <sw(a)simonwunderlich.de>
Date: Mon Nov 23 20:37:25 2015 +0100
alfred: Start new development cycle
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
f7fba574543eb9a150255db67d2b5189fdb8f56c
alfred.h | 2 +-
gpsd/alfred-gpsd.h | 2 +-
vis/vis.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/alfred.h b/alfred.h
index bebdeb3..b23487f 100644
--- a/alfred.h
+++ b/alfred.h
@@ -20,7 +20,7 @@
*/
#ifndef SOURCE_VERSION
-#define SOURCE_VERSION "2015.2"
+#define SOURCE_VERSION "2016.0"
#endif
#include <net/ethernet.h>
diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h
index 2339ded..4f87063 100644
--- a/gpsd/alfred-gpsd.h
+++ b/gpsd/alfred-gpsd.h
@@ -38,7 +38,7 @@
#include "../list.h"
#ifndef SOURCE_VERSION
-#define SOURCE_VERSION "2015.2"
+#define SOURCE_VERSION "2016.0"
#endif
#define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"
diff --git a/vis/vis.h b/vis/vis.h
index 89f0af0..969ca33 100644
--- a/vis/vis.h
+++ b/vis/vis.h
@@ -27,7 +27,7 @@
#ifndef SOURCE_VERSION
-#define SOURCE_VERSION "2015.2"
+#define SOURCE_VERSION "2016.0"
#endif
#define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"
5 years, 4 months
[batctl] master: Merge branch 'next' (0ae7bce)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batctl
On branch : master
>---------------------------------------------------------------
commit 0ae7bcedbb4b3f2296bc73194dc6c13787056a90
Merge: 2dddf83 42b61a7
Author: Simon Wunderlich <sw(a)simonwunderlich.de>
Date: Thu Nov 26 14:03:35 2015 +0100
Merge branch 'next'
>---------------------------------------------------------------
0ae7bcedbb4b3f2296bc73194dc6c13787056a90
main.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
5 years, 4 months
[batctl] tag 'v2015.2' created
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batctl
New tag : v2015.2
Referencing: d3895e412482621696dd3a67636d46514b3535c1
5 years, 4 months