commits April 2013

commits@lists.open-mesh.org

1 participants
115 discussions

[batman-adv] master: batman-adv: don't check compat version twice (ae9218e)
by postmaster＠open-mesh.org 03 Apr '13

03 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit ae9218eabc56818906256c34379473f3e5ea8026 Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Thu Mar 28 14:21:12 2013 +0100 batman-adv: don't check compat version twice Compatibility version is checked upon packet reception before calling any handler. For this reason it does need to be checked once more in the handler itself. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- ae9218eabc56818906256c34379473f3e5ea8026 bat_iv_ogm.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 6d62e29..38183dc 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1054,13 +1054,6 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, } rcu_read_unlock(); - if (batadv_ogm_packet->header.version != BATADV_COMPAT_VERSION) { - batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "Drop packet: incompatible batman version (%i)\n", - batadv_ogm_packet->header.version); - return; - } - if (is_my_addr) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Drop packet: received my own broadcast (sender: %pM)\n",

1 0

[batman-adv] master: batman-adv: don't check the source address twice (0e7086c)
by postmaster＠open-mesh.org 03 Apr '13

03 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 0e7086c673cb7e383ccb70dd58e9091612780f11 Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Mon Mar 25 22:27:00 2013 +0100 batman-adv: don't check the source address twice The source address has already been checked in batadv_check_management_packet() upon packet reception and therefore it does not need to be checked again in ogm_process() Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 0e7086c673cb7e383ccb70dd58e9091612780f11 bat_iv_ogm.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index da239c5..6d62e29 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -988,7 +988,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, struct batadv_neigh_node *orig_neigh_router = NULL; int has_directlink_flag; int is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0; - int is_broadcast = 0, is_bidirect; + int is_bidirect; bool is_single_hop_neigh = false; bool is_from_best_next_hop = false; int is_duplicate, sameseq, simlar_ttl; @@ -1051,9 +1051,6 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, if (batadv_compare_eth(batadv_ogm_packet->prev_sender, hard_iface->net_dev->dev_addr)) is_my_oldorig = 1; - - if (is_broadcast_ether_addr(ethhdr->h_source)) - is_broadcast = 1; } rcu_read_unlock(); @@ -1071,13 +1068,6 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, return; } - if (is_broadcast) { - batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "Drop packet: ignoring all packets with broadcast source addr (sender: %pM)\n", - ethhdr->h_source); - return; - } - if (is_my_orig) { unsigned long *word; int offset;

1 0

[batman-adv] master: batman-adv: slightly improve neighbor creation debug message (ca32543)
by postmaster＠open-mesh.org 03 Apr '13

03 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit ca32543d6ad096dcc0ccb0379e2e80dc06bdf0ad Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Mon Mar 25 13:54:45 2013 +0100 batman-adv: slightly improve neighbor creation debug message print the interface along with the new neighbor mac address Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- ca32543d6ad096dcc0ccb0379e2e80dc06bdf0ad originator.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/originator.c b/originator.c index ddd417c..e8a54a8 100644 --- a/originator.c +++ b/originator.c @@ -110,7 +110,8 @@ batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, atomic_set(&neigh_node->refcount, 2); batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "Creating new neighbor %pM\n", neigh_addr); + "Creating new neighbor %pM on interface %s\n", neigh_addr, + hard_iface->net_dev->name); out: return neigh_node;

1 0

[batman-adv] master: batman-adv: drop useless argument seqno in neighbor creation (30b5722)
by postmaster＠open-mesh.org 03 Apr '13

