commits June 2015

commits@lists.open-mesh.org

1 participants
69 discussions

[batman-adv] master's head updated: Merge branch 'next' (f7d2e57)
by postmaster＠open-mesh.org 24 Jun '15

24 Jun '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 9bac35c batman-adv: protect tt request from double deletion 2474b5d Merge branch 'maint' into next f7d2e57 Merge branch 'next'

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (2474b5d)
by postmaster＠open-mesh.org 24 Jun '15

24 Jun '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 9bac35c batman-adv: protect tt request from double deletion 2474b5d Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (2474b5d)
by postmaster＠open-mesh.org 24 Jun '15

24 Jun '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 2474b5d7925d79d8753085d56f947ca54067685a Merge: 7870bad 9bac35c Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Wed Jun 24 16:07:21 2015 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 2474b5d7925d79d8753085d56f947ca54067685a net/batman-adv/translation-table.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

1 0

[batman-adv] maint: batman-adv: protect tt request from double deletion (9bac35c)
by postmaster＠open-mesh.org 24 Jun '15

24 Jun '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 9bac35c1e4fab662522371f81147963e19693409 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Jun 22 00:36:28 2015 +0800 batman-adv: protect tt request from double deletion The list_del() calls were changed to list_del_init() to prevent an accidental double deletion in batadv_tt_req_node_new(). Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Acked-by: Antonio Quartulli <antonio(a)meshcoding.com> >--------------------------------------------------------------- 9bac35c1e4fab662522371f81147963e19693409 translation-table.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/translation-table.c b/translation-table.c index dfe8896..b6c0f52 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2194,7 +2194,7 @@ static void batadv_tt_req_list_free(struct batadv_priv *bat_priv) spin_lock_bh(&bat_priv->tt.req_list_lock); list_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) { - list_del(&node->list); + list_del_init(&node->list); kfree(node); } @@ -2230,7 +2230,7 @@ static void batadv_tt_req_purge(struct batadv_priv *bat_priv) list_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) { if (batadv_has_timed_out(node->issued_at, BATADV_TT_REQUEST_TIMEOUT)) { - list_del(&node->list); + list_del_init(&node->list); kfree(node); } } @@ -2512,7 +2512,8 @@ out: batadv_hardif_free_ref(primary_if); if (ret && tt_req_node) { spin_lock_bh(&bat_priv->tt.req_list_lock); - list_del(&tt_req_node->list); + /* list_del_init() verifies tt_req_node still is in the list */ + list_del_init(&tt_req_node->list); spin_unlock_bh(&bat_priv->tt.req_list_lock); kfree(tt_req_node); } @@ -2949,7 +2950,7 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv, list_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) { if (!batadv_compare_eth(node->addr, resp_src)) continue; - list_del(&node->list); + list_del_init(&node->list); kfree(node); }

1 0

[linux-merge]linux integration; annotated tag, v4.1, created. v4.1
by postmaster＠open-mesh.org 22 Jun '15

22 Jun '15

The annotated tag, v4.1 has been created at 8c36ccaef5b771db296df5d8ef1ecf03037b80f8 (tag) tagging b953c0d234bc72e8489d3bf51a276c5c4ec85345 (commit) replaces v4.1-rc8 tagged by Linus Torvalds on Sun Jun 21 22:06:00 2015 -0700 - Shortlog ------------------------------------------------------------ Linux 4.1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJVh5e4AAoJEHm+PkMAQRiG8FsIAKSGI/JmypCL1uj3I0mVbF1g Ih6RkGChRb7wNjbk35BSl5ZRTChH9L4T3ETjFWfIDWPn3lEjdPrLEb5Ldd48W2Nm db2Kk/+f4mjEZXrqESia9NrxhQvyvy6RLBuJ5fGzIE3uRmi9NZMqeiRU5uHnoOyR gHV2ziv6TpVYaiIUPdIPnX7y+g9obSD3qMorIQO/wqRWx7JxRxYYUW5FfTzghA7z D+PwUSpc1qvloHkxw2szNhTWcI6pD+of+qbFnd+wrMbWuE3k7q6lHGz5vd3ynF/w nd82utXhKagCWOujqWp3PsLUzx2Ja3w+nVBOpIlkT/vcXoY9CJ49oJ1tW6pFiUk= =SEx0 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: Add missing include for clear_/set_bit in TT (5138e6a)
by postmaster＠open-mesh.org 19 Jun '15

