commits January 2011

commits@lists.open-mesh.org

1 participants
80 discussions

batman-adv; branch, next, updated. v2010.2.0-285-gba95d7e
by postmaster＠open-mesh.org 29 Jan '11

29 Jan '11

The following commit has been merged in the next branch: commit b7fd99dce73f1d1d10d075a4c55e15768b61742a Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jan 28 18:34:06 2011 +0100 batman-adv: Remove vis info element in free_info The free_info function will be called when no reference to the info object exists anymore. It must be ensured that the allocated memory gets freed and not only the elements which are managed by the info object. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/vis.c b/vis.c index 0be55be..988296c 100644 --- a/vis.c +++ b/vis.c @@ -64,6 +64,7 @@ static void free_info(struct kref *ref) spin_unlock_bh(&bat_priv->vis_list_lock); kfree_skb(info->skb_packet); + kfree(info); } /* Compare two vis packets, used by the hashing algorithm */ -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.2.0-285-gba95d7e
by postmaster＠open-mesh.org 29 Jan '11

29 Jan '11

The following commit has been merged in the next branch: commit ba95d7e4b4cee0338a25c5accc9c1ad116169d9f Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jan 28 18:34:07 2011 +0100 batman-adv: Make vis info stack traversal threadsafe The batman-adv vis server has to a stack which stores all information about packets which should be send later. This stack is protected with a spinlock that is used to prevent concurrent write access to it. The send_vis_packets function has to take all elements from the stack and send them to other hosts over the primary interface. The send will be initiated without the lock which protects the stack. The implementation using list_for_each_entry_safe has the problem that it stores the next element as "safe ptr" to allow the deletion of the current element in the list. The list may be modified during the unlock/lock pair in the loop body which may make the safe pointer not pointing to correct next element. It is safer to remove and use the first element from the stack until no elements are available. This does not need reduntant information which would have to be validated each time the lock was removed. Reported-by: Russell Senior <russell(a)personaltelco.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/vis.c b/vis.c index 988296c..de1022c 100644 --- a/vis.c +++ b/vis.c @@ -816,7 +816,7 @@ static void send_vis_packets(struct work_struct *work) container_of(work, struct delayed_work, work); struct bat_priv *bat_priv = container_of(delayed_work, struct bat_priv, vis_work); - struct vis_info *info, *temp; + struct vis_info *info; spin_lock_bh(&bat_priv->vis_hash_lock); purge_vis_packets(bat_priv); @@ -826,8 +826,9 @@ static void send_vis_packets(struct work_struct *work) send_list_add(bat_priv, bat_priv->my_vis_info); } - list_for_each_entry_safe(info, temp, &bat_priv->vis_send_list, - send_list) { + while (!list_empty(&bat_priv->vis_send_list)) { + info = list_first_entry(&bat_priv->vis_send_list, + typeof(*info), send_list); kref_get(&info->refcount); spin_unlock_bh(&bat_priv->vis_hash_lock); -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.2.0-270-g818b0cd
by postmaster＠open-mesh.org 29 Jan '11

29 Jan '11

The following commit has been merged in the master branch: commit 818b0cd8aa5523356385be4b508126121af6ef78 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jan 29 17:41:13 2011 +0000 batman-adv: Make vis info stack traversal threadsafe The batman-adv vis server has to a stack which stores all information about packets which should be send later. This stack is protected with a spinlock that is used to prevent concurrent write access to it. The send_vis_packets function has to take all elements from the stack and send them to other hosts over the primary interface. The send will be initiated without the lock which protects the stack. The implementation using list_for_each_entry_safe has the problem that it stores the next element as "safe ptr" to allow the deletion of the current element in the list. The list may be modified during the unlock/lock pair in the loop body which may make the safe pointer not pointing to correct next element. It is safer to remove and use the first element from the stack until no elements are available. This does not need reduntant information which would have to be validated each time the lock was removed. Reported-by: Russell Senior <russell(a)personaltelco.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/vis.c b/vis.c index 584781e..323f013 100644 --- a/vis.c +++ b/vis.c @@ -825,7 +825,7 @@ static void send_vis_packets(struct work_struct *work) container_of(work, struct delayed_work, work); struct bat_priv *bat_priv = container_of(delayed_work, struct bat_priv, vis_work); - struct vis_info *info, *temp; + struct vis_info *info; spin_lock_bh(&bat_priv->vis_hash_lock); purge_vis_packets(bat_priv); @@ -835,8 +835,9 @@ static void send_vis_packets(struct work_struct *work) send_list_add(bat_priv, bat_priv->my_vis_info); } - list_for_each_entry_safe(info, temp, &bat_priv->vis_send_list, - send_list) { + while (!list_empty(&bat_priv->vis_send_list)) { + info = list_first_entry(&bat_priv->vis_send_list, + typeof(*info), send_list); kref_get(&info->refcount); spin_unlock_bh(&bat_priv->vis_hash_lock); -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.2.0-269-g77978bc
by postmaster＠open-mesh.org 29 Jan '11

29 Jan '11

The following commit has been merged in the master branch: commit 77978bceaddffc0569a8a091451625960b156683 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jan 29 17:36:46 2011 +0000 batman-adv: Remove vis info element in free_info The free_info function will be called when no reference to the info object exists anymore. It must be ensured that the allocated memory gets freed and not only the elements which are managed by the info object. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/vis.c b/vis.c index 9d2729c..584781e 100644 --- a/vis.c +++ b/vis.c @@ -64,6 +64,7 @@ static void free_info(struct kref *ref) spin_unlock_bh(&bat_priv->vis_list_lock); kfree_skb(info->skb_packet); + kfree(info); } /* Compare two vis packets, used by the hashing algorithm */ -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.2.0-268-g7b8d416
by postmaster＠open-mesh.org 29 Jan '11

29 Jan '11

The following commit has been merged in the master branch: commit 7b8d4162bfab142120014a758900e2fda0046baa Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jan 29 17:34:25 2011 +0000 batman-adv: Remove vis info on hashing errors A newly created vis info object must be removed when it couldn't be added to the hash. The old_info which has to be replaced was already removed and isn't related to the hash anymore. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/vis.c b/vis.c index 2cdf01c..9d2729c 100644 --- a/vis.c +++ b/vis.c @@ -446,7 +446,7 @@ static struct vis_info *add_packet(struct bat_priv *bat_priv, info); if (hash_added < 0) { /* did not work (for some reason) */ - kref_put(&old_info->refcount, free_info); + kref_put(&info->refcount, free_info); info = NULL; } -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.2.0-282-gfc0824f
by postmaster＠open-mesh.org 28 Jan '11

28 Jan '11

The following commit has been merged in the next branch: commit 0fc04d1bf594847fdc7bf8914f77d0b07d25997f Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Jan 27 13:16:08 2011 +0100 batman-adv: Remove declaration of batman_skb_recv batman_skb_recv can be defined in hard-interface.c as static because it is never used outside of that file. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/hard-interface.c b/hard-interface.c index 4f95777..8a9cf7a 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -34,6 +34,12 @@ /* protect update critical side of if_list - but not the content */ static DEFINE_SPINLOCK(if_list_lock); + +static int batman_skb_recv(struct sk_buff *skb, + struct net_device *dev, + struct packet_type *ptype, + struct net_device *orig_dev); + static void hardif_free_rcu(struct rcu_head *rcu) { struct batman_if *batman_if; @@ -549,8 +555,9 @@ out: /* receive a packet with the batman ethertype coming on a hard * interface */ -int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, - struct packet_type *ptype, struct net_device *orig_dev) +static int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, + struct packet_type *ptype, + struct net_device *orig_dev) { struct bat_priv *bat_priv; struct batman_packet *batman_packet; diff --git a/hard-interface.h b/hard-interface.h index 30ec3b8..a42f5a4 100644 --- a/hard-interface.h +++ b/hard-interface.h @@ -35,10 +35,6 @@ struct batman_if *get_batman_if_by_netdev(struct net_device *net_dev); int hardif_enable_interface(struct batman_if *batman_if, char *iface_name); void hardif_disable_interface(struct batman_if *batman_if); void hardif_remove_interfaces(void); -int batman_skb_recv(struct sk_buff *skb, - struct net_device *dev, - struct packet_type *ptype, - struct net_device *orig_dev); int hardif_min_mtu(struct net_device *soft_iface); void update_min_mtu(struct net_device *soft_iface); -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.2.0-282-gfc0824f
by postmaster＠open-mesh.org 28 Jan '11

28 Jan '11

The following commit has been merged in the next branch: commit fc0824f61fea58cf1b687cd3cdbd7f8389d6d27d Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Jan 27 13:48:54 2011 +0100 batman-adv: Remove unused variables Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/bat_debugfs.c b/bat_debugfs.c index 0ae81d0..d36d305 100644 --- a/bat_debugfs.c +++ b/bat_debugfs.c @@ -52,7 +52,6 @@ static void emit_log_char(struct debug_log *debug_log, char c) static int fdebug_log(struct debug_log *debug_log, char *fmt, ...) { - int printed_len; va_list args; static char debug_log_buf[256]; char *p; @@ -62,8 +61,7 @@ static int fdebug_log(struct debug_log *debug_log, char *fmt, ...) spin_lock_bh(&debug_log->lock); va_start(args, fmt); - printed_len = vscnprintf(debug_log_buf, sizeof(debug_log_buf), - fmt, args); + vscnprintf(debug_log_buf, sizeof(debug_log_buf), fmt, args); va_end(args); for (p = debug_log_buf; *p != 0; p++) diff --git a/routing.c b/routing.c index e946dc9..3b7e2f7 100644 --- a/routing.c +++ b/routing.c @@ -807,13 +807,11 @@ static int recv_my_icmp_packet(struct bat_priv *bat_priv, { struct orig_node *orig_node; struct icmp_packet_rr *icmp_packet; - struct ethhdr *ethhdr; struct batman_if *batman_if; int ret; uint8_t dstaddr[ETH_ALEN]; icmp_packet = (struct icmp_packet_rr *)skb->data; - ethhdr = (struct ethhdr *)skb_mac_header(skb); /* add data to device queue */ if (icmp_packet->msg_type != ECHO_REQUEST) { @@ -845,7 +843,6 @@ static int recv_my_icmp_packet(struct bat_priv *bat_priv, return NET_RX_DROP; icmp_packet = (struct icmp_packet_rr *)skb->data; - ethhdr = (struct ethhdr *)skb_mac_header(skb); memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN); memcpy(icmp_packet->orig, @@ -867,13 +864,11 @@ static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv, { struct orig_node *orig_node; struct icmp_packet *icmp_packet; - struct ethhdr *ethhdr; struct batman_if *batman_if; int ret; uint8_t dstaddr[ETH_ALEN]; icmp_packet = (struct icmp_packet *)skb->data; - ethhdr = (struct ethhdr *)skb_mac_header(skb); /* send TTL exceeded if packet is an echo request (traceroute) */ if (icmp_packet->msg_type != ECHO_REQUEST) { @@ -906,7 +901,6 @@ static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv, return NET_RX_DROP; icmp_packet = (struct icmp_packet *) skb->data; - ethhdr = (struct ethhdr *)skb_mac_header(skb); memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN); memcpy(icmp_packet->orig, @@ -998,7 +992,6 @@ int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if) return NET_RX_DROP; icmp_packet = (struct icmp_packet_rr *)skb->data; - ethhdr = (struct ethhdr *)skb_mac_header(skb); /* decrement ttl */ icmp_packet->ttl--; -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.2.0-282-gfc0824f
by postmaster＠open-mesh.org 28 Jan '11

28 Jan '11

The following commit has been merged in the next branch: commit 1be73cdb7ad0cee78567647582ac830443e35cc0 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Jan 27 13:10:23 2011 +0100 batman-adv: Remove dangling declaration of hash_remove_element Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/hash.h b/hash.h index 09216ad..2f508e6 100644 --- a/hash.h +++ b/hash.h @@ -49,11 +49,6 @@ struct hashtable_t { /* allocates and clears the hash */ struct hashtable_t *hash_new(int size); -/* remove element if you already found the element you want to delete and don't - * need the overhead to find it again with hash_remove(). But usually, you - * don't want to use this function, as it fiddles with hash-internals. */ -void *hash_remove_element(struct hashtable_t *hash, struct element_t *elem); - /* free only the hashtable and the hash itself. */ void hash_destroy(struct hashtable_t *hash); -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.2.0-282-gfc0824f
by postmaster＠open-mesh.org 28 Jan '11

28 Jan '11

The following commit has been merged in the next branch: commit 9cba41b1591097c07cb2c542bd790d1e1696d12b Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Jan 27 13:12:04 2011 +0100 batman-adv: Remove unused definitions Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/main.h b/main.h index 13edb78..77970d0 100644 --- a/main.h +++ b/main.h @@ -22,9 +22,6 @@ #ifndef _NET_BATMAN_ADV_MAIN_H_ #define _NET_BATMAN_ADV_MAIN_H_ -/* Kernel Programming */ -#define LINUX - #define DRIVER_AUTHOR "Marek Lindner <lindner_marek(a)yahoo.de>, " \ "Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>" #define DRIVER_DESC "B.A.T.M.A.N. advanced" @@ -54,7 +51,6 @@ #define NUM_WORDS (TQ_LOCAL_WINDOW_SIZE / WORD_BIT_SIZE) -#define PACKBUFF_SIZE 2000 #define LOG_BUF_LEN 8192 /* has to be a power of 2 */ #define VIS_INTERVAL 5000 /* 5 seconds */ @@ -96,15 +92,11 @@ #define DBG_ROUTES 2 /* route or hna added / changed / deleted */ #define DBG_ALL 3 -#define LOG_BUF_LEN 8192 /* has to be a power of 2 */ - /* * Vis */ -/* #define VIS_SUBCLUSTERS_DISABLED */ - /* * Kernel headers */ @@ -160,13 +152,6 @@ static inline void bat_dbg(char type __always_unused, } #endif -#define bat_warning(net_dev, fmt, arg...) \ - do { \ - struct net_device *_netdev = (net_dev); \ - struct bat_priv *_batpriv = netdev_priv(_netdev); \ - bat_dbg(DBG_ALL, _batpriv, fmt, ## arg); \ - pr_warning("%s: " fmt, _netdev->name, ## arg); \ - } while (0) #define bat_info(net_dev, fmt, arg...) \ do { \ struct net_device *_netdev = (net_dev); \ -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.2.0-267-g18bc4ee
by postmaster＠open-mesh.org 28 Jan '11

28 Jan '11

The following commit has been merged in the master branch: commit 18bc4eeb5b2459d625d571fd1064eb4d5b2ebfa6 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jan 28 20:25:06 2011 +0000 batman-adv: Remove unused variables Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/bat_debugfs.c b/bat_debugfs.c index 0ae81d0..d36d305 100644 --- a/bat_debugfs.c +++ b/bat_debugfs.c @@ -52,7 +52,6 @@ static void emit_log_char(struct debug_log *debug_log, char c) static int fdebug_log(struct debug_log *debug_log, char *fmt, ...) { - int printed_len; va_list args; static char debug_log_buf[256]; char *p; @@ -62,8 +61,7 @@ static int fdebug_log(struct debug_log *debug_log, char *fmt, ...) spin_lock_bh(&debug_log->lock); va_start(args, fmt); - printed_len = vscnprintf(debug_log_buf, sizeof(debug_log_buf), - fmt, args); + vscnprintf(debug_log_buf, sizeof(debug_log_buf), fmt, args); va_end(args); for (p = debug_log_buf; *p != 0; p++) diff --git a/routing.c b/routing.c index 6168648..480c178 100644 --- a/routing.c +++ b/routing.c @@ -866,11 +866,9 @@ static int recv_my_icmp_packet(struct bat_priv *bat_priv, struct orig_node *orig_node = NULL; struct neigh_node *neigh_node = NULL; struct icmp_packet_rr *icmp_packet; - struct ethhdr *ethhdr; int ret = NET_RX_DROP; icmp_packet = (struct icmp_packet_rr *)skb->data; - ethhdr = (struct ethhdr *)skb_mac_header(skb); /* add data to device queue */ if (icmp_packet->msg_type != ECHO_REQUEST) { @@ -904,7 +902,6 @@ static int recv_my_icmp_packet(struct bat_priv *bat_priv, goto out; icmp_packet = (struct icmp_packet_rr *)skb->data; - ethhdr = (struct ethhdr *)skb_mac_header(skb); memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN); memcpy(icmp_packet->orig, @@ -932,11 +929,9 @@ static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv, struct orig_node *orig_node = NULL; struct neigh_node *neigh_node = NULL; struct icmp_packet *icmp_packet; - struct ethhdr *ethhdr; int ret = NET_RX_DROP; icmp_packet = (struct icmp_packet *)skb->data; - ethhdr = (struct ethhdr *)skb_mac_header(skb); /* send TTL exceeded if packet is an echo request (traceroute) */ if (icmp_packet->msg_type != ECHO_REQUEST) { @@ -971,7 +966,6 @@ static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv, goto out; icmp_packet = (struct icmp_packet *)skb->data; - ethhdr = (struct ethhdr *)skb_mac_header(skb); memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN); memcpy(icmp_packet->orig, @@ -1068,7 +1062,6 @@ int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if) goto out; icmp_packet = (struct icmp_packet_rr *)skb->data; - ethhdr = (struct ethhdr *)skb_mac_header(skb); /* decrement ttl */ icmp_packet->ttl--; @@ -1100,7 +1093,6 @@ struct neigh_node *find_router(struct bat_priv *bat_priv, struct neigh_node *router, *first_candidate, *tmp_neigh_node; static uint8_t zero_mac[ETH_ALEN] = {0, 0, 0, 0, 0, 0}; int bonding_enabled; - int best_router_tq; if (!orig_node) return NULL; @@ -1190,7 +1182,6 @@ struct neigh_node *find_router(struct bat_priv *bat_priv, /* if bonding is disabled, use the best of the * remaining candidates which are not using * this interface. */ - best_router_tq = 0; list_for_each_entry_rcu(tmp_neigh_node, &primary_orig_node->bond_list, bonding_list) { if (!first_candidate) @@ -1203,7 +1194,6 @@ struct neigh_node *find_router(struct bat_priv *bat_priv, if ((!router) || (tmp_neigh_node->tq_avg > router->tq_avg)) { router = tmp_neigh_node; - best_router_tq = 0; } } -- batman-adv

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits January 2011