commits May 2011

commits@lists.open-mesh.org

1 participants
84 discussions

batctl; branch, master, updated. v2011.1.0-5-gbf2326e

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit bf2326ed1b2a11070a332208c502868cb2ec77a4 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 14:28:05 2011 +0200 batctl: Remove optimisation and debugging options Distributions like Gentoo or Debian have to strip the options regarding the optimisation levels and debugging information to fulfil their policies. There is currently no valid reason why the Makefile should override it. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 217a00a..3b9e853 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ endif endif CC = gcc -CFLAGS += -pedantic -Wall -W -g3 -std=gnu99 -Os -fno-strict-aliasing +CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing EXTRA_CFLAGS = -DREVISION_VERSION=$(REVISION_VERSION) LDFLAGS += -lm -- batctl

11 years, 10 months

batman-adv; branch, master, updated. v2011.1.0-126-g8f8ca05

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 8f8ca0591a4ae207a7d34ae1875a58c768007cb0 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed May 18 16:47:23 2011 +0200 batman-adv: a multiline comment should precede the variable it is describing This comment has been wrongly put after the variable it refers to and was also bad indented Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Acked-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/types.h b/types.h index fab70e8..65b3222 100644 --- a/types.h +++ b/types.h @@ -246,10 +246,10 @@ struct frag_packet_list_entry { }; struct vis_info { - unsigned long first_seen; - struct list_head recv_list; - /* list of server-neighbors we received a vis-packet - * from. we should not reply to them. */ + unsigned long first_seen; + /* list of server-neighbors we received a vis-packet + * from. we should not reply to them. */ + struct list_head recv_list; struct list_head send_list; struct kref refcount; struct hlist_node hash_entry; -- batman-adv

11 years, 10 months

batman-adv; branch, master, updated. v2011.1.0-125-gfe2a2e4

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit fe2a2e427da3764070b5a4d814484a3047be00cb Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sat May 21 01:33:07 2011 +0200 batman-adv: use is_broadcast_ether_addr() instead of compare_eth(.., brd_addr) Instead of comparing mac addresses with the broadcast address by means of compare_eth(), the is_broadcast_ether_addr() kernel function has to be used. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Acked-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/routing.c b/routing.c index 07f23ba..90ae6f0 100644 --- a/routing.c +++ b/routing.c @@ -661,7 +661,7 @@ void receive_bat_packet(const struct ethhdr *ethhdr, hard_iface->net_dev->dev_addr)) is_my_oldorig = 1; - if (compare_eth(ethhdr->h_source, broadcast_addr)) + if (is_broadcast_ether_addr(ethhdr->h_source)) is_broadcast = 1; } rcu_read_unlock(); -- batman-adv

11 years, 10 months

batman-adv; branch, master, updated. v2011.1.0-124-g288421e

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 288421eda7806d1dbbecd0893e07611b6c75b485 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu May 19 21:43:08 2011 +0200 batman-adv: Check type of x and y in seq_(before|after) seq_before and seq_after depend on the fact that both sequence numbers have the same type and thus the same bitwidth. We can ensure that by compile time checking using a compare between the pointer to the temporary buffers which were created using the typeof of both parameters. For example gcc would create a warning like "warning: comparison of distinct pointer types lacks a cast". Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/main.h b/main.h index db29444..3395bf9 100644 --- a/main.h +++ b/main.h @@ -196,8 +196,11 @@ static inline int compare_eth(const void *data1, const void *data2) * - before adding more than 127 to the starting value - it is a predecessor, * - when adding 128 - it is neither a predecessor nor a successor, * - after adding more than 127 to the starting value - it is a successor */ -#define seq_before(x, y) ({typeof(x) _dummy = (x - y); \ - _dummy > smallest_signed_int(_dummy); }) +#define seq_before(x, y) ({typeof(x) _d1 = (x); \ + typeof(y) _d2 = (y); \ + typeof(x) _dummy = (_d1 - _d2); \ + (void) (&_d1 == &_d2); \ + _dummy > smallest_signed_int(_dummy); }) #define seq_after(x, y) seq_before(y, x) #endif /* _NET_BATMAN_ADV_MAIN_H_ */ -- batman-adv

11 years, 10 months

batman-adv; branch, master, updated. v2011.1.0-123-g7962ae7

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 7962ae7cc6e3e5709dcc9189952ba3a81a931eea Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed May 18 09:20:50 2011 +0200 batman-adv: move smallest_signed_int(), seq_before() and seq_after() into main.h smallest_signed_int(), seq_before() and seq_after() are very useful functions that help to handle comparisons between sequence numbers. However they were only defined in vis.c. With this patch every batman-adv function will be able to use them. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/main.h b/main.h index bf681eb..db29444 100644 --- a/main.h +++ b/main.h @@ -184,4 +184,20 @@ static inline int compare_eth(const void *data1, const void *data2) #define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) +/* Returns the smallest signed integer in two's complement with the sizeof x */ +#define smallest_signed_int(x) (1u << (7u + 8u * (sizeof(x) - 1u))) + +/* Checks if a sequence number x is a predecessor/successor of y. + * they handle overflows/underflows and can correctly check for a + * predecessor/successor unless the variable sequence number has grown by + * more then 2**(bitwidth(x)-1)-1. + * This means that for a uint8_t with the maximum value 255, it would think: + * - when adding nothing - it is neither a predecessor nor a successor + * - before adding more than 127 to the starting value - it is a predecessor, + * - when adding 128 - it is neither a predecessor nor a successor, + * - after adding more than 127 to the starting value - it is a successor */ +#define seq_before(x, y) ({typeof(x) _dummy = (x - y); \ + _dummy > smallest_signed_int(_dummy); }) +#define seq_after(x, y) seq_before(y, x) + #endif /* _NET_BATMAN_ADV_MAIN_H_ */ diff --git a/vis.c b/vis.c index ea8d7e9..355c6e5 100644 --- a/vis.c +++ b/vis.c @@ -30,22 +30,6 @@ #define MAX_VIS_PACKET_SIZE 1000 -/* Returns the smallest signed integer in two's complement with the sizeof x */ -#define smallest_signed_int(x) (1u << (7u + 8u * (sizeof(x) - 1u))) - -/* Checks if a sequence number x is a predecessor/successor of y. - * they handle overflows/underflows and can correctly check for a - * predecessor/successor unless the variable sequence number has grown by - * more then 2**(bitwidth(x)-1)-1. - * This means that for a uint8_t with the maximum value 255, it would think: - * - when adding nothing - it is neither a predecessor nor a successor - * - before adding more than 127 to the starting value - it is a predecessor, - * - when adding 128 - it is neither a predecessor nor a successor, - * - after adding more than 127 to the starting value - it is a successor */ -#define seq_before(x, y) ({typeof(x) _dummy = (x - y); \ - _dummy > smallest_signed_int(_dummy); }) -#define seq_after(x, y) seq_before(y, x) - static void start_vis_timer(struct bat_priv *bat_priv); /* free the info */ -- batman-adv

11 years, 10 months

batman-adv; branch, master, updated. v2011.1.0-122-g8af58b4

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 8af58b4f2ff2612b66a9321c468f03ffb62a06c5 Merge: 26c6ecc73ed62dd693c02a55e687bdbabad3d953 8bd9620303eee333e3915853ca64e722c57495dd Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri May 20 14:22:29 2011 +0200 Merge branch 'next' diff --combined compat.h index c11f6cd,2e3f062..2bd9e0a --- a/compat.h +++ b/compat.h @@@ -265,8 -265,6 +265,8 @@@ int bat_seq_printf(struct seq_file *m, pos && ({ prefetch(pos->next); 1; }); \ pos = rcu_dereference(hlist_next_rcu(pos))) +#define rcu_dereference_protected(p, c) (p) + #endif /* < KERNEL_VERSION(2, 6, 34) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) @@@ -275,4 -273,14 +275,14 @@@ #endif /* < KERNEL_VERSION(2, 6, 36) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 40) + + #define kfree_rcu(ptr, rcu_head) call_rcu(&ptr->rcu_head, free_rcu_##ptr) + + void free_rcu_gw_node(struct rcu_head *rcu); + void free_rcu_neigh_node(struct rcu_head *rcu); + void free_rcu_softif_neigh(struct rcu_head *rcu); + + #endif /* < KERNEL_VERSION(2, 6, 40) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --combined gateway_client.c index 9fc475f,61605a0..ab597c4 --- a/gateway_client.c +++ b/gateway_client.c @@@ -29,18 -29,10 +29,10 @@@ #include <linux/udp.h> #include <linux/if_vlan.h> static void gw_node_free_ref(struct gw_node *gw_node) { if (atomic_dec_and_test(&gw_node->refcount)) - call_rcu(&gw_node->rcu, gw_node_free_rcu); + kfree_rcu(gw_node, rcu); } static struct gw_node *gw_get_selected_gw_node(struct bat_priv *bat_priv) @@@ -94,7 -86,7 +86,7 @@@ static void gw_select(struct bat_priv * if (new_gw_node && !atomic_inc_not_zero(&new_gw_node->refcount)) new_gw_node = NULL; - curr_gw_node = bat_priv->curr_gw; + curr_gw_node = rcu_dereference_protected(bat_priv->curr_gw, 1); rcu_assign_pointer(bat_priv->curr_gw, new_gw_node); if (curr_gw_node) @@@ -281,10 -273,11 +273,10 @@@ static void gw_node_add(struct bat_pri struct gw_node *gw_node; int down, up; - gw_node = kmalloc(sizeof(struct gw_node), GFP_ATOMIC); + gw_node = kzalloc(sizeof(*gw_node), GFP_ATOMIC); if (!gw_node) return; - memset(gw_node, 0, sizeof(struct gw_node)); INIT_HLIST_NODE(&gw_node->list); gw_node->orig_node = orig_node; atomic_set(&gw_node->refcount, 1); @@@ -401,8 -394,8 +393,8 @@@ void gw_node_purge(struct bat_priv *bat /** * fails if orig_node has no router */ -static int _write_buffer_text(struct bat_priv *bat_priv, - struct seq_file *seq, struct gw_node *gw_node) +static int _write_buffer_text(struct bat_priv *bat_priv, struct seq_file *seq, + const struct gw_node *gw_node) { struct gw_node *curr_gw; struct neigh_node *router; @@@ -516,7 -509,7 +508,7 @@@ int gw_is_target(struct bat_priv *bat_p /* check for ip header */ switch (ntohs(ethhdr->h_proto)) { case ETH_P_IP: - if (!pskb_may_pull(skb, header_len + sizeof(struct iphdr))) + if (!pskb_may_pull(skb, header_len + sizeof(*iphdr))) return 0; iphdr = (struct iphdr *)(skb->data + header_len); header_len += iphdr->ihl * 4; @@@ -527,10 -520,10 +519,10 @@@ break; case ETH_P_IPV6: - if (!pskb_may_pull(skb, header_len + sizeof(struct ipv6hdr))) + if (!pskb_may_pull(skb, header_len + sizeof(*ipv6hdr))) return 0; ipv6hdr = (struct ipv6hdr *)(skb->data + header_len); - header_len += sizeof(struct ipv6hdr); + header_len += sizeof(*ipv6hdr); /* check for udp header */ if (ipv6hdr->nexthdr != IPPROTO_UDP) @@@ -541,10 -534,10 +533,10 @@@ return 0; } - if (!pskb_may_pull(skb, header_len + sizeof(struct udphdr))) + if (!pskb_may_pull(skb, header_len + sizeof(*udphdr))) return 0; udphdr = (struct udphdr *)(skb->data + header_len); - header_len += sizeof(struct udphdr); + header_len += sizeof(*udphdr); /* check for bootp port */ if ((ntohs(ethhdr->h_proto) == ETH_P_IP) && diff --combined originator.c index 083954a,40a30bb..a6c35d4 --- a/originator.c +++ b/originator.c @@@ -54,18 -54,10 +54,10 @@@ err return 0; } void neigh_node_free_ref(struct neigh_node *neigh_node) { if (atomic_dec_and_test(&neigh_node->refcount)) - call_rcu(&neigh_node->rcu, neigh_node_free_rcu); + kfree_rcu(neigh_node, rcu); } /* increases the refcounter of a found router */ @@@ -85,7 -77,7 +77,7 @@@ struct neigh_node *orig_node_get_router struct neigh_node *create_neighbor(struct orig_node *orig_node, struct orig_node *orig_neigh_node, - uint8_t *neigh, + const uint8_t *neigh, struct hard_iface *if_incoming) { struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface); @@@ -94,7 -86,7 +86,7 @@@ bat_dbg(DBG_BATMAN, bat_priv, "Creating new last-hop neighbor of originator\n"); - neigh_node = kzalloc(sizeof(struct neigh_node), GFP_ATOMIC); + neigh_node = kzalloc(sizeof(*neigh_node), GFP_ATOMIC); if (!neigh_node) return NULL; @@@ -191,7 -183,7 +183,7 @@@ void originator_free(struct bat_priv *b /* this function finds or creates an originator entry for the given * address if it does not exits */ -struct orig_node *get_orig_node(struct bat_priv *bat_priv, uint8_t *addr) +struct orig_node *get_orig_node(struct bat_priv *bat_priv, const uint8_t *addr) { struct orig_node *orig_node; int size; @@@ -204,7 -196,7 +196,7 @@@ bat_dbg(DBG_BATMAN, bat_priv, "Creating new originator: %pM\n", addr); - orig_node = kzalloc(sizeof(struct orig_node), GFP_ATOMIC); + orig_node = kzalloc(sizeof(*orig_node), GFP_ATOMIC); if (!orig_node) return NULL; @@@ -567,7 -559,7 +559,7 @@@ static int orig_node_del_if(struct orig memcpy(data_ptr, orig_node->bcast_own, del_if_num * chunk_size); /* copy second part */ - memcpy(data_ptr + del_if_num * chunk_size, + memcpy((char *)data_ptr + del_if_num * chunk_size, orig_node->bcast_own + ((del_if_num + 1) * chunk_size), (max_if_num - del_if_num) * chunk_size); @@@ -587,7 -579,7 +579,7 @@@ free_bcast_own memcpy(data_ptr, orig_node->bcast_own_sum, del_if_num * sizeof(uint8_t)); - memcpy(data_ptr + del_if_num * sizeof(uint8_t), + memcpy((char *)data_ptr + del_if_num * sizeof(uint8_t), orig_node->bcast_own_sum + ((del_if_num + 1) * sizeof(uint8_t)), (max_if_num - del_if_num) * sizeof(uint8_t)); diff --combined soft-interface.c index 56f1908,d5aa609..b8d3f24 --- a/soft-interface.c +++ b/soft-interface.c @@@ -72,18 -72,10 +72,10 @@@ int my_skb_head_push(struct sk_buff *sk return 0; } static void softif_neigh_free_ref(struct softif_neigh *softif_neigh) { if (atomic_dec_and_test(&softif_neigh->refcount)) - call_rcu(&softif_neigh->rcu, softif_neigh_free_rcu); + kfree_rcu(softif_neigh, rcu); } static void softif_neigh_vid_free_rcu(struct rcu_head *rcu) @@@ -131,7 -123,8 +123,7 @@@ static struct softif_neigh_vid *softif_ goto out; } - softif_neigh_vid = kzalloc(sizeof(struct softif_neigh_vid), - GFP_ATOMIC); + softif_neigh_vid = kzalloc(sizeof(*softif_neigh_vid), GFP_ATOMIC); if (!softif_neigh_vid) goto out; @@@ -153,7 -146,7 +145,7 @@@ out } static struct softif_neigh *softif_neigh_get(struct bat_priv *bat_priv, - uint8_t *addr, short vid) + const uint8_t *addr, short vid) { struct softif_neigh_vid *softif_neigh_vid; struct softif_neigh *softif_neigh = NULL; @@@ -177,7 -170,7 +169,7 @@@ goto unlock; } - softif_neigh = kzalloc(sizeof(struct softif_neigh), GFP_ATOMIC); + softif_neigh = kzalloc(sizeof(*softif_neigh), GFP_ATOMIC); if (!softif_neigh) goto unlock; @@@ -249,8 -242,7 +241,8 @@@ static void softif_neigh_vid_select(str if (new_neigh && !atomic_inc_not_zero(&new_neigh->refcount)) new_neigh = NULL; - curr_neigh = softif_neigh_vid->softif_neigh; + curr_neigh = rcu_dereference_protected(softif_neigh_vid->softif_neigh, + 1); rcu_assign_pointer(softif_neigh_vid->softif_neigh, new_neigh); if ((curr_neigh) && (!new_neigh)) @@@ -619,7 -611,7 +611,7 @@@ int interface_tx(struct sk_buff *skb, s if (!primary_if) goto dropped; - if (my_skb_head_push(skb, sizeof(struct bcast_packet)) < 0) + if (my_skb_head_push(skb, sizeof(*bcast_packet)) < 0) goto dropped; bcast_packet = (struct bcast_packet *)skb->data; @@@ -798,16 -790,17 +790,16 @@@ static void interface_setup(struct net_ SET_ETHTOOL_OPS(dev, &bat_ethtool_ops); - memset(priv, 0, sizeof(struct bat_priv)); + memset(priv, 0, sizeof(*priv)); } -struct net_device *softif_create(char *name) +struct net_device *softif_create(const char *name) { struct net_device *soft_iface; struct bat_priv *bat_priv; int ret; - soft_iface = alloc_netdev(sizeof(struct bat_priv) , name, - interface_setup); + soft_iface = alloc_netdev(sizeof(*bat_priv), name, interface_setup); if (!soft_iface) { pr_err("Unable to allocate the batman interface: %s\n", name); @@@ -879,7 -872,7 +871,7 @@@ void softif_destroy(struct net_device * unregister_netdevice(soft_iface); } -int softif_is_valid(struct net_device *net_dev) +int softif_is_valid(const struct net_device *net_dev) { #ifdef HAVE_NET_DEVICE_OPS if (net_dev->netdev_ops->ndo_start_xmit == interface_tx) @@@ -931,3 -924,4 +923,3 @@@ static u32 bat_get_link(struct net_devi { return 1; } - -- batman-adv

11 years, 10 months

batman-adv; branch, next, updated. v2011.1.0-106-g8bd9620

by postmaster＠open-mesh.org

The following commit has been merged in the next branch: commit 178a37e6f4bb08a6de1b573a71c80d9746c3e09b Author: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> Date: Tue May 10 09:17:00 2011 +0200 batman-adv: convert call_rcu(neigh_node_free_rcu) to kfree() The RCU callback neigh_node_free_rcu() just calls kfree(), so we can use kfree_rcu() instead of call_rcu(). Signed-off-by: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> Cc: Marek Lindner <lindner_marek(a)yahoo.de> Cc: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Acked-by: David S. Miller <davem(a)davemloft.net> Reviewed-by: Josh Triplett <josh(a)joshtriplett.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/originator.c b/originator.c index 080ec88..40a30bb 100644 --- a/originator.c +++ b/originator.c @@ -54,18 +54,10 @@ err: return 0; } -static void neigh_node_free_rcu(struct rcu_head *rcu) -{ - struct neigh_node *neigh_node; - - neigh_node = container_of(rcu, struct neigh_node, rcu); - kfree(neigh_node); -} - void neigh_node_free_ref(struct neigh_node *neigh_node) { if (atomic_dec_and_test(&neigh_node->refcount)) - call_rcu(&neigh_node->rcu, neigh_node_free_rcu); + kfree_rcu(neigh_node, rcu); } /* increases the refcounter of a found router */ -- batman-adv

11 years, 10 months

batman-adv; branch, next, updated. v2011.1.0-106-g8bd9620

by postmaster＠open-mesh.org

The following commit has been merged in the next branch: commit 903ca657752d1aeaf99ef3ce676650308526526e Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue May 10 09:16:58 2011 +0200 batman-adv: Add compatibility code for kfree_rcu Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/compat.c b/compat.c index 586898f..e040486 100644 --- a/compat.c +++ b/compat.c @@ -988,3 +988,31 @@ int bat_seq_printf(struct seq_file *m, const char *f, ...) } #endif /* < KERNEL_VERSION(2, 6, 29) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 40) + +void free_rcu_gw_node(struct rcu_head *rcu) +{ + struct gw_node *gw_node; + + gw_node = container_of(rcu, struct gw_node, rcu); + kfree(gw_node); +} + +void free_rcu_neigh_node(struct rcu_head *rcu) +{ + struct neigh_node *neigh_node; + + neigh_node = container_of(rcu, struct neigh_node, rcu); + kfree(neigh_node); +} + +void free_rcu_softif_neigh(struct rcu_head *rcu) +{ + struct softif_neigh *softif_neigh; + + softif_neigh = container_of(rcu, struct softif_neigh, rcu); + kfree(softif_neigh); +} + +#endif /* < KERNEL_VERSION(2, 6, 40) */ diff --git a/compat.h b/compat.h index fb49f9d..2e3f062 100644 --- a/compat.h +++ b/compat.h @@ -273,4 +273,14 @@ int bat_seq_printf(struct seq_file *m, const char *f, ...); #endif /* < KERNEL_VERSION(2, 6, 36) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 40) + +#define kfree_rcu(ptr, rcu_head) call_rcu(&ptr->rcu_head, free_rcu_##ptr) + +void free_rcu_gw_node(struct rcu_head *rcu); +void free_rcu_neigh_node(struct rcu_head *rcu); +void free_rcu_softif_neigh(struct rcu_head *rcu); + +#endif /* < KERNEL_VERSION(2, 6, 40) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ -- batman-adv

11 years, 10 months

batman-adv; branch, next, updated. v2011.1.0-106-g8bd9620

by postmaster＠open-mesh.org

The following commit has been merged in the next branch: commit 9f517fb32712a43cd726f57865853c8785be9434 Author: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> Date: Tue May 10 09:16:59 2011 +0200 batman-adv: convert call_rcu(gw_node_free_rcu) to kfree_rcu The RCU callback gw_node_free_rcu() just calls kfree(), so we can use kfree_rcu() instead of call_rcu(). Signed-off-by: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> Cc: Marek Lindner <lindner_marek(a)yahoo.de> Cc: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Acked-by: David S. Miller <davem(a)davemloft.net> Reviewed-by: Josh Triplett <josh(a)joshtriplett.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/gateway_client.c b/gateway_client.c index 65f3953..61605a0 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -29,18 +29,10 @@ #include <linux/udp.h> #include <linux/if_vlan.h> -static void gw_node_free_rcu(struct rcu_head *rcu) -{ - struct gw_node *gw_node; - - gw_node = container_of(rcu, struct gw_node, rcu); - kfree(gw_node); -} - static void gw_node_free_ref(struct gw_node *gw_node) { if (atomic_dec_and_test(&gw_node->refcount)) - call_rcu(&gw_node->rcu, gw_node_free_rcu); + kfree_rcu(gw_node, rcu); } static struct gw_node *gw_get_selected_gw_node(struct bat_priv *bat_priv) -- batman-adv

11 years, 10 months

batman-adv; branch, next, updated. v2011.1.0-106-g8bd9620

by postmaster＠open-mesh.org

The following commit has been merged in the next branch: commit 8bd9620303eee333e3915853ca64e722c57495dd Author: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> Date: Tue May 10 09:17:01 2011 +0200 batman-adv: convert call_rcu(softif_neigh_free_rcu) to kfree_rcu The RCU callback softif_neigh_free_rcu() just calls kfree(), so we can use kfree_rcu() instead of call_rcu(). Signed-off-by: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> Cc: Marek Lindner <lindner_marek(a)yahoo.de> Cc: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Acked-by: David S. Miller <davem(a)davemloft.net> Reviewed-by: Josh Triplett <josh(a)joshtriplett.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/soft-interface.c b/soft-interface.c index c76a33e..d5aa609 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -72,18 +72,10 @@ int my_skb_head_push(struct sk_buff *skb, unsigned int len) return 0; } -static void softif_neigh_free_rcu(struct rcu_head *rcu) -{ - struct softif_neigh *softif_neigh; - - softif_neigh = container_of(rcu, struct softif_neigh, rcu); - kfree(softif_neigh); -} - static void softif_neigh_free_ref(struct softif_neigh *softif_neigh) { if (atomic_dec_and_test(&softif_neigh->refcount)) - call_rcu(&softif_neigh->rcu, softif_neigh_free_rcu); + kfree_rcu(softif_neigh, rcu); } static void softif_neigh_vid_free_rcu(struct rcu_head *rcu) -- batman-adv

11 years, 10 months

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

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2011