19 Jun '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 5138e6a3701fd673e108b533f2aa8e46d495a5e2 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Jun 18 18:53:24 2015 +0200 batman-adv: Add missing include for clear_/set_bit in TT a51fa16ecf3f ("batman-adv: Make TT capability changes atomic") started to use use clear_bit and set_bit but did not add the include for these functions. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 5138e6a3701fd673e108b533f2aa8e46d495a5e2 net/batman-adv/translation-table.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 8ef27bb..e96710c 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -19,6 +19,7 @@ #include "main.h" #include <linux/atomic.h> +#include <linux/bitops.h> #include <linux/bug.h> #include <linux/byteorder/generic.h> #include <linux/compiler.h>

1 0

[batman-adv] master: batman-adv: Add missing include for clear_/set_bit in NC (c0d0029)
by postmaster＠open-mesh.org 19 Jun '15

19 Jun '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit c0d00298d192329afb1613a47d3606cc403da6eb Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Jun 18 18:53:23 2015 +0200 batman-adv: Add missing include for clear_/set_bit in NC 586df9e2537b ("batman-adv: Make NC capability changes atomic") started to use clear_bit and set_bit but did not add the include for these functions. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- c0d00298d192329afb1613a47d3606cc403da6eb net/batman-adv/network-coding.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 9d8d6a9..62defe0 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -19,6 +19,7 @@ #include "main.h" #include <linux/atomic.h> +#include <linux/bitops.h> #include <linux/byteorder/generic.h> #include <linux/compiler.h> #include <linux/debugfs.h>

1 0

[batman-adv] master: batman-adv: Add missing include for BUG_ON in MCAST (cfb1542)
by postmaster＠open-mesh.org 19 Jun '15

19 Jun '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit cfb15422f6896a20c279c679c2f71317b337a0eb Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Jun 18 18:53:22 2015 +0200 batman-adv: Add missing include for BUG_ON in MCAST 7f220ed1f063 ("batman-adv: Fix potential synchronization issues in mcast tvlv handler") started to use BUG_ON but did not add the include for these functions. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- cfb15422f6896a20c279c679c2f71317b337a0eb net/batman-adv/multicast.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index b8002a5..c64d9b1 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -20,6 +20,7 @@ #include <linux/atomic.h> #include <linux/bitops.h> +#include <linux/bug.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/etherdevice.h>

1 0

[batman-adv] master: batman-adv: Add missing include for clear_/set_bit in MCAST (0128bee)
by postmaster＠open-mesh.org 19 Jun '15

19 Jun '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 0128bee5d58e48ae2d7e9afce9e0ecb2e8158056 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Jun 18 18:53:21 2015 +0200 batman-adv: Add missing include for clear_/set_bit in MCAST 201a54ba710a ("batman-adv: Make MCAST capability changes atomic") started to use clear_bit and set_bit but did not add the include for these functions. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 0128bee5d58e48ae2d7e9afce9e0ecb2e8158056 net/batman-adv/multicast.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 2fa9983..b8002a5 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -19,6 +19,7 @@ #include "main.h" #include <linux/atomic.h> +#include <linux/bitops.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/etherdevice.h>

1 0

[batman-adv] master: batman-adv: Add missing include for clear_/set_bit in DAT (746aecd)
by postmaster＠open-mesh.org 19 Jun '15

19 Jun '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 746aecdc88377ae04d1eba8ac094ac40ec8b49a9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Jun 18 18:53:20 2015 +0200 batman-adv: Add missing include for clear_/set_bit in DAT bfd0fbaef270 ("batman-adv: Make DAT capability changes atomic") started to use clear_bit and set_bit but did not add the include for these functions. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 746aecdc88377ae04d1eba8ac094ac40ec8b49a9 net/batman-adv/distributed-arp-table.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index dc1191a..4ba7f61 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -19,6 +19,7 @@ #include "main.h" #include <linux/atomic.h> +#include <linux/bitops.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/etherdevice.h>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits June 2015