commits July 2015

commits@lists.open-mesh.org

1 participants
42 discussions

[batman-adv] maint: batman-adv: Fix broken DAT capability check (de46667)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit de4666781c5a64cd55aa6688f77de95f8f66b2c0 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Fri Jul 3 18:29:56 2015 +0200 batman-adv: Fix broken DAT capability check The introduction of set_bit() and clear_bit() calls in batman-adv wrongly passed bitmasks and not the bit numbers to these functions. This leads to broken capability checks. Fixing this by making the capability enum a non-bitmasked one and by that passing non-masked values to set_bit()/clear_bit(). Fixes: bfd0fbaef270 ("batman-adv: Make DAT capability changes atomic") Reported-by: Def <def(a)laposte.net> Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- de4666781c5a64cd55aa6688f77de95f8f66b2c0 distributed-arp-table.c | 2 +- types.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index b2cc19b..c0c514d 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -422,7 +422,7 @@ static bool batadv_is_orig_node_eligible(struct batadv_dat_candidate *res, int j; /* check if orig node candidate is running DAT */ - if (!(candidate->capabilities & BATADV_ORIG_CAPA_HAS_DAT)) + if (!(test_bit(BATADV_ORIG_CAPA_HAS_DAT, &candidate->capabilities))) goto out; /* Check if this node has already been selected... */ diff --git a/types.h b/types.h index 65dc6bf..08a6343 100644 --- a/types.h +++ b/types.h @@ -299,7 +299,7 @@ struct batadv_orig_node { * (= orig node announces a tvlv of type BATADV_TVLV_MCAST) */ enum batadv_orig_capabilities { - BATADV_ORIG_CAPA_HAS_DAT = BIT(0), + BATADV_ORIG_CAPA_HAS_DAT, BATADV_ORIG_CAPA_HAS_NC = BIT(1), BATADV_ORIG_CAPA_HAS_TT = BIT(2), BATADV_ORIG_CAPA_HAS_MCAST = BIT(3),

7 years, 8 months

[linux-merge]linux integration; annotated tag, v4.2-rc1, created. v4.2-rc1

by postmaster＠open-mesh.org

The annotated tag, v4.2-rc1 has been created at 1e951912027ea6873da6985b91e50c47f645ae1a (tag) tagging d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 (commit) replaces v4.1 tagged by Linus Torvalds on Sun Jul 5 11:02:06 2015 -0700 - Shortlog ------------------------------------------------------------ Linux 4.2-rc1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJVmXEeAAoJEHm+PkMAQRiGdIYIAJLyPXCXyG5gqvjw7ZCfwqdP DsXgh89STQ0h9D26ZVj9HltKqaq4GDUnpaaSBgmd7QcHYEQczF3A81TaoeWOMpwm qpItrNUZECYsNHvg4SWxZ7wm6psJugYkIT51T+7xk9QCbYSXKdd0aXyZ+aic7JXh /AOlasJd9WxHw6wtqPxW+N+h0F02Gl5PxcIC/Rn70cBjScN6kOCDxpIEeGtrkOcM LjLnLU1+LBaLpsdKOTWoOb4kCtB1DnpPBtpC09ApBgTBfFyc2TiqngIeQV985zps 9YYnKqBgUnZHoVpFItvXaSYM2suKGHTV98iIQ43Yu5NsAIJk9Q0EhSKlhUR5mQw= =c1wk -----END PGP SIGNATURE----- Antonio Quartulli (4): batman-adv: Use common declaration order in *_send_skb_(packet|unicast) batman-adv: split name from variable for uint mesh attributes batman-adv: add bat_neigh_free API batman-adv: change the MAC of each VLAN upon ndo_set_mac_address Marek Lindner (2): batman-adv: checkpatch - comparison to NULL could be rewritten batman-adv: checkpatch - spaces preferred around that '*' Markus Pargmann (19): batman-adv: debugfs, avoid compiling for !DEBUG_FS batman-adv: tvlv realloc, move error handling into if block batman-adv: Makefile, Sort alphabetically batman-adv: iv_ogm_iface_enable, direct return values batman-adv: iv_ogm_aggr_packet, bool return value batman-adv: iv_ogm_send_to_if, declare char* as const batman-adv: iv_ogm_can_aggregate, code readability batman-adv: iv_ogm_orig_update, remove unnecessary brackets batman-adv: iv_ogm_aggregate_new, simplify error handling batman-adv: iv_ogm_queue_add, Simplify expressions batman-adv: iv_ogm_orig_update, style, add missing brackets batman-adv: iv_ogm, Fix dup_status comment batman-adv: iv_ogm, fix coding style batman-adv: iv_ogm, fix comment function name batman-adv: types, Fix comment on bcast_own batman-adv: main, Convert is_my_mac() to bool batman-adv: main, batadv_compare_eth return bool batman-adv: Remove unnecessary ret variable batman-adv: Remove unnecessary ret variable in algo_register Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (9): batman-adv: update copyright years for 2015 batman-adv: Check total_size when queueing fragments batman-adv: Use only queued fragments when merging batman-adv: Use safer default config for optional features batman-adv: Remove unnecessary check for orig_ifinfo not NULL batman-adv: Use common Jenkins Hash implementation batman-adv: Add required includes to all files batman-adv: Clarify calculation precedence for '&' and '?' batman-adv: Remove unused post-VLAN ethhdr in batadv_gw_dhcp_recipient_get ----------------------------------------------------------------------- -- linux integration

7 years, 8 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits July 2015