03 Apr '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 30b57229f93da9f8b749d36ef6da4d007c3cc692 Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Mon Mar 25 13:49:46 2013 +0100 batman-adv: drop useless argument seqno in neighbor creation the sequence number is not stored in struct neigh_node, therefore there is no need to pass such value to the neigh_node creation procedure. At the moment the value is only used by a debug message, but given the fact that the seqno is not related to the neighbor object, it is better to print it elsewhere. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 30b57229f93da9f8b749d36ef6da4d007c3cc692 bat_iv_ogm.c | 11 ++++------- originator.c | 5 ++--- originator.h | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 071f288..da239c5 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -33,12 +33,11 @@ static struct batadv_neigh_node * batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, const uint8_t *neigh_addr, struct batadv_orig_node *orig_node, - struct batadv_orig_node *orig_neigh, __be32 seqno) + struct batadv_orig_node *orig_neigh) { struct batadv_neigh_node *neigh_node; - neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr, - ntohl(seqno)); + neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr); if (!neigh_node) goto out; @@ -696,8 +695,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, neigh_node = batadv_iv_ogm_neigh_new(if_incoming, ethhdr->h_source, - orig_node, orig_tmp, - batadv_ogm_packet->seqno); + orig_node, orig_tmp); batadv_orig_node_free_ref(orig_tmp); if (!neigh_node) @@ -829,8 +827,7 @@ static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, neigh_node = batadv_iv_ogm_neigh_new(if_incoming, orig_neigh_node->orig, orig_neigh_node, - orig_neigh_node, - batadv_ogm_packet->seqno); + orig_neigh_node); if (!neigh_node) goto out; diff --git a/originator.c b/originator.c index 2f34525..ddd417c 100644 --- a/originator.c +++ b/originator.c @@ -92,7 +92,7 @@ batadv_orig_node_get_router(struct batadv_orig_node *orig_node) struct batadv_neigh_node * batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, - const uint8_t *neigh_addr, uint32_t seqno) + const uint8_t *neigh_addr) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct batadv_neigh_node *neigh_node; @@ -110,8 +110,7 @@ batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, atomic_set(&neigh_node->refcount, 2); batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "Creating new neighbor %pM, initial seqno %d\n", - neigh_addr, seqno); + "Creating new neighbor %pM\n", neigh_addr); out: return neigh_node; diff --git a/originator.h b/originator.h index 7df48fa..476c623 100644 --- a/originator.h +++ b/originator.h @@ -30,7 +30,7 @@ struct batadv_orig_node *batadv_get_orig_node(struct batadv_priv *bat_priv, const uint8_t *addr); struct batadv_neigh_node * batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, - const uint8_t *neigh_addr, uint32_t seqno); + const uint8_t *neigh_addr); void batadv_neigh_node_free_ref(struct batadv_neigh_node *neigh_node); struct batadv_neigh_node * batadv_orig_node_get_router(struct batadv_orig_node *orig_node);

1 0

[linux-merge]linux integration; annotated tag, v3.9-rc5, created. v3.9-rc5
by postmaster＠open-mesh.org 01 Apr '13

01 Apr '13

The annotated tag, v3.9-rc5 has been created at c67bf5361e7e66a0ff1f4caf95f89347d55dfb89 (tag) tagging 07961ac7c0ee8b546658717034fe692fd12eefa9 (commit) replaces v3.9-rc4 tagged by Linus Torvalds on Sun Mar 31 15:12:54 2013 -0700 - Shortlog ------------------------------------------------------------ Linux 3.9-rc5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJRWLTrAAoJEHm+PkMAQRiGe8oH/iMy48mecVWvxVZn74Tx3Cef xmW/PnAIj28EhSPqK49N/Ow6AfQToFKf7AP0ge20KAf5teTq95AY+tH74DAANt8F BjKXXTZiR5xwBvRkq7CR5wDcCvEcBAAz8fgTEd6SEDB2d2VXFf5eKdKUqt1avTCh Z6Hup5kuwX+ddtwY2DCBXtp2n6fL0Rm5yLzY1A3OOBye1E7VyLTF7M5BR603Q44P 4kRLxn8+R7jy3hTuZIhAeoS8TKUoBwVk7DmKxEzrhTHZVOmvwE9lEHybRnIyOpd/ k1JnbRbiPsLsCVFOn10SQkGDAIk00lro3tuWP2C1ljERiD/OOh5Ui9nXYAhMkbI= =q15K -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits April 2013