linux-merge November 2012

linux-merge@lists.open-mesh.org

2 participants
62 discussions

Build check errors found: 2012-12-01

by postmaster＠open-mesh.org

Name of failed tests ==================== checkpatch master bat_iv_ogm.c checkpatch master bridge_loop_avoidance.c checkpatch master debugfs.c checkpatch master originator.c checkpatch master routing.c checkpatch master send.c checkpatch master translation-table.c checkpatch master unicast.c checkpatch next bat_iv_ogm.c checkpatch next bridge_loop_avoidance.c checkpatch next debugfs.c checkpatch next originator.c checkpatch next routing.c checkpatch next send.c checkpatch next translation-table.c checkpatch next unicast.c Output of different failed tests ================================ checkpatch master translation-table.c: >>>>>>>> CHECK: Blank lines aren't necessary before a close brace '}' #116: FILE: translation-table.c:116: + +} CHECK: Blank lines aren't necessary before a close brace '}' #253: FILE: translation-table.c:253: + +} CHECK: Blank lines aren't necessary before a close brace '}' #645: FILE: translation-table.c:645: + +} CHECK: Blank lines aren't necessary before a close brace '}' #1069: FILE: translation-table.c:1069: + +} CHECK: Blank lines aren't necessary before a close brace '}' #1845: FILE: translation-table.c:1845: + +} CHECK: Blank lines aren't necessary before a close brace '}' #2372: FILE: translation-table.c:2372: + +} CHECK: Blank lines aren't necessary before a close brace '}' #2569: FILE: translation-table.c:2569: + +} total: 0 errors, 0 warnings, 7 checks, 2595 lines checked checkpatch next bat_iv_ogm.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #186: FILE: bat_iv_ogm.c:186: + batadv_ogm_packet->tt_num_changes)) { + CHECK: Blank lines aren't necessary after an open brace '{' #264: FILE: bat_iv_ogm.c:264: + (forw_packet->own && (forw_packet->if_incoming != primary_if))) { + CHECK: Blank lines aren't necessary after an open brace '{' #328: FILE: bat_iv_ogm.c:328: + (aggregated_bytes <= BATADV_MAX_AGGREGATION_BYTES)) { + CHECK: Blank lines aren't necessary after an open brace '{' #818: FILE: bat_iv_ogm.c:818: + &orig_neigh_node->neigh_list, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #952: FILE: bat_iv_ogm.c:952: + &orig_node->neigh_list, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #1226: FILE: bat_iv_ogm.c:1226: + if (is_single_hop_neigh) { + total: 0 errors, 0 warnings, 6 checks, 1349 lines checked checkpatch next bridge_loop_avoidance.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #238: FILE: bridge_loop_avoidance.c:238: + head, hash_entry) { + CHECK: Blank lines aren't necessary before a close brace '}' #342: FILE: bridge_loop_avoidance.c:342: + + } CHECK: Blank lines aren't necessary before a close brace '}' #543: FILE: bridge_loop_avoidance.c:543: + +} CHECK: Blank lines aren't necessary before a close brace '}' #602: FILE: bridge_loop_avoidance.c:602: + + } total: 0 errors, 0 warnings, 4 checks, 1706 lines checked checkpatch next debugfs.c: >>>>>>>> CHECK: Blank lines aren't necessary before a close brace '}' #168: FILE: debugfs.c:168: + + } WARNING: debugfs_remove_recursive(NULL) is safe this check is probably not required #401: FILE: debugfs.c:401: + if (batadv_debugfs) { + debugfs_remove_recursive(batadv_debugfs); total: 0 errors, 1 warnings, 1 checks, 459 lines checked checkpatch next originator.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #181: FILE: originator.c:181: + head, hash_entry) { + CHECK: Blank lines aren't necessary after an open brace '{' #288: FILE: originator.c:288: + &orig_node->neigh_list, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #296: FILE: originator.c:296: + (if_incoming->if_status == BATADV_IF_TO_BE_REMOVED)) { + total: 0 errors, 0 warnings, 3 checks, 645 lines checked checkpatch next routing.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #83: FILE: routing.c:83: + } else if ((!curr_router) && (neigh_node)) { + CHECK: Blank lines aren't necessary after an open brace '{' #175: FILE: routing.c:175: + &orig_node->neigh_list, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #839: FILE: routing.c:839: + neigh_node->if_incoming->net_dev->mtu)) { + CHECK: Blank lines aren't necessary after an open brace '{' #1106: FILE: routing.c:1106: + if (batadv_is_my_mac(unicast_packet->dest)) { + total: 0 errors, 0 warnings, 4 checks, 1281 lines checked checkpatch next send.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #333: FILE: send.c:333: + &bat_priv->forw_bcast_list, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #360: FILE: send.c:360: + &bat_priv->forw_bat_list, list) { + total: 0 errors, 0 warnings, 2 checks, 382 lines checked checkpatch next translation-table.c: >>>>>>>> CHECK: Blank lines aren't necessary before a close brace '}' #116: FILE: translation-table.c:116: + +} CHECK: Blank lines aren't necessary before a close brace '}' #253: FILE: translation-table.c:253: + +} CHECK: Blank lines aren't necessary before a close brace '}' #631: FILE: translation-table.c:631: + +} CHECK: Blank lines aren't necessary before a close brace '}' #1053: FILE: translation-table.c:1053: + +} CHECK: Blank lines aren't necessary before a close brace '}' #1829: FILE: translation-table.c:1829: + +} CHECK: Blank lines aren't necessary before a close brace '}' #2356: FILE: translation-table.c:2356: + +} CHECK: Blank lines aren't necessary before a close brace '}' #2553: FILE: translation-table.c:2553: + +} total: 0 errors, 0 warnings, 7 checks, 2579 lines checked checkpatch next unicast.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #136: FILE: unicast.c:136: + list_for_each_entry(tfp, head, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #165: FILE: unicast.c:165: + if (!list_empty(head)) { + total: 0 errors, 0 warnings, 2 checks, 480 lines checked

10 years, 6 months

Build check errors found: 2012-11-30

by postmaster＠open-mesh.org

Name of failed tests ==================== checkpatch master bat_iv_ogm.c checkpatch master bridge_loop_avoidance.c checkpatch master debugfs.c checkpatch master originator.c checkpatch master routing.c checkpatch master send.c checkpatch master translation-table.c checkpatch master unicast.c checkpatch next bat_iv_ogm.c checkpatch next bridge_loop_avoidance.c checkpatch next debugfs.c checkpatch next originator.c checkpatch next routing.c checkpatch next send.c checkpatch next translation-table.c checkpatch next unicast.c Output of different failed tests ================================ checkpatch master translation-table.c: >>>>>>>> CHECK: Blank lines aren't necessary before a close brace '}' #116: FILE: translation-table.c:116: + +} CHECK: Blank lines aren't necessary before a close brace '}' #253: FILE: translation-table.c:253: + +} CHECK: Blank lines aren't necessary before a close brace '}' #645: FILE: translation-table.c:645: + +} CHECK: Blank lines aren't necessary before a close brace '}' #1069: FILE: translation-table.c:1069: + +} CHECK: Blank lines aren't necessary before a close brace '}' #1845: FILE: translation-table.c:1845: + +} CHECK: Blank lines aren't necessary before a close brace '}' #2372: FILE: translation-table.c:2372: + +} CHECK: Blank lines aren't necessary before a close brace '}' #2569: FILE: translation-table.c:2569: + +} total: 0 errors, 0 warnings, 7 checks, 2595 lines checked checkpatch next bat_iv_ogm.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #186: FILE: bat_iv_ogm.c:186: + batadv_ogm_packet->tt_num_changes)) { + CHECK: Blank lines aren't necessary after an open brace '{' #264: FILE: bat_iv_ogm.c:264: + (forw_packet->own && (forw_packet->if_incoming != primary_if))) { + CHECK: Blank lines aren't necessary after an open brace '{' #328: FILE: bat_iv_ogm.c:328: + (aggregated_bytes <= BATADV_MAX_AGGREGATION_BYTES)) { + CHECK: Blank lines aren't necessary after an open brace '{' #818: FILE: bat_iv_ogm.c:818: + &orig_neigh_node->neigh_list, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #952: FILE: bat_iv_ogm.c:952: + &orig_node->neigh_list, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #1226: FILE: bat_iv_ogm.c:1226: + if (is_single_hop_neigh) { + total: 0 errors, 0 warnings, 6 checks, 1349 lines checked checkpatch next bridge_loop_avoidance.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #238: FILE: bridge_loop_avoidance.c:238: + head, hash_entry) { + CHECK: Blank lines aren't necessary before a close brace '}' #342: FILE: bridge_loop_avoidance.c:342: + + } CHECK: Blank lines aren't necessary before a close brace '}' #543: FILE: bridge_loop_avoidance.c:543: + +} CHECK: Blank lines aren't necessary before a close brace '}' #602: FILE: bridge_loop_avoidance.c:602: + + } total: 0 errors, 0 warnings, 4 checks, 1706 lines checked checkpatch next debugfs.c: >>>>>>>> CHECK: Blank lines aren't necessary before a close brace '}' #168: FILE: debugfs.c:168: + + } WARNING: debugfs_remove_recursive(NULL) is safe this check is probably not required #401: FILE: debugfs.c:401: + if (batadv_debugfs) { + debugfs_remove_recursive(batadv_debugfs); total: 0 errors, 1 warnings, 1 checks, 459 lines checked checkpatch next originator.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #181: FILE: originator.c:181: + head, hash_entry) { + CHECK: Blank lines aren't necessary after an open brace '{' #288: FILE: originator.c:288: + &orig_node->neigh_list, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #296: FILE: originator.c:296: + (if_incoming->if_status == BATADV_IF_TO_BE_REMOVED)) { + total: 0 errors, 0 warnings, 3 checks, 645 lines checked checkpatch next routing.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #83: FILE: routing.c:83: + } else if ((!curr_router) && (neigh_node)) { + CHECK: Blank lines aren't necessary after an open brace '{' #175: FILE: routing.c:175: + &orig_node->neigh_list, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #839: FILE: routing.c:839: + neigh_node->if_incoming->net_dev->mtu)) { + CHECK: Blank lines aren't necessary after an open brace '{' #1106: FILE: routing.c:1106: + if (batadv_is_my_mac(unicast_packet->dest)) { + total: 0 errors, 0 warnings, 4 checks, 1281 lines checked checkpatch next send.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #331: FILE: send.c:331: + &bat_priv->forw_bcast_list, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #358: FILE: send.c:358: + &bat_priv->forw_bat_list, list) { + total: 0 errors, 0 warnings, 2 checks, 380 lines checked checkpatch next translation-table.c: >>>>>>>> CHECK: Blank lines aren't necessary before a close brace '}' #116: FILE: translation-table.c:116: + +} CHECK: Blank lines aren't necessary before a close brace '}' #253: FILE: translation-table.c:253: + +} CHECK: Blank lines aren't necessary before a close brace '}' #631: FILE: translation-table.c:631: + +} CHECK: Blank lines aren't necessary before a close brace '}' #1053: FILE: translation-table.c:1053: + +} CHECK: Blank lines aren't necessary before a close brace '}' #1829: FILE: translation-table.c:1829: + +} CHECK: Blank lines aren't necessary before a close brace '}' #2356: FILE: translation-table.c:2356: + +} CHECK: Blank lines aren't necessary before a close brace '}' #2553: FILE: translation-table.c:2553: + +} total: 0 errors, 0 warnings, 7 checks, 2579 lines checked checkpatch next unicast.c: >>>>>>>> CHECK: Blank lines aren't necessary after an open brace '{' #136: FILE: unicast.c:136: + list_for_each_entry(tfp, head, list) { + CHECK: Blank lines aren't necessary after an open brace '{' #165: FILE: unicast.c:165: + if (!list_empty(head)) { + total: 0 errors, 0 warnings, 2 checks, 480 lines checked

10 years, 6 months

Build check errors found: 2012-11-29

by postmaster＠open-mesh.org

Name of failed tests ==================== checkpatch master debugfs.c checkpatch next debugfs.c Output of different failed tests ================================ checkpatch next debugfs.c: >>>>>>>> WARNING: debugfs_remove_recursive(NULL) is safe this check is probably not required #401: FILE: debugfs.c:401: + if (batadv_debugfs) { + debugfs_remove_recursive(batadv_debugfs); total: 0 errors, 1 warnings, 0 checks, 459 lines checked

10 years, 6 months

Build check errors found: 2012-11-28

by postmaster＠open-mesh.org

10 years, 6 months

[linux-next] LinuxNextTracking branch, master, updated. next-20121126

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit e022b956c11084f3ee1c6ece523e14ac07b7c645 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Nov 5 21:25:27 2012 +0100 batman-adv: Use packing of 2 for all headers before an ethernet header 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. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index df548ed..1c5454d 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@ -173,6 +173,18 @@ struct batadv_icmp_packet_rr { uint8_t rr[BATADV_RR_LEN][ETH_ALEN]; }; +/* 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 */ @@ -216,7 +228,9 @@ struct batadv_bcast_packet { /* "4 bytes boundary + 2 bytes" long to make the payload after the * following ethernet header again 4 bytes boundary aligned */ -} __packed; +}; + +#pragma pack() struct batadv_vis_packet { struct batadv_header header; -- LinuxNextTracking

10 years, 6 months

[linux-next] LinuxNextTracking branch, master, updated. next-20121126

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit 95a066d82c422c812c10bfd4de01225b1714fa45 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Oct 17 21:10:39 2012 +0200 batman-adv: Add function to calculate crc32c for the skb payload Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index 250e0b5..8d8afb1 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -6,6 +6,7 @@ config BATMAN_ADV tristate "B.A.T.M.A.N. Advanced Meshing Protocol" depends on NET select CRC16 + select LIBCRC32C default n help B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index dc33a0c..f65a222 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -17,6 +17,8 @@ * 02110-1301, USA */ +#include <linux/crc32c.h> +#include <linux/highmem.h> #include "main.h" #include "sysfs.h" #include "debugfs.h" @@ -420,6 +422,38 @@ int batadv_algo_seq_print_text(struct seq_file *seq, void *offset) return 0; } +/** + * batadv_skb_crc32 - calculate CRC32 of the whole packet and skip bytes in + * the header + * @skb: skb pointing to fragmented socket buffers + * @payload_ptr: Pointer to position inside the head buffer of the skb + * marking the start of the data to be CRC'ed + * + * payload_ptr must always point to an address in the skb head buffer and not to + * a fragment. + */ +__be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr) +{ + u32 crc = 0; + unsigned int from; + unsigned int to = skb->len; + struct skb_seq_state st; + const u8 *data; + unsigned int len; + unsigned int consumed = 0; + + from = (unsigned int)(payload_ptr - skb->data); + + skb_prepare_seq_read(skb, from, to, &st); + while ((len = skb_seq_read(consumed, &data, &st)) != 0) { + crc = crc32c(crc, data, len); + consumed += len; + } + skb_abort_seq_read(&st); + + return htonl(crc); +} + static int batadv_param_set_ra(const char *val, const struct kernel_param *kp) { struct batadv_algo_ops *bat_algo_ops; diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 8f149bb..ce5e5b9 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -174,6 +174,7 @@ void batadv_recv_handler_unregister(uint8_t packet_type); int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops); int batadv_algo_select(struct batadv_priv *bat_priv, char *name); int batadv_algo_seq_print_text(struct seq_file *seq, void *offset); +__be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr); /** * enum batadv_dbg_level - available log levels -- LinuxNextTracking

10 years, 6 months

[linux-next] LinuxNextTracking branch, master, updated. next-20121126

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit 004e86fc585f617f07bff38480eeee335be9b017 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Thu Oct 18 13:47:42 2012 +0200 batman-adv: Fix broadcast duplist for fragmentation If the skb is fragmented, the checksum must be computed on the individual fragments, just using skb->data may fail on fragmented data. Instead of doing linearizing the packet, use the new batadv_crc32 to do that more efficiently- it should not hurt replacing the old crc16 by the new crc32. Reported-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 7ffef8b..5aebe93 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1249,8 +1249,7 @@ int batadv_bla_init(struct batadv_priv *bat_priv) /** * batadv_bla_check_bcast_duplist * @bat_priv: the bat priv with all the soft interface information - * @bcast_packet: encapsulated broadcast frame plus batman header - * @bcast_packet_len: length of encapsulated broadcast frame plus batman header + * @skb: contains the bcast_packet to be checked * * check if it is on our broadcast list. Another gateway might * have sent the same packet because it is connected to the same backbone, @@ -1262,20 +1261,17 @@ int batadv_bla_init(struct batadv_priv *bat_priv) * the same host however as this might be intended. */ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, - struct batadv_bcast_packet *bcast_packet, - int bcast_packet_len) + struct sk_buff *skb) { - int i, length, curr, ret = 0; - uint8_t *content; - uint16_t crc; + int i, curr, ret = 0; + __be32 crc; + struct batadv_bcast_packet *bcast_packet; struct batadv_bcast_duplist_entry *entry; - length = bcast_packet_len - sizeof(*bcast_packet); - content = (uint8_t *)bcast_packet; - content += sizeof(*bcast_packet); + bcast_packet = (struct batadv_bcast_packet *)skb->data; /* calculate the crc ... */ - crc = crc16(0, content, length); + crc = batadv_skb_crc32(skb, (u8 *)(bcast_packet + 1)); spin_lock_bh(&bat_priv->bla.bcast_duplist_lock); diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index 789cb73..196d9a0 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -31,8 +31,7 @@ int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset); int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig); int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, - struct batadv_bcast_packet *bcast_packet, - int hdr_size); + struct sk_buff *skb); void batadv_bla_update_orig_address(struct batadv_priv *bat_priv, struct batadv_hard_iface *primary_if, struct batadv_hard_iface *oldif); @@ -81,8 +80,7 @@ static inline int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, static inline int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, - struct batadv_bcast_packet *bcast_packet, - int hdr_size) + struct sk_buff *skb) { return 0; } diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 8d64348..1aa1722 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -1196,14 +1196,8 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, spin_unlock_bh(&orig_node->bcast_seqno_lock); - /* keep skb linear for crc calculation */ - if (skb_linearize(skb) < 0) - goto out; - - bcast_packet = (struct batadv_bcast_packet *)skb->data; - /* check whether this has been sent by another originator before */ - if (batadv_bla_check_bcast_duplist(bat_priv, bcast_packet, skb->len)) + if (batadv_bla_check_bcast_duplist(bat_priv, skb)) goto out; /* rebroadcast packet */ diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 7b3d0d7..ae9ac9a 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -156,7 +156,7 @@ struct batadv_neigh_node { #ifdef CONFIG_BATMAN_ADV_BLA struct batadv_bcast_duplist_entry { uint8_t orig[ETH_ALEN]; - uint16_t crc; + __be32 crc; unsigned long entrytime; }; #endif -- LinuxNextTracking

10 years, 6 months

[linux-next] LinuxNextTracking branch, master, updated. next-20121126

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit d81f78ec37ecad3a4cc0a71d0ea1f74994ec5cda Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Oct 29 17:15:08 2012 +0100 batman-adv: Start new development cycle Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index ce5e5b9..2f85577 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -26,7 +26,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2012.4.0" +#define BATADV_SOURCE_VERSION "2012.5.0" #endif /* B.A.T.M.A.N. parameters */ -- LinuxNextTracking

10 years, 6 months

[linux-next] LinuxNextTracking branch, master, updated. next-20121126

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit 637fbd12947b5645d8c16c982aa15c17ab695b0a Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Oct 16 10:04:39 2012 +0200 batman-adv: support array of debugfs general attributes This patch adds support for an array of debugfs general (not soft_iface specific) attributes. With this change it will be possible to add more general attributes by simply appending them to the array without touching the rest of the code. Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Acked-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index 3f679cb..6f58ddd 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -323,7 +323,17 @@ struct batadv_debuginfo batadv_debuginfo_##_name = { \ } \ }; +/* the following attributes are general and therefore they will be directly + * placed in the BATADV_DEBUGFS_SUBDIR subdirectory of debugfs + */ static BATADV_DEBUGINFO(routing_algos, S_IRUGO, batadv_algorithms_open); + +static struct batadv_debuginfo *batadv_general_debuginfos[] = { + &batadv_debuginfo_routing_algos, + NULL, +}; + +/* The following attributes are per soft interface */ static BATADV_DEBUGINFO(originators, S_IRUGO, batadv_originators_open); static BATADV_DEBUGINFO(gateways, S_IRUGO, batadv_gateways_open); static BATADV_DEBUGINFO(transtable_global, S_IRUGO, @@ -358,7 +368,7 @@ static struct batadv_debuginfo *batadv_mesh_debuginfos[] = { void batadv_debugfs_init(void) { - struct batadv_debuginfo *bat_debug; + struct batadv_debuginfo **bat_debug; struct dentry *file; batadv_debugfs = debugfs_create_dir(BATADV_DEBUGFS_SUBDIR, NULL); @@ -366,17 +376,23 @@ void batadv_debugfs_init(void) batadv_debugfs = NULL; if (!batadv_debugfs) - goto out; + goto err; - bat_debug = &batadv_debuginfo_routing_algos; - file = debugfs_create_file(bat_debug->attr.name, - S_IFREG | bat_debug->attr.mode, - batadv_debugfs, NULL, &bat_debug->fops); - if (!file) - pr_err("Can't add debugfs file: %s\n", bat_debug->attr.name); + for (bat_debug = batadv_general_debuginfos; *bat_debug; ++bat_debug) { + file = debugfs_create_file(((*bat_debug)->attr).name, + S_IFREG | ((*bat_debug)->attr).mode, + batadv_debugfs, NULL, + &(*bat_debug)->fops); + if (!file) { + pr_err("Can't add general debugfs file: %s\n", + ((*bat_debug)->attr).name); + goto err; + } + } -out: return; +err: + debugfs_remove_recursive(batadv_debugfs); } void batadv_debugfs_destroy(void) -- LinuxNextTracking

10 years, 6 months

[linux-next] LinuxNextTracking branch, master, updated. next-20121126

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit bb351ba0bba23f01af00e36bfe20897201f404fa Author: Martin Hundebøll <martin(a)hundeboll.net> Date: Tue Oct 16 16:13:48 2012 +0200 batman-adv: Add wrapper to look up neighbor and send skb By adding batadv_send_skb_to_orig() in send.c, we can remove duplicate code that looks up the next hop and then calls batadv_send_skb_packet(). Furthermore, this prepares the upcoming new implementation of fragmentation, which requires the next hop to route packets. Please note that this doesn't entirely remove the next-hop lookup in routing.c and unicast.c, since it is used by the current fragmentation code. Also note that the next-hop info is removed from debug messages in translation-table.c, since it is looked up elsewhere. Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 78d6572..8d64348 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -285,7 +285,6 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, { struct batadv_hard_iface *primary_if = NULL; struct batadv_orig_node *orig_node = NULL; - struct batadv_neigh_node *router = NULL; struct batadv_icmp_packet_rr *icmp_packet; int ret = NET_RX_DROP; @@ -307,10 +306,6 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, if (!orig_node) goto out; - router = batadv_orig_node_get_router(orig_node); - if (!router) - goto out; - /* create a copy of the skb, if needed, to modify it. */ if (skb_cow(skb, ETH_HLEN) < 0) goto out; @@ -322,14 +317,12 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, icmp_packet->msg_type = BATADV_ECHO_REPLY; icmp_packet->header.ttl = BATADV_TTL; - batadv_send_skb_packet(skb, router->if_incoming, router->addr); - ret = NET_RX_SUCCESS; + if (batadv_send_skb_to_orig(skb, orig_node, NULL)) + ret = NET_RX_SUCCESS; out: if (primary_if) batadv_hardif_free_ref(primary_if); - if (router) - batadv_neigh_node_free_ref(router); if (orig_node) batadv_orig_node_free_ref(orig_node); return ret; @@ -340,7 +333,6 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, { struct batadv_hard_iface *primary_if = NULL; struct batadv_orig_node *orig_node = NULL; - struct batadv_neigh_node *router = NULL; struct batadv_icmp_packet *icmp_packet; int ret = NET_RX_DROP; @@ -362,10 +354,6 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, if (!orig_node) goto out; - router = batadv_orig_node_get_router(orig_node); - if (!router) - goto out; - /* create a copy of the skb, if needed, to modify it. */ if (skb_cow(skb, ETH_HLEN) < 0) goto out; @@ -377,14 +365,12 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, icmp_packet->msg_type = BATADV_TTL_EXCEEDED; icmp_packet->header.ttl = BATADV_TTL; - batadv_send_skb_packet(skb, router->if_incoming, router->addr); - ret = NET_RX_SUCCESS; + if (batadv_send_skb_to_orig(skb, orig_node, NULL)) + ret = NET_RX_SUCCESS; out: if (primary_if) batadv_hardif_free_ref(primary_if); - if (router) - batadv_neigh_node_free_ref(router); if (orig_node) batadv_orig_node_free_ref(orig_node); return ret; @@ -398,7 +384,6 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, struct batadv_icmp_packet_rr *icmp_packet; struct ethhdr *ethhdr; struct batadv_orig_node *orig_node = NULL; - struct batadv_neigh_node *router = NULL; int hdr_size = sizeof(struct batadv_icmp_packet); int ret = NET_RX_DROP; @@ -447,10 +432,6 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, if (!orig_node) goto out; - router = batadv_orig_node_get_router(orig_node); - if (!router) - goto out; - /* create a copy of the skb, if needed, to modify it. */ if (skb_cow(skb, ETH_HLEN) < 0) goto out; @@ -461,12 +442,10 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, icmp_packet->header.ttl--; /* route it */ - batadv_send_skb_packet(skb, router->if_incoming, router->addr); - ret = NET_RX_SUCCESS; + if (batadv_send_skb_to_orig(skb, orig_node, recv_if)) + ret = NET_RX_SUCCESS; out: - if (router) - batadv_neigh_node_free_ref(router); if (orig_node) batadv_orig_node_free_ref(orig_node); return ret; @@ -882,8 +861,8 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, skb->len + ETH_HLEN); /* route it */ - batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); - ret = NET_RX_SUCCESS; + if (batadv_send_skb_to_orig(skb, orig_node, recv_if)) + ret = NET_RX_SUCCESS; out: if (neigh_node) diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 660d9bf..c7f7023 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -78,6 +78,39 @@ send_skb_err: return NET_XMIT_DROP; } +/** + * batadv_send_skb_to_orig - Lookup next-hop and transmit skb. + * @skb: Packet to be transmitted. + * @orig_node: Final destination of the packet. + * @recv_if: Interface used when receiving the packet (can be NULL). + * + * Looks up the best next-hop towards the passed originator and passes the + * skb on for preparation of MAC header. If the packet originated from this + * host, NULL can be passed as recv_if and no interface alternating is + * attempted. + * + * Returns TRUE on success; FALSE otherwise. + */ +bool batadv_send_skb_to_orig(struct sk_buff *skb, + struct batadv_orig_node *orig_node, + struct batadv_hard_iface *recv_if) +{ + struct batadv_priv *bat_priv = orig_node->bat_priv; + struct batadv_neigh_node *neigh_node; + + /* batadv_find_router() increases neigh_nodes refcount if found. */ + neigh_node = batadv_find_router(bat_priv, orig_node, recv_if); + if (!neigh_node) + return false; + + /* route it */ + batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); + + batadv_neigh_node_free_ref(neigh_node); + + return true; +} + void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index 643329b..0078dec 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.h @@ -23,6 +23,9 @@ int batadv_send_skb_packet(struct sk_buff *skb, struct batadv_hard_iface *hard_iface, const uint8_t *dst_addr); +bool batadv_send_skb_to_orig(struct sk_buff *skb, + struct batadv_orig_node *orig_node, + struct batadv_hard_iface *recv_if); void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface); int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv, const struct sk_buff *skb, diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index cdad824..22457a7 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1642,7 +1642,6 @@ static int batadv_send_tt_request(struct batadv_priv *bat_priv, { struct sk_buff *skb = NULL; struct batadv_tt_query_packet *tt_request; - struct batadv_neigh_node *neigh_node = NULL; struct batadv_hard_iface *primary_if; struct batadv_tt_req_node *tt_req_node = NULL; int ret = 1; @@ -1680,23 +1679,15 @@ static int batadv_send_tt_request(struct batadv_priv *bat_priv, if (full_table) tt_request->flags |= BATADV_TT_FULL_TABLE; - neigh_node = batadv_orig_node_get_router(dst_orig_node); - if (!neigh_node) - goto out; - - batadv_dbg(BATADV_DBG_TT, bat_priv, - "Sending TT_REQUEST to %pM via %pM [%c]\n", - dst_orig_node->orig, neigh_node->addr, - (full_table ? 'F' : '.')); + batadv_dbg(BATADV_DBG_TT, bat_priv, "Sending TT_REQUEST to %pM [%c]\n", + dst_orig_node->orig, (full_table ? 'F' : '.')); batadv_inc_counter(bat_priv, BATADV_CNT_TT_REQUEST_TX); - batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); - ret = 0; + if (batadv_send_skb_to_orig(skb, dst_orig_node, NULL)) + ret = 0; out: - if (neigh_node) - batadv_neigh_node_free_ref(neigh_node); if (primary_if) batadv_hardif_free_ref(primary_if); if (ret) @@ -1716,7 +1707,6 @@ batadv_send_other_tt_response(struct batadv_priv *bat_priv, { struct batadv_orig_node *req_dst_orig_node; struct batadv_orig_node *res_dst_orig_node = NULL; - struct batadv_neigh_node *neigh_node = NULL; struct batadv_hard_iface *primary_if = NULL; uint8_t orig_ttvn, req_ttvn, ttvn; int ret = false; @@ -1742,10 +1732,6 @@ batadv_send_other_tt_response(struct batadv_priv *bat_priv, if (!res_dst_orig_node) goto out; - neigh_node = batadv_orig_node_get_router(res_dst_orig_node); - if (!neigh_node) - goto out; - primary_if = batadv_primary_if_get_selected(bat_priv); if (!primary_if) goto out; @@ -1817,14 +1803,13 @@ batadv_send_other_tt_response(struct batadv_priv *bat_priv, tt_response->flags |= BATADV_TT_FULL_TABLE; batadv_dbg(BATADV_DBG_TT, bat_priv, - "Sending TT_RESPONSE %pM via %pM for %pM (ttvn: %u)\n", - res_dst_orig_node->orig, neigh_node->addr, - req_dst_orig_node->orig, req_ttvn); + "Sending TT_RESPONSE %pM for %pM (ttvn: %u)\n", + res_dst_orig_node->orig, req_dst_orig_node->orig, req_ttvn); batadv_inc_counter(bat_priv, BATADV_CNT_TT_RESPONSE_TX); - batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); - ret = true; + if (batadv_send_skb_to_orig(skb, res_dst_orig_node, NULL)) + ret = true; goto out; unlock: @@ -1835,8 +1820,6 @@ out: batadv_orig_node_free_ref(res_dst_orig_node); if (req_dst_orig_node) batadv_orig_node_free_ref(req_dst_orig_node); - if (neigh_node) - batadv_neigh_node_free_ref(neigh_node); if (primary_if) batadv_hardif_free_ref(primary_if); if (!ret) @@ -1850,7 +1833,6 @@ batadv_send_my_tt_response(struct batadv_priv *bat_priv, struct batadv_tt_query_packet *tt_request) { struct batadv_orig_node *orig_node; - struct batadv_neigh_node *neigh_node = NULL; struct batadv_hard_iface *primary_if = NULL; uint8_t my_ttvn, req_ttvn, ttvn; int ret = false; @@ -1875,10 +1857,6 @@ batadv_send_my_tt_response(struct batadv_priv *bat_priv, if (!orig_node) goto out; - neigh_node = batadv_orig_node_get_router(orig_node); - if (!neigh_node) - goto out; - primary_if = batadv_primary_if_get_selected(bat_priv); if (!primary_if) goto out; @@ -1942,14 +1920,14 @@ batadv_send_my_tt_response(struct batadv_priv *bat_priv, tt_response->flags |= BATADV_TT_FULL_TABLE; batadv_dbg(BATADV_DBG_TT, bat_priv, - "Sending TT_RESPONSE to %pM via %pM [%c]\n", - orig_node->orig, neigh_node->addr, + "Sending TT_RESPONSE to %pM [%c]\n", + orig_node->orig, (tt_response->flags & BATADV_TT_FULL_TABLE ? 'F' : '.')); batadv_inc_counter(bat_priv, BATADV_CNT_TT_RESPONSE_TX); - batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); - ret = true; + if (batadv_send_skb_to_orig(skb, orig_node, NULL)) + ret = true; goto out; unlock: @@ -1957,8 +1935,6 @@ unlock: out: if (orig_node) batadv_orig_node_free_ref(orig_node); - if (neigh_node) - batadv_neigh_node_free_ref(neigh_node); if (primary_if) batadv_hardif_free_ref(primary_if); if (!ret) @@ -2223,7 +2199,6 @@ unlock: static void batadv_send_roam_adv(struct batadv_priv *bat_priv, uint8_t *client, struct batadv_orig_node *orig_node) { - struct batadv_neigh_node *neigh_node = NULL; struct sk_buff *skb = NULL; struct batadv_roam_adv_packet *roam_adv_packet; int ret = 1; @@ -2256,23 +2231,17 @@ static void batadv_send_roam_adv(struct batadv_priv *bat_priv, uint8_t *client, memcpy(roam_adv_packet->dst, orig_node->orig, ETH_ALEN); memcpy(roam_adv_packet->client, client, ETH_ALEN); - neigh_node = batadv_orig_node_get_router(orig_node); - if (!neigh_node) - goto out; - batadv_dbg(BATADV_DBG_TT, bat_priv, - "Sending ROAMING_ADV to %pM (client %pM) via %pM\n", - orig_node->orig, client, neigh_node->addr); + "Sending ROAMING_ADV to %pM (client %pM)\n", + orig_node->orig, client); batadv_inc_counter(bat_priv, BATADV_CNT_TT_ROAM_ADV_TX); - batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); - ret = 0; + if (batadv_send_skb_to_orig(skb, orig_node, NULL)) + ret = 0; out: - if (neigh_node) - batadv_neigh_node_free_ref(neigh_node); - if (ret) + if (ret && skb) kfree_skb(skb); return; } diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c index c9a1f65..10aff49 100644 --- a/net/batman-adv/unicast.c +++ b/net/batman-adv/unicast.c @@ -402,7 +402,7 @@ int batadv_unicast_generic_send_skb(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node; struct batadv_neigh_node *neigh_node; int data_len = skb->len; - int ret = 1; + int ret = NET_RX_DROP; unsigned int dev_mtu; /* get routing information */ @@ -466,15 +466,15 @@ find_router: goto out; } - batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); - ret = 0; + if (batadv_send_skb_to_orig(skb, orig_node, NULL)) + ret = 0; out: if (neigh_node) batadv_neigh_node_free_ref(neigh_node); if (orig_node) batadv_orig_node_free_ref(orig_node); - if (ret == 1) + if (ret == NET_RX_DROP) kfree_skb(skb); return ret; } diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c index ad14a6c..0f65a9d 100644 --- a/net/batman-adv/vis.c +++ b/net/batman-adv/vis.c @@ -698,15 +698,12 @@ static void batadv_purge_vis_packets(struct batadv_priv *bat_priv) static void batadv_broadcast_vis_packet(struct batadv_priv *bat_priv, struct batadv_vis_info *info) { - struct batadv_neigh_node *router; struct batadv_hashtable *hash = bat_priv->orig_hash; struct hlist_node *node; struct hlist_head *head; struct batadv_orig_node *orig_node; struct batadv_vis_packet *packet; struct sk_buff *skb; - struct batadv_hard_iface *hard_iface; - uint8_t dstaddr[ETH_ALEN]; uint32_t i; @@ -722,30 +719,20 @@ static void batadv_broadcast_vis_packet(struct batadv_priv *bat_priv, if (!(orig_node->flags & BATADV_VIS_SERVER)) continue; - router = batadv_orig_node_get_router(orig_node); - if (!router) - continue; - /* don't send it if we already received the packet from * this node. */ if (batadv_recv_list_is_in(bat_priv, &info->recv_list, - orig_node->orig)) { - batadv_neigh_node_free_ref(router); + orig_node->orig)) continue; - } memcpy(packet->target_orig, orig_node->orig, ETH_ALEN); - hard_iface = router->if_incoming; - memcpy(dstaddr, router->addr, ETH_ALEN); - - batadv_neigh_node_free_ref(router); - skb = skb_clone(info->skb_packet, GFP_ATOMIC); - if (skb) - batadv_send_skb_packet(skb, hard_iface, - dstaddr); + if (!skb) + continue; + if (!batadv_send_skb_to_orig(skb, orig_node, NULL)) + kfree_skb(skb); } rcu_read_unlock(); } @@ -755,7 +742,6 @@ static void batadv_unicast_vis_packet(struct batadv_priv *bat_priv, struct batadv_vis_info *info) { struct batadv_orig_node *orig_node; - struct batadv_neigh_node *router = NULL; struct sk_buff *skb; struct batadv_vis_packet *packet; @@ -765,17 +751,14 @@ static void batadv_unicast_vis_packet(struct batadv_priv *bat_priv, if (!orig_node) goto out; - router = batadv_orig_node_get_router(orig_node); - if (!router) + skb = skb_clone(info->skb_packet, GFP_ATOMIC); + if (!skb) goto out; - skb = skb_clone(info->skb_packet, GFP_ATOMIC); - if (skb) - batadv_send_skb_packet(skb, router->if_incoming, router->addr); + if (!batadv_send_skb_to_orig(skb, orig_node, NULL)) + kfree_skb(skb); out: - if (router) - batadv_neigh_node_free_ref(router); if (orig_node) batadv_orig_node_free_ref(orig_node); } -- LinuxNextTracking

10 years, 6 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge November 2012