commits November 2012

commits@lists.open-mesh.org

1 participants
86 discussions

[batman-adv] next: Merge branch 'maint' into next (79dc2c2)
by postmaster＠open-mesh.org 08 Nov '12

08 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 79dc2c28f6c18f6010f11d5ecc3612839c304a27 Merge: 7cfe135 d46bf9e Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Nov 8 21:35:43 2012 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 79dc2c28f6c18f6010f11d5ecc3612839c304a27 translation-table.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --cc translation-table.c index 451a1a5,fec1a00..cb0281a --- a/translation-table.c +++ b/translation-table.c @@@ -859,8 -767,14 +859,14 @@@ int batadv_tt_global_add(struct batadv_ /* if the client was temporary added before receiving the first * OGM announcing it, we have to clear the TEMP flag */ - tt_global_entry->common.flags &= ~BATADV_TT_CLIENT_TEMP; + common->flags &= ~BATADV_TT_CLIENT_TEMP; + /* the change can carry possible "attribute" flags like the + * TT_CLIENT_WIFI, therefore they have to be copied in the + * client entry + */ + tt_global_entry->common.flags |= flags; + /* If there is the BATADV_TT_CLIENT_ROAM flag set, there is only * one originator left in the list and we previously received a * delete + roaming change for this originator.

1 0

[batman-adv] maint: batman-adv: correctly pass the client flag on tt_response (d46bf9e)
by postmaster＠open-mesh.org 08 Nov '12

08 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit d46bf9e69b31908d0b2eb4efad1e879ec5502490 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Nov 8 14:21:11 2012 +0100 batman-adv: correctly pass the client flag on tt_response When a TT response with the full table is sent, the client flags should be sent as well. This patch fix the flags assignment when populating the tt_response to send back This was introduced by ("batman-adv: detect not yet announced clients") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- d46bf9e69b31908d0b2eb4efad1e879ec5502490 translation-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translation-table.c b/translation-table.c index 64c0012..fec1a00 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1502,7 +1502,7 @@ batadv_tt_response_fill_table(uint16_t tt_len, uint8_t ttvn, memcpy(tt_change->addr, tt_common_entry->addr, ETH_ALEN); - tt_change->flags = BATADV_NO_FLAGS; + tt_change->flags = tt_common_entry->flags; tt_count++; tt_change++;

1 0

[batman-adv] maint: batman-adv: fix tt_global_entries flags update (fa614fd)
by postmaster＠open-mesh.org 08 Nov '12

08 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit fa614fd04692d7cf812ef47f3b6e4eba7bab3ee4 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Nov 7 15:05:33 2012 +0100 batman-adv: fix tt_global_entries flags update Flags carried by a change_entry have to be always copied into the client entry as they may contain important attributes (e.g. TT_CLIENT_WIFI). For instance, a client added by means of the "early detection mechanism" has no flag set at the beginning, so they must be updated once the proper ADD event is received. This was introduced by ("batman-adv: detect not yet announced clients") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- fa614fd04692d7cf812ef47f3b6e4eba7bab3ee4 translation-table.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/translation-table.c b/translation-table.c index 112edd3..64c0012 100644 --- a/translation-table.c +++ b/translation-table.c @@ -769,6 +769,12 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv, */ tt_global_entry->common.flags &= ~BATADV_TT_CLIENT_TEMP; + /* the change can carry possible "attribute" flags like the + * TT_CLIENT_WIFI, therefore they have to be copied in the + * client entry + */ + tt_global_entry->common.flags |= flags; + /* If there is the BATADV_TT_CLIENT_ROAM flag set, there is only * one originator left in the list and we previously received a * delete + roaming change for this originator.

1 0

[batman-adv] master's head updated: batman-adv: fix local client recognition in is_my_client() (7cfe135)
by postmaster＠open-mesh.org 07 Nov '12

07 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 7f91790 batman-adv: Reserve extra bytes in skb for better alignment e754ea0 batman-adv: Mark correctly aligned headers not as __packed 48ff5dc batman-adv: fix david compatibility regression 52f79c4 batman-adv: Use packing of 2 for all headers before an ethernet header 846815f batman-adv: fix ROAM flag de-selection cc9fb91 batman-adv: Fix alignment for payload after batadv_unicast_4addr_packet 3bd73df batman-adv: fix TT packet rerouting 44d6e4a batman-adv: fix debug message fe43315 batman-adv: remove useless goto b8416c2 batman-adv: send ROAMING_ADV once 7cfe135 batman-adv: fix local client recognition in is_my_client()

1 0

[batman-adv] next: batman-adv: fix local client recognition in is_my_client() (7cfe135)
by postmaster＠open-mesh.org 07 Nov '12

07 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 7cfe1356958b6e654b58ce52bfbbc0218cd25d86 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Nov 6 12:05:23 2012 +0100 batman-adv: fix local client recognition in is_my_client() A tt_local_entry which ROAM flag is set cannot be considered a local client anymore. Having the ROAM flag set means that the client roamed away and that the nodes received a ROAMING_ADV for such event This was introduced by ("batman-adv: roaming handling mechanism redesign") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 7cfe1356958b6e654b58ce52bfbbc0218cd25d86 translation-table.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/translation-table.c b/translation-table.c index 5ed7714..451a1a5 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2036,7 +2036,8 @@ bool batadv_is_my_client(struct batadv_priv *bat_priv, const uint8_t *addr) /* Check if the client has been logically deleted (but is kept for * consistency purpose) */ - if (tt_local_entry->common.flags & BATADV_TT_CLIENT_PENDING) + if ((tt_local_entry->common.flags & BATADV_TT_CLIENT_PENDING) || + (tt_local_entry->common.flags & BATADV_TT_CLIENT_ROAM)) goto out; ret = true; out:

1 0

[batman-adv] next: batman-adv: send ROAMING_ADV once (b8416c2)
by postmaster＠open-mesh.org 07 Nov '12

07 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit b8416c21f9fe6c34ff4eac0cdccd5f0a922120a8 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Nov 6 12:05:22 2012 +0100 batman-adv: send ROAMING_ADV once If a client roaming has already been advertised, the node should prevent it from doing the same more than once. To achieve this, the node has to check the ROAM flag on the global client: if this is set already, then the ROAMING_ADV for this client has already been sent. This should be merged with changes done by ("batman-adv: roaming handling mechanism redesign") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- b8416c21f9fe6c34ff4eac0cdccd5f0a922120a8 translation-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/translation-table.c b/translation-table.c index f3628a2..5ed7714 100644 --- a/translation-table.c +++ b/translation-table.c @@ -336,8 +336,10 @@ add_event: batadv_tt_local_event(bat_priv, addr, tt_local->common.flags); check_roaming: - /* Check whether it is a roaming! */ - if (tt_global) { + /* Check whether it is a roaming, but don't do anything if the roaming + * process has already been handled + */ + if (tt_global && !(tt_global->common.flags & BATADV_TT_CLIENT_ROAM)) { /* These node are probably going to update their tt table */ head = &tt_global->orig_list; rcu_read_lock();

1 0

[linux-merge]linux integration; branch, merge/master, updated. v3.7-rc1-1614-g3b9bceb
by postmaster＠open-mesh.org 07 Nov '12

07 Nov '12

The following commit has been merged in the merge/master branch: commit 3b9bcebb9aa41474afaee34286d8a09a751a66fa Merge: b345bfb392e96d2cda71dbae0a83bc62c121ed03 fe4331557dd8bd702b592b9b899242af3284ca77 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Nov 7 17:28:53 2012 +0100 Merge remote-tracking branch 'pkg/next' into merge/master diff --combined net/batman-adv/bat_iv_ogm.c index 75403a4,9f3925a..9f3925a --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@@ -411,9 -411,11 +411,11 @@@ static void batadv_iv_ogm_aggregate_new if ((atomic_read(&bat_priv->aggregated_ogms)) && (packet_len < BATADV_MAX_AGGREGATION_BYTES)) - skb_size = BATADV_MAX_AGGREGATION_BYTES + ETH_HLEN; + skb_size = BATADV_MAX_AGGREGATION_BYTES; else - skb_size = packet_len + ETH_HLEN; + skb_size = packet_len; + + skb_size += ETH_HLEN + NET_IP_ALIGN; forw_packet_aggr->skb = dev_alloc_skb(skb_size); if (!forw_packet_aggr->skb) { @@@ -422,7 -424,7 +424,7 @@@ kfree(forw_packet_aggr); goto out; } - skb_reserve(forw_packet_aggr->skb, ETH_HLEN); + skb_reserve(forw_packet_aggr->skb, ETH_HLEN + NET_IP_ALIGN); INIT_HLIST_NODE(&forw_packet_aggr->list); diff --combined net/batman-adv/icmp_socket.c index 5874c0e,87ca809..87ca809 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@@ -177,13 -177,13 +177,13 @@@ static ssize_t batadv_socket_write(stru if (len >= sizeof(struct batadv_icmp_packet_rr)) packet_len = sizeof(struct batadv_icmp_packet_rr); - skb = dev_alloc_skb(packet_len + ETH_HLEN); + skb = dev_alloc_skb(packet_len + ETH_HLEN + NET_IP_ALIGN); if (!skb) { len = -ENOMEM; goto out; } - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); icmp_packet = (struct batadv_icmp_packet_rr *)skb_put(skb, packet_len); if (copy_from_user(icmp_packet, buff, packet_len)) { diff --combined net/batman-adv/packet.h index aa3e63a,1c5454d..1c5454d --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@@ -121,13 -121,16 +121,16 @@@ struct batadv_bla_claim_dst uint8_t magic[3]; /* FF:43:05 */ uint8_t type; /* bla_claimframe */ __be16 group; /* group id */ - } __packed; + }; struct batadv_header { uint8_t packet_type; uint8_t version; /* batman version field */ uint8_t ttl; - } __packed; + /* the parent struct has to add a byte after the header to make + * everything 4 bytes aligned again + */ + }; struct batadv_ogm_packet { struct batadv_header header; @@@ -152,7 -155,7 +155,7 @@@ struct batadv_icmp_packet __be16 seqno; uint8_t uid; uint8_t reserved; - } __packed; + }; #define BATADV_RR_LEN 16 @@@ -168,13 -171,28 +171,28 @@@ struct batadv_icmp_packet_rr uint8_t uid; uint8_t rr_cur; uint8_t rr[BATADV_RR_LEN][ETH_ALEN]; - } __packed; + }; + + /* All packet headers in front of an ethernet header have to be completely + * divisible by 2 but not by 4 to make the payload after the ethernet + * header again 4 bytes boundary aligned. + * + * A packing of 2 is necessary to avoid extra padding at the end of the struct + * caused by a structure member which is larger than two bytes. Otherwise + * the structure would not fulfill the previously mentioned rule to avoid the + * misalignment of the payload after the ethernet header. It may also lead to + * leakage of information when the padding it not initialized before sending. + */ + #pragma pack(2) struct batadv_unicast_packet { struct batadv_header header; uint8_t ttvn; /* destination translation table version number */ uint8_t dest[ETH_ALEN]; - } __packed; + /* "4 bytes boundary + 2 bytes" long to make the payload after the + * following ethernet header again 4 bytes boundary aligned + */ + }; /** * struct batadv_unicast_4addr_packet - extended unicast packet @@@ -186,7 -204,11 +204,11 @@@ struct batadv_unicast_4addr_packet struct batadv_unicast_packet u; uint8_t src[ETH_ALEN]; uint8_t subtype; - } __packed; + uint8_t reserved; + /* "4 bytes boundary + 2 bytes" long to make the payload after the + * following ethernet header again 4 bytes boundary aligned + */ + }; struct batadv_unicast_frag_packet { struct batadv_header header; @@@ -203,7 -225,12 +225,12 @@@ struct batadv_bcast_packet uint8_t reserved; __be32 seqno; uint8_t orig[ETH_ALEN]; - } __packed; + /* "4 bytes boundary + 2 bytes" long to make the payload after the + * following ethernet header again 4 bytes boundary aligned + */ + }; + + #pragma pack() struct batadv_vis_packet { struct batadv_header header; @@@ -214,7 -241,7 +241,7 @@@ uint8_t vis_orig[ETH_ALEN]; /* originator reporting its neighbors */ uint8_t target_orig[ETH_ALEN]; /* who should receive this packet */ uint8_t sender_orig[ETH_ALEN]; /* who sent or forwarded this packet */ - } __packed; + }; struct batadv_tt_query_packet { struct batadv_header header; diff --combined net/batman-adv/routing.c index d5a01d1,63ff456..63ff456 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@@ -890,22 -890,37 +890,37 @@@ batadv_reroute_unicast_packet(struct ba struct batadv_unicast_packet *unicast_packet, uint8_t *dst_addr) { - struct batadv_orig_node *orig_node; + struct batadv_orig_node *orig_node = NULL; + struct batadv_hard_iface *primary_if = NULL; bool ret = false; + uint8_t *orig_addr, orig_ttvn; - orig_node = batadv_transtable_search(bat_priv, NULL, dst_addr); - if (!orig_node) - goto out; + if (batadv_is_my_client(bat_priv, dst_addr)) { + primary_if = batadv_primary_if_get_selected(bat_priv); + if (!primary_if) + goto out; + orig_addr = primary_if->net_dev->dev_addr; + orig_ttvn = (uint8_t)atomic_read(&bat_priv->tt.vn); + } else { + orig_node = batadv_transtable_search(bat_priv, NULL, dst_addr); + if (!orig_node) + goto out; - if (batadv_compare_eth(orig_node->orig, unicast_packet->dest)) - goto out; + if (batadv_compare_eth(orig_node->orig, unicast_packet->dest)) + goto out; + + orig_addr = orig_node->orig; + orig_ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn); + } /* update the packet header */ - memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN); - unicast_packet->ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn); + memcpy(unicast_packet->dest, orig_addr, ETH_ALEN); + unicast_packet->ttvn = orig_ttvn; ret = true; out: + if (primary_if) + batadv_hardif_free_ref(primary_if); if (orig_node) batadv_orig_node_free_ref(orig_node); @@@ -914,7 -929,7 +929,7 @@@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, struct sk_buff *skb) { - uint8_t curr_ttvn; + uint8_t curr_ttvn, old_ttvn; struct batadv_orig_node *orig_node; struct ethhdr *ethhdr; struct batadv_hard_iface *primary_if; @@@ -979,6 -994,7 +994,7 @@@ if (!is_old_ttvn) return 1; + old_ttvn = unicast_packet->ttvn; /* the packet was forged based on outdated network information. Its * destination can possibly be updated and forwarded towards the new * target host @@@ -988,7 -1004,7 +1004,7 @@@ net_ratelimited_function(batadv_dbg, BATADV_DBG_TT, bat_priv, "Rerouting unicast packet to %pM (dst=%pM): TTVN mismatch old_ttvn=%u new_ttvn=%u\n", unicast_packet->dest, ethhdr->h_dest, - unicast_packet->ttvn, curr_ttvn); + old_ttvn, curr_ttvn); return 1; } diff --combined net/batman-adv/translation-table.c index 6fecb94,f3628a2..f3628a2 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -292,7 -292,6 +292,6 @@@ void batadv_tt_local_add(struct net_dev */ tt_local->common.flags &= ~BATADV_TT_CLIENT_ROAM; roamed_back = true; - goto check_roaming; } goto check_roaming; } @@@ -860,14 -859,6 +859,6 @@@ int batadv_tt_global_add(struct batadv_ */ common->flags &= ~BATADV_TT_CLIENT_TEMP; - /* if this is a normal add, possibly unset the ROAM flag. This - * flag could have been set before because the client was - * roaming, but now that the node got the ADD event, the flag - * can be unset - */ - if (!(flags & BATADV_TT_CLIENT_ROAM)) - common->flags &= ~BATADV_TT_CLIENT_ROAM; - /* If there is the BATADV_TT_CLIENT_ROAM flag set, there is only * one originator left in the list and we previously received a * delete + roaming change for this originator. @@@ -1594,11 -1585,11 +1585,11 @@@ batadv_tt_response_fill_table(uint16_t tt_tot = tt_len / sizeof(struct batadv_tt_change); len = tt_query_size + tt_len; - skb = dev_alloc_skb(len + ETH_HLEN); + skb = dev_alloc_skb(len + ETH_HLEN + NET_IP_ALIGN); if (!skb) goto out; - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); tt_response = (struct batadv_tt_query_packet *)skb_put(skb, len); tt_response->ttvn = ttvn; @@@ -1659,11 -1650,11 +1650,11 @@@ static int batadv_send_tt_request(struc if (!tt_req_node) goto out; - skb = dev_alloc_skb(sizeof(*tt_request) + ETH_HLEN); + skb = dev_alloc_skb(sizeof(*tt_request) + ETH_HLEN + NET_IP_ALIGN); if (!skb) goto out; - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); tt_req_len = sizeof(*tt_request); tt_request = (struct batadv_tt_query_packet *)skb_put(skb, tt_req_len); @@@ -1761,11 -1752,11 +1752,11 @@@ batadv_send_other_tt_response(struct ba tt_tot = tt_len / sizeof(struct batadv_tt_change); len = sizeof(*tt_response) + tt_len; - skb = dev_alloc_skb(len + ETH_HLEN); + skb = dev_alloc_skb(len + ETH_HLEN + NET_IP_ALIGN); if (!skb) goto unlock; - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); packet_pos = skb_put(skb, len); tt_response = (struct batadv_tt_query_packet *)packet_pos; tt_response->ttvn = req_ttvn; @@@ -1880,11 -1871,11 +1871,11 @@@ batadv_send_my_tt_response(struct batad tt_tot = tt_len / sizeof(struct batadv_tt_change); len = sizeof(*tt_response) + tt_len; - skb = dev_alloc_skb(len + ETH_HLEN); + skb = dev_alloc_skb(len + ETH_HLEN + NET_IP_ALIGN); if (!skb) goto unlock; - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); packet_pos = skb_put(skb, len); tt_response = (struct batadv_tt_query_packet *)packet_pos; tt_response->ttvn = req_ttvn; @@@ -2211,11 -2202,11 +2202,11 @@@ static void batadv_send_roam_adv(struc if (!batadv_tt_check_roam_count(bat_priv, client)) goto out; - skb = dev_alloc_skb(sizeof(*roam_adv_packet) + ETH_HLEN); + skb = dev_alloc_skb(sizeof(*roam_adv_packet) + ETH_HLEN + NET_IP_ALIGN); if (!skb) goto out; - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); roam_adv_packet = (struct batadv_roam_adv_packet *)skb_put(skb, len); diff --combined net/batman-adv/unicast.c index 9416136,10aff49..10aff49 --- a/net/batman-adv/unicast.c +++ b/net/batman-adv/unicast.c @@@ -374,6 -374,7 +374,7 @@@ bool batadv_unicast_4addr_prepare_skb(s memcpy(unicast_4addr_packet->src, primary_if->net_dev->dev_addr, ETH_ALEN); unicast_4addr_packet->subtype = packet_subtype; + unicast_4addr_packet->reserved = 0; ret = true; out: diff --combined net/batman-adv/vis.c index 79589a3,0f65a9d..0f65a9d --- a/net/batman-adv/vis.c +++ b/net/batman-adv/vis.c @@@ -396,12 -396,12 +396,12 @@@ batadv_add_packet(struct batadv_priv *b return NULL; len = sizeof(*packet) + vis_info_len; - info->skb_packet = dev_alloc_skb(len + ETH_HLEN); + info->skb_packet = dev_alloc_skb(len + ETH_HLEN + NET_IP_ALIGN); if (!info->skb_packet) { kfree(info); return NULL; } - skb_reserve(info->skb_packet, ETH_HLEN); + skb_reserve(info->skb_packet, ETH_HLEN + NET_IP_ALIGN); packet = (struct batadv_vis_packet *)skb_put(info->skb_packet, len); kref_init(&info->refcount); @@@ -856,12 -856,13 +856,13 @@@ int batadv_vis_init(struct batadv_priv if (!bat_priv->vis.my_info) goto err; - len = sizeof(*packet) + BATADV_MAX_VIS_PACKET_SIZE + ETH_HLEN; + len = sizeof(*packet) + BATADV_MAX_VIS_PACKET_SIZE; + len += ETH_HLEN + NET_IP_ALIGN; bat_priv->vis.my_info->skb_packet = dev_alloc_skb(len); if (!bat_priv->vis.my_info->skb_packet) goto free_info; - skb_reserve(bat_priv->vis.my_info->skb_packet, ETH_HLEN); + skb_reserve(bat_priv->vis.my_info->skb_packet, ETH_HLEN + NET_IP_ALIGN); tmp_skb = bat_priv->vis.my_info->skb_packet; packet = (struct batadv_vis_packet *)skb_put(tmp_skb, sizeof(*packet)); -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem
by postmaster＠open-mesh.org 07 Nov '12

07 Nov '12

The annotated tag, batman-adv-for-davem has been updated to 7ef1bfdf3ee59f1668e1735b8cb5b165776202ae (tag) from 00cd9af6ad9fcfd5edffd5a67a6442364aa71d45 (which is now obsolete) tagging 9affec6be810d1d529cb9dc95126119451696ba6 (commit) replaces batman-adv-fix-for-davem tagged by Antonio Quartulli on Wed Nov 7 20:01:47 2012 +0100 - Shortlog ------------------------------------------------------------ Included changes: - minimal fixes to the packet layout to avoid the __packed attribute when not needed - new packet type called UNICAST_4ADDR: in this packet it is possible to find both source and destination node (in the classic UNICAST header only the destination field exists). - a new feature: Distributed ARP Table (D.A.T.). It aims to reduce ARP lookups latency by means of a simil-DHT approach. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlCasB8ACgkQpGgxIkP9cwd2kACeOhRvj9EA2hWo1vKQUN6OvTi0 nOcAn08Rvyf+gUPAFQcA9HEUAr8kAebT =c3ey -----END PGP SIGNATURE----- Antonio Quartulli (17): batman-adv: use check_unicast_packet() in recv_roam_adv() batman-adv: return proper value in case of hash_add failure batman-adv: properly store the roaming time batman-adv: print packets re-routing on DBG_TT and ratelimit it batman-adv: check for more space before accessing the skb batman-adv: properly convert flag into a boolean value batman-adv: pass the WIFI flag from the local to global entry batman-adv: add kernel-doc for enum batadv_dbg_level batman-adv: add UNICAST_4ADDR packet type batman-adv: Distributed ARP Table - add a new debug log level batman-adv: Distributed ARP Table - create DHT helper functions batman-adv: Distributed ARP Table - implement local storage batman-adv: Distributed ARP Table - add ARP parsing functions batman-adv: Distributed ARP Table - add snooping functions for ARP messages batman-adv: Distributed ARP Table - add compile option batman-adv: Distributed ARP Table - add runtime switch batman-adv: enable fast client detection using unicast_4addr packets Marek Lindner (2): batman-adv: split hard_iface struct for each routing protocol batman-adv: consolidate duplicated primary_if checking code Martin Hundebøll (1): batman-adv: Add get_ethtool_stats() support for DAT Simon Wunderlich (1): batman-adv: don't allow ECTP traffic on batman-adv Sven Eckelmann (7): batman-adv: Remove unused define BAT_ATTR_HIF_UINT batman-adv: Set special lockdep classes to avoid lockdep warning batman-adv: Remove extra check in batadv_bit_get_packet batman-adv: Check return value of try_module_get batman-adv: Only increase refcounter once for alternate router batman-adv: Reserve extra bytes in skb for better alignment batman-adv: Mark correctly aligned headers not as __packed ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] next: batman-adv: remove useless goto (fe43315)
by postmaster＠open-mesh.org 07 Nov '12

07 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit fe4331557dd8bd702b592b9b899242af3284ca77 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Nov 6 12:05:21 2012 +0100 batman-adv: remove useless goto This was introduced by ("batman-adv: roaming handling mechanism redesign") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- fe4331557dd8bd702b592b9b899242af3284ca77 translation-table.c | 1 - 1 file changed, 1 deletion(-) diff --git a/translation-table.c b/translation-table.c index 0bdf980..f3628a2 100644 --- a/translation-table.c +++ b/translation-table.c @@ -292,7 +292,6 @@ void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, */ tt_local->common.flags &= ~BATADV_TT_CLIENT_ROAM; roamed_back = true; - goto check_roaming; } goto check_roaming; }

1 0

[batman-adv] next: batman-adv: fix debug message (44d6e4a)
by postmaster＠open-mesh.org 07 Nov '12

07 Nov '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 44d6e4a955113f9c8db67d2b8518bc5b6c2ac12a Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Nov 6 12:05:20 2012 +0100 batman-adv: fix debug message In case of re-routing, the old_ttvn must be saved before being overwritten, otherwise the debug message will obviously print the new one. This was introduced by ("batman-adv: substitute tt_poss_change with a per-tt_entry flag") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 44d6e4a955113f9c8db67d2b8518bc5b6c2ac12a routing.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/routing.c b/routing.c index c190c73..63ff456 100644 --- a/routing.c +++ b/routing.c @@ -929,7 +929,7 @@ out: static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, struct sk_buff *skb) { - uint8_t curr_ttvn; + uint8_t curr_ttvn, old_ttvn; struct batadv_orig_node *orig_node; struct ethhdr *ethhdr; struct batadv_hard_iface *primary_if; @@ -994,6 +994,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, if (!is_old_ttvn) return 1; + old_ttvn = unicast_packet->ttvn; /* the packet was forged based on outdated network information. Its * destination can possibly be updated and forwarded towards the new * target host @@ -1003,7 +1004,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, net_ratelimited_function(batadv_dbg, BATADV_DBG_TT, bat_priv, "Rerouting unicast packet to %pM (dst=%pM): TTVN mismatch old_ttvn=%u new_ttvn=%u\n", unicast_packet->dest, ethhdr->h_dest, - unicast_packet->ttvn, curr_ttvn); + old_ttvn, curr_ttvn); return 1; }

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2012