commits November 2010

commits@lists.open-mesh.org

1 participants
95 discussions

batman-adv; branch, next, updated. v2010.2.0-29-g19ef42a
by postmaster＠open-mesh.org 21 Nov '10

21 Nov '10

The following commit has been merged in the next branch: commit 06d0411d7a20652f54274a09c977f5a2e0c5cc9e Author: Andreas Langer <an.langer(a)gmx.de> Date: Sat Sep 25 10:06:51 2010 +0000 batman-adv: remove redundant is_my_mac() check in route_unicast_packet Callers should check the if the received packet is for us before it calls route_unicast_packet. Signed-off-by: Andreas Langer <an.langer(a)gmx.de> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/routing.c b/routing.c index 2d3d694..685edfd 100644 --- a/routing.c +++ b/routing.c @@ -1132,12 +1132,6 @@ static int route_unicast_packet(struct sk_buff *skb, unicast_packet = (struct unicast_packet *)skb->data; - /* packet for me */ - if (is_my_mac(unicast_packet->dest)) { - interface_rx(recv_if->soft_iface, skb, hdr_size); - return NET_RX_SUCCESS; - } - /* TTL exceeded */ if (unicast_packet->ttl < 2) { pr_debug("Warning - can't forward unicast packet from %pM to " @@ -1171,7 +1165,6 @@ static int route_unicast_packet(struct sk_buff *skb, return NET_RX_DROP; unicast_packet = (struct unicast_packet *)skb->data; - ethhdr = (struct ethhdr *)skb_mac_header(skb); /* decrement ttl */ unicast_packet->ttl--; -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.2.0-29-g19ef42a
by postmaster＠open-mesh.org 21 Nov '10

21 Nov '10

The following commit has been merged in the next branch: commit 9234184a25981daaa04efd279d36896eb32e8d44 Author: Andreas Langer <an.langer(a)gmx.de> Date: Sat Sep 25 10:06:52 2010 +0000 batman-adv: fragment forwarded packets If a packet is too big to be forwarded over an interface it will be fragmented on-the-fly (if fragmentation is enabled). Signed-off-by: Andreas Langer <an.langer(a)gmx.de> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/routing.c b/routing.c index 685edfd..9289a91 100644 --- a/routing.c +++ b/routing.c @@ -1166,6 +1166,12 @@ static int route_unicast_packet(struct sk_buff *skb, unicast_packet = (struct unicast_packet *)skb->data; + if (unicast_packet->packet_type == BAT_UNICAST && + atomic_read(&bat_priv->frag_enabled) && + skb->len > batman_if->net_dev->mtu) + return frag_send_skb(skb, bat_priv, batman_if, + dstaddr); + /* decrement ttl */ unicast_packet->ttl--; diff --git a/unicast.h b/unicast.h index 5908b01..e32b786 100644 --- a/unicast.h +++ b/unicast.h @@ -29,5 +29,7 @@ int frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv, struct sk_buff **new_skb); void frag_list_free(struct list_head *head); int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv); +int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv, + struct batman_if *batman_if, uint8_t dstaddr[]); #endif /* _NET_BATMAN_ADV_UNICAST_H_ */ -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.2.0-29-g19ef42a
by postmaster＠open-mesh.org 21 Nov '10

21 Nov '10

The following commit has been merged in the next branch: commit 9a0e23f013e5ae88eebd094e09e1133d86cd8462 Author: Andreas Langer <an.langer(a)gmx.de> Date: Sat Sep 25 10:06:54 2010 +0000 batman-adv: reassemble fragmented skb if mtu allows it Signed-off-by: Andreas Langer <an.langer(a)gmx.de> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/routing.c b/routing.c index 9289a91..7aca6ae 100644 --- a/routing.c +++ b/routing.c @@ -1129,6 +1129,8 @@ static int route_unicast_packet(struct sk_buff *skb, unsigned long flags; struct unicast_packet *unicast_packet; struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb); + int ret; + struct sk_buff *new_skb; unicast_packet = (struct unicast_packet *)skb->data; @@ -1172,6 +1174,22 @@ static int route_unicast_packet(struct sk_buff *skb, return frag_send_skb(skb, bat_priv, batman_if, dstaddr); + if (unicast_packet->packet_type == BAT_UNICAST_FRAG && + 2 * skb->len - hdr_size <= batman_if->net_dev->mtu) { + + ret = frag_reassemble_skb(skb, bat_priv, &new_skb); + + if (ret == NET_RX_DROP) + return NET_RX_DROP; + + /* packet was buffered for late merge */ + if (!new_skb) + return NET_RX_SUCCESS; + + skb = new_skb; + unicast_packet = (struct unicast_packet *) skb->data; + } + /* decrement ttl */ unicast_packet->ttl--; @@ -1225,7 +1243,8 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if) if (!new_skb) return NET_RX_SUCCESS; - interface_rx(recv_if->soft_iface, new_skb, hdr_size); + interface_rx(recv_if->soft_iface, new_skb, + sizeof(struct unicast_packet)); return NET_RX_SUCCESS; } diff --git a/unicast.c b/unicast.c index 12afae6..e58e634 100644 --- a/unicast.c +++ b/unicast.c @@ -36,6 +36,9 @@ static struct sk_buff *frag_merge_packet(struct list_head *head, struct unicast_frag_packet *up = (struct unicast_frag_packet *)skb->data; struct sk_buff *tmp_skb; + struct unicast_packet *unicast_packet; + int hdr_len = sizeof(struct unicast_packet), + uni_diff = sizeof(struct unicast_frag_packet) - hdr_len; /* set skb to the first part and tmp_skb to the second part */ if (up->flags & UNI_FRAG_HEAD) { @@ -59,6 +62,11 @@ static struct sk_buff *frag_merge_packet(struct list_head *head, memcpy(skb_put(skb, tmp_skb->len), tmp_skb->data, tmp_skb->len); kfree_skb(tmp_skb); + + memmove(skb->data + uni_diff, skb->data, hdr_len); + unicast_packet = (struct unicast_packet *) skb_pull(skb, uni_diff); + unicast_packet->packet_type = BAT_UNICAST; + return skb; } -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.2.0-29-g19ef42a
by postmaster＠open-mesh.org 21 Nov '10

21 Nov '10

The following commit has been merged in the next branch: commit b25cb3ddcccd1564ee90bd42b649b1a167640797 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Oct 9 11:44:44 2010 +0000 batman-adv: use rcu callbacks when freeing batman_if Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/hard-interface.c b/hard-interface.c index 70d69bd..3346415 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -38,6 +38,15 @@ /* protect update critical side of if_list - but not the content */ static DEFINE_SPINLOCK(if_list_lock); +static void hardif_free_rcu(struct rcu_head *rcu) +{ + struct batman_if *batman_if; + + batman_if = container_of(rcu, struct batman_if, rcu); + dev_put(batman_if->net_dev); + kref_put(&batman_if->refcount, hardif_free_ref); +} + struct batman_if *get_batman_if_by_netdev(struct net_device *net_dev) { struct batman_if *batman_if; @@ -464,9 +473,8 @@ static void hardif_remove_interface(struct batman_if *batman_if) return; batman_if->if_status = IF_TO_BE_REMOVED; - synchronize_rcu(); sysfs_del_hardif(&batman_if->hardif_obj); - kref_put(&batman_if->refcount, hardif_free_ref); + call_rcu(&batman_if->rcu, hardif_free_rcu); } void hardif_remove_interfaces(void) diff --git a/hard-interface.h b/hard-interface.h index 1d1cd9f..30ec3b8 100644 --- a/hard-interface.h +++ b/hard-interface.h @@ -47,7 +47,6 @@ static inline void hardif_free_ref(struct kref *refcount) struct batman_if *batman_if; batman_if = container_of(refcount, struct batman_if, refcount); - dev_put(batman_if->net_dev); kfree(batman_if); } diff --git a/types.h b/types.h index d89ec70..8f6ba1c 100644 --- a/types.h +++ b/types.h @@ -46,6 +46,7 @@ struct batman_if { struct kref refcount; struct packet_type batman_adv_ptype; struct net_device *soft_iface; + struct rcu_head rcu; }; /** -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.2.0-29-g19ef42a
by postmaster＠open-mesh.org 21 Nov '10

21 Nov '10

The following commit has been merged in the next branch: commit ba0744f96f3dc6fa0bc7b87f11041d1e0160fe4c Author: Andreas Langer <an.langer(a)gmx.de> Date: Sat Sep 25 10:06:47 2010 +0000 batman-adv: restructure fragmentation to handle batman unicast packets The unicast_frag_send_skb() function expected 'raw' packets (without any batman-adv header) to fragment them. This needs to be changed, so that this function is able to fragment packets that already traveled inside the mesh but need to be fragmented now. Signed-off-by: Andreas Langer <an.langer(a)gmx.de> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/unicast.c b/unicast.c index 0459413..389055b 100644 --- a/unicast.c +++ b/unicast.c @@ -152,55 +152,58 @@ void frag_list_free(struct list_head *head) return; } -static int unicast_send_frag_skb(struct sk_buff *skb, struct bat_priv *bat_priv, - struct batman_if *batman_if, uint8_t dstaddr[], - struct orig_node *orig_node) +int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv, + struct batman_if *batman_if, uint8_t dstaddr[]) { - struct unicast_frag_packet *ucast_frag1, *ucast_frag2; - int hdr_len = sizeof(struct unicast_frag_packet); + struct unicast_packet tmp_uc, *unicast_packet; struct sk_buff *frag_skb; + struct unicast_frag_packet *frag1, *frag2; + int uc_hdr_len = sizeof(struct unicast_packet); + int ucf_hdr_len = sizeof(struct unicast_frag_packet); int data_len = skb->len; if (!bat_priv->primary_if) goto dropped; - frag_skb = dev_alloc_skb(data_len - (data_len / 2) + hdr_len); + unicast_packet = (struct unicast_packet *) skb->data; + + memcpy(&tmp_uc, unicast_packet, uc_hdr_len); + frag_skb = dev_alloc_skb(data_len - (data_len / 2) + ucf_hdr_len); skb_split(skb, frag_skb, data_len / 2); - if (my_skb_head_push(frag_skb, hdr_len) < 0 || - my_skb_head_push(skb, hdr_len) < 0) + if (my_skb_head_push(skb, ucf_hdr_len - uc_hdr_len) < 0 || + my_skb_head_push(frag_skb, ucf_hdr_len) < 0) goto drop_frag; - ucast_frag1 = (struct unicast_frag_packet *)skb->data; - ucast_frag2 = (struct unicast_frag_packet *)frag_skb->data; + frag1 = (struct unicast_frag_packet *)skb->data; + frag2 = (struct unicast_frag_packet *)frag_skb->data; - ucast_frag1->version = COMPAT_VERSION; - ucast_frag1->packet_type = BAT_UNICAST_FRAG; - ucast_frag1->ttl = TTL; - memcpy(ucast_frag1->orig, - bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN); - memcpy(ucast_frag1->dest, orig_node->orig, ETH_ALEN); + memcpy(frag1, &tmp_uc, sizeof(struct unicast_packet)); - memcpy(ucast_frag2, ucast_frag1, sizeof(struct unicast_frag_packet)); + frag1->ttl--; + frag1->version = COMPAT_VERSION; + frag1->packet_type = BAT_UNICAST_FRAG; - ucast_frag1->flags |= UNI_FRAG_HEAD; - ucast_frag2->flags &= ~UNI_FRAG_HEAD; + memcpy(frag1->orig, bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN); + memcpy(frag2, frag1, sizeof(struct unicast_frag_packet)); - ucast_frag1->seqno = htons((uint16_t)atomic_inc_return( - &batman_if->frag_seqno)); + frag1->flags |= UNI_FRAG_HEAD; + frag2->flags &= ~UNI_FRAG_HEAD; - ucast_frag2->seqno = htons((uint16_t)atomic_inc_return( - &batman_if->frag_seqno)); + frag1->seqno = htons((uint16_t)atomic_inc_return( + &batman_if->frag_seqno)); + frag2->seqno = htons((uint16_t)atomic_inc_return( + &batman_if->frag_seqno)); send_skb_packet(skb, batman_if, dstaddr); send_skb_packet(frag_skb, batman_if, dstaddr); - return 0; + return NET_RX_SUCCESS; drop_frag: kfree_skb(frag_skb); dropped: kfree_skb(skb); - return 1; + return NET_RX_DROP; } int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv) @@ -240,11 +243,6 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv) if (batman_if->if_status != IF_ACTIVE) goto dropped; - if (atomic_read(&bat_priv->frag_enabled) && - data_len + sizeof(struct unicast_packet) > batman_if->net_dev->mtu) - return unicast_send_frag_skb(skb, bat_priv, batman_if, - dstaddr, orig_node); - if (my_skb_head_push(skb, sizeof(struct unicast_packet)) < 0) goto dropped; @@ -258,6 +256,14 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv) /* copy the destination for faster routing */ memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN); + if (atomic_read(&bat_priv->frag_enabled) && + data_len + sizeof(struct unicast_packet) > + batman_if->net_dev->mtu) { + /* send frag skb decreases ttl */ + unicast_packet->ttl++; + return frag_send_skb(skb, bat_priv, batman_if, + dstaddr); + } send_skb_packet(skb, batman_if, dstaddr); return 0; -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.2.0-29-g19ef42a
by postmaster＠open-mesh.org 21 Nov '10

21 Nov '10

The following commit has been merged in the next branch: commit 2a90df8cdfc4e2fdd0f3fe17a63de8480b3c3f18 Author: Andreas Langer <an.langer(a)gmx.de> Date: Sat Sep 25 10:06:49 2010 +0000 batman-adv: add frag_ prefix to all fragmentation related functions Signed-off-by: Andreas Langer <an.langer(a)gmx.de> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/routing.c b/routing.c index f05259d..24bf471 100644 --- a/routing.c +++ b/routing.c @@ -1232,24 +1232,24 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if) orig_node->last_frag_packet = jiffies; if (list_empty(&orig_node->frag_list) && - create_frag_buffer(&orig_node->frag_list)) { + frag_create_buffer(&orig_node->frag_list)) { spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags); return NET_RX_DROP; } tmp_frag_entry = - search_frag_packet(&orig_node->frag_list, + frag_search_packet(&orig_node->frag_list, unicast_packet); if (!tmp_frag_entry) { - create_frag_entry(&orig_node->frag_list, skb); + frag_create_entry(&orig_node->frag_list, skb); spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags); return NET_RX_SUCCESS; } - skb = merge_frag_packet(&orig_node->frag_list, + skb = frag_merge_packet(&orig_node->frag_list, tmp_frag_entry, skb); spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags); if (!skb) diff --git a/unicast.c b/unicast.c index 389055b..8ca4014 100644 --- a/unicast.c +++ b/unicast.c @@ -29,7 +29,7 @@ #include "hard-interface.h" -struct sk_buff *merge_frag_packet(struct list_head *head, +struct sk_buff *frag_merge_packet(struct list_head *head, struct frag_packet_list_entry *tfp, struct sk_buff *skb) { @@ -62,7 +62,7 @@ struct sk_buff *merge_frag_packet(struct list_head *head, return skb; } -void create_frag_entry(struct list_head *head, struct sk_buff *skb) +void frag_create_entry(struct list_head *head, struct sk_buff *skb) { struct frag_packet_list_entry *tfp; struct unicast_frag_packet *up = @@ -78,7 +78,7 @@ void create_frag_entry(struct list_head *head, struct sk_buff *skb) return; } -int create_frag_buffer(struct list_head *head) +int frag_create_buffer(struct list_head *head) { int i; struct frag_packet_list_entry *tfp; @@ -99,7 +99,7 @@ int create_frag_buffer(struct list_head *head) return 0; } -struct frag_packet_list_entry *search_frag_packet(struct list_head *head, +struct frag_packet_list_entry *frag_search_packet(struct list_head *head, struct unicast_frag_packet *up) { struct frag_packet_list_entry *tfp; diff --git a/unicast.h b/unicast.h index 7973697..b50d61b 100644 --- a/unicast.h +++ b/unicast.h @@ -25,13 +25,13 @@ #define FRAG_TIMEOUT 10000 /* purge frag list entrys after time in ms */ #define FRAG_BUFFER_SIZE 6 /* number of list elements in buffer */ -struct sk_buff *merge_frag_packet(struct list_head *head, +struct sk_buff *frag_merge_packet(struct list_head *head, struct frag_packet_list_entry *tfp, struct sk_buff *skb); -void create_frag_entry(struct list_head *head, struct sk_buff *skb); -int create_frag_buffer(struct list_head *head); -struct frag_packet_list_entry *search_frag_packet(struct list_head *head, +void frag_create_entry(struct list_head *head, struct sk_buff *skb); +int frag_create_buffer(struct list_head *head); +struct frag_packet_list_entry *frag_search_packet(struct list_head *head, struct unicast_frag_packet *up); void frag_list_free(struct list_head *head); int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv); -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.2.0-29-g19ef42a
by postmaster＠open-mesh.org 21 Nov '10

21 Nov '10

The following commit has been merged in the next branch: commit 82fbef6da8a84e922100efa4caadf07c3526d719 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Mon Oct 25 22:42:55 2010 +0000 batman-adv: Convert kbuild version check to preprocessor check Makefile.kbuild includes a relative unreadable check for a version number to decide if we should compile bat_printk.c to get out own print implementations. This can easily be replaced using a simpler preprocessor check as we know them from compat.h Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/Makefile.kbuild b/Makefile.kbuild index 2a91716..7eba9f3 100644 --- a/Makefile.kbuild +++ b/Makefile.kbuild @@ -32,4 +32,20 @@ EXTRA_CFLAGS += -DREVISION_VERSION=\"$(REVISION)\" endif obj-m += batman-adv.o -batman-adv-y := main.o bat_debugfs.o bat_sysfs.o send.o routing.o soft-interface.o icmp_socket.o translation-table.o bitarray.o hash.o ring_buffer.o vis.o hard-interface.o aggregation.o originator.o unicast.o $(shell [ "2" -eq "$(VERSION)" ] 2>&- && [ "6" -eq "$(PATCHLEVEL)" ] 2>&- && [ "$(SUBLEVEL)" -le "28" ] 2>&- && echo bat_printk.o) +batman-adv-y += aggregation.o +batman-adv-y += bat_debugfs.o +batman-adv-y += bat_sysfs.o +batman-adv-y += bitarray.o +batman-adv-y += hard-interface.o +batman-adv-y += hash.o +batman-adv-y += icmp_socket.o +batman-adv-y += main.o +batman-adv-y += originator.o +batman-adv-y += ring_buffer.o +batman-adv-y += routing.o +batman-adv-y += send.o +batman-adv-y += soft-interface.o +batman-adv-y += translation-table.o +batman-adv-y += unicast.o +batman-adv-y += vis.o +batman-adv-y += bat_printk.o diff --git a/bat_printk.c b/bat_printk.c index 22cdda2..b0e732b 100644 --- a/bat_printk.c +++ b/bat_printk.c @@ -1,3 +1,7 @@ +#include <linux/version.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) + /* * linux/lib/vsprintf.c * @@ -952,3 +956,5 @@ int bat_seq_printf(struct seq_file *m, const char *f, ...) m->count = m->size; return -1; } + +#endif /* < KERNEL_VERSION(2, 6, 29) */ -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.2.0-29-g19ef42a
by postmaster＠open-mesh.org 21 Nov '10

21 Nov '10

The following commit has been merged in the next branch: commit 314888589bad3174cc77659709b902b5bea46a51 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Oct 9 11:44:44 2010 +0000 batman-adv: convert batman_if custom refcounting to kref functions Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/bat_sysfs.c b/bat_sysfs.c index d44d27c..a764ddc 100644 --- a/bat_sysfs.c +++ b/bat_sysfs.c @@ -414,7 +414,7 @@ static ssize_t show_mesh_iface(struct kobject *kobj, struct attribute *attr, length = sprintf(buff, "%s\n", batman_if->if_status == IF_NOT_IN_USE ? "none" : batman_if->soft_iface->name); - hardif_put(batman_if); + kref_put(&batman_if->refcount, hardif_free_ref); return length; } @@ -437,7 +437,7 @@ static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr, if (strlen(buff) >= IFNAMSIZ) { pr_err("Invalid parameter for 'mesh_iface' setting received: " "interface name too long '%s'\n", buff); - hardif_put(batman_if); + kref_put(&batman_if->refcount, hardif_free_ref); return -EINVAL; } @@ -448,7 +448,7 @@ static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr, if ((batman_if->if_status == status_tmp) || ((batman_if->soft_iface) && (strncmp(batman_if->soft_iface->name, buff, IFNAMSIZ) == 0))) { - hardif_put(batman_if); + kref_put(&batman_if->refcount, hardif_free_ref); return count; } @@ -456,7 +456,7 @@ static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr, rtnl_lock(); hardif_disable_interface(batman_if); rtnl_unlock(); - hardif_put(batman_if); + kref_put(&batman_if->refcount, hardif_free_ref); return count; } @@ -468,7 +468,7 @@ static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr, } ret = hardif_enable_interface(batman_if, buff); - hardif_put(batman_if); + kref_put(&batman_if->refcount, hardif_free_ref); return ret; } @@ -503,7 +503,7 @@ static ssize_t show_iface_status(struct kobject *kobj, struct attribute *attr, break; } - hardif_put(batman_if); + kref_put(&batman_if->refcount, hardif_free_ref); return length; } diff --git a/hard-interface.c b/hard-interface.c index 403a2c3..70d69bd 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -52,7 +52,7 @@ struct batman_if *get_batman_if_by_netdev(struct net_device *net_dev) out: if (batman_if) - hardif_hold(batman_if); + kref_get(&batman_if->refcount); rcu_read_unlock(); return batman_if; @@ -102,7 +102,7 @@ static struct batman_if *get_active_batman_if(struct net_device *soft_iface) out: if (batman_if) - hardif_hold(batman_if); + kref_get(&batman_if->refcount); rcu_read_unlock(); return batman_if; @@ -127,13 +127,13 @@ static void set_primary_if(struct bat_priv *bat_priv, struct batman_if *old_if; if (batman_if) - hardif_hold(batman_if); + kref_get(&batman_if->refcount); old_if = bat_priv->primary_if; bat_priv->primary_if = batman_if; if (old_if) - hardif_put(old_if); + kref_put(&old_if->refcount, hardif_free_ref); if (!bat_priv->primary_if) return; @@ -317,7 +317,7 @@ int hardif_enable_interface(struct batman_if *batman_if, char *iface_name) batman_if->batman_adv_ptype.type = __constant_htons(ETH_P_BATMAN); batman_if->batman_adv_ptype.func = batman_skb_recv; batman_if->batman_adv_ptype.dev = batman_if->net_dev; - hardif_hold(batman_if); + kref_get(&batman_if->refcount); dev_add_pack(&batman_if->batman_adv_ptype); atomic_set(&batman_if->seqno, 1); @@ -376,7 +376,7 @@ void hardif_disable_interface(struct batman_if *batman_if) bat_info(batman_if->soft_iface, "Removing interface: %s\n", batman_if->net_dev->name); dev_remove_pack(&batman_if->batman_adv_ptype); - hardif_put(batman_if); + kref_put(&batman_if->refcount, hardif_free_ref); bat_priv->num_ifaces--; orig_hash_del_if(batman_if, bat_priv->num_ifaces); @@ -388,7 +388,7 @@ void hardif_disable_interface(struct batman_if *batman_if) set_primary_if(bat_priv, new_if); if (new_if) - hardif_put(new_if); + kref_put(&new_if->refcount, hardif_free_ref); } kfree(batman_if->packet_buff); @@ -434,8 +434,7 @@ static struct batman_if *hardif_add_interface(struct net_device *net_dev) batman_if->soft_iface = NULL; batman_if->if_status = IF_NOT_IN_USE; INIT_LIST_HEAD(&batman_if->list); - atomic_set(&batman_if->refcnt, 0); - hardif_hold(batman_if); + kref_init(&batman_if->refcount); check_known_mac_addr(batman_if->net_dev); @@ -444,7 +443,7 @@ static struct batman_if *hardif_add_interface(struct net_device *net_dev) spin_unlock(&if_list_lock); /* extra reference for return */ - hardif_hold(batman_if); + kref_get(&batman_if->refcount); return batman_if; free_if: @@ -467,7 +466,7 @@ static void hardif_remove_interface(struct batman_if *batman_if) batman_if->if_status = IF_TO_BE_REMOVED; synchronize_rcu(); sysfs_del_hardif(&batman_if->hardif_obj); - hardif_put(batman_if); + kref_put(&batman_if->refcount, hardif_free_ref); } void hardif_remove_interfaces(void) @@ -524,10 +523,8 @@ static int hard_if_event(struct notifier_block *this, update_min_mtu(batman_if->soft_iface); break; case NETDEV_CHANGEADDR: - if (batman_if->if_status == IF_NOT_IN_USE) { - hardif_put(batman_if); - goto out; - } + if (batman_if->if_status == IF_NOT_IN_USE) + goto hardif_put; check_known_mac_addr(batman_if->net_dev); update_mac_addresses(batman_if); @@ -539,8 +536,9 @@ static int hard_if_event(struct notifier_block *this, default: break; }; - hardif_put(batman_if); +hardif_put: + kref_put(&batman_if->refcount, hardif_free_ref); out: return NOTIFY_DONE; } diff --git a/hard-interface.h b/hard-interface.h index d550889..1d1cd9f 100644 --- a/hard-interface.h +++ b/hard-interface.h @@ -42,17 +42,13 @@ int batman_skb_recv(struct sk_buff *skb, int hardif_min_mtu(struct net_device *soft_iface); void update_min_mtu(struct net_device *soft_iface); -static inline void hardif_hold(struct batman_if *batman_if) +static inline void hardif_free_ref(struct kref *refcount) { - atomic_inc(&batman_if->refcnt); -} + struct batman_if *batman_if; -static inline void hardif_put(struct batman_if *batman_if) -{ - if (atomic_dec_and_test(&batman_if->refcnt)) { - dev_put(batman_if->net_dev); - kfree(batman_if); - } + batman_if = container_of(refcount, struct batman_if, refcount); + dev_put(batman_if->net_dev); + kfree(batman_if); } #endif /* _NET_BATMAN_ADV_HARD_INTERFACE_H_ */ diff --git a/types.h b/types.h index f3f7366..d89ec70 100644 --- a/types.h +++ b/types.h @@ -43,7 +43,7 @@ struct batman_if { unsigned char *packet_buff; int packet_len; struct kobject *hardif_obj; - atomic_t refcnt; + struct kref refcount; struct packet_type batman_adv_ptype; struct net_device *soft_iface; }; -- batman-adv

1 0

batman-adv; branch, next, updated. v2010.2.0-1-g92ddc8b
by postmaster＠open-mesh.org 21 Nov '10

21 Nov '10

The following commit has been merged in the next branch: commit 92ddc8ba02828846c6474d314b85c740ab6c3720 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Fri Sep 3 21:59:27 2010 +0200 batman-adv: Start new development cycle Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/main.h b/main.h index 672aef5..5e3f516 100644 --- a/main.h +++ b/main.h @@ -30,7 +30,7 @@ #define DRIVER_DESC "B.A.T.M.A.N. advanced" #define DRIVER_DEVICE "batman-adv" -#define SOURCE_VERSION "2010.2.0" +#define SOURCE_VERSION "next" /* B.A.T.M.A.N. parameters */ -- batman-adv

1 0

batctl; annotated tag, v2010.2.0, created. v2010.2.0
by postmaster＠open-mesh.org 21 Nov '10

21 Nov '10

The annotated tag, v2010.2.0 has been created at 0bf974ee2fa2c1ef122827347f1ea5af9db36caf (tag) tagging f4f70bb8a673ffa24ccebfcb9c829eb84637cb7d (commit) replaces v2010.1.0 tagged by Sven Eckelmann on Sun Nov 21 21:43:53 2010 +0100 - Shortlog ------------------------------------------------------------ batctl 2010.2.0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJM6YSJAAoJEF2HCgfBJntGl7sP/iVT7w0MuRp1jy/oeM8sx+yN wSGDE9lQkl2DjSN9K3vi4XlympW2W95aRPlEfmcx1oa1yQ0+RpXLE7bVVJILWVKJ NBarwi+XSFXcczQHxKHqhmzSTlp/4gj7gjRQIz2Wdhs2er+ttOkmAit3h2ydk6Io prGFRDdvQA9WSdAMgvp2YjHGtMCdSn4ple0oUSW9Bm0NRlfAjXHsD5LRGXHn1AS0 H6RyNQEDqAFSinghsf0HWIn9h+Rf58SFdssHzElbHUTqE47Ew67o2EKfbJE7VGCL QO4tyABJal+DDrOU2gfb8ckVr0qZa/KwgS0SCBkTMZNZEaQpQ6Pwjn4iMQuylK30 gyO6FtcV1/SCWaDJs/2e0JNVBkHSS4qTF+8r729259h8lRBiEvH32dwrKYRqNvY8 CmLlZplY+sPWcWiwLNhrJyqUTnl6eVExLAlTfwCLDj4ujzmCW08n4F031SKBMnep zREZEWx+VyMCJC/aYQqrxk4m1PxB0fUXazeg7RAukqOblWlRbbjwxuCMkdZOkHvn GdiHjldEb07J/ulQVES0RY+WWJqnBPnfbRrsuWoy2e8ugeihenaiPpwpC4XPcWCd 5qH+miC/qr0DHgUdzCniX2BVn3WsIwhTbq2vRokAlJVfth6ttvg5gOZLd4Y2wHUx 8za8dc8rXmIQJPvOIQzK =H/c1 -----END PGP SIGNATURE----- Marek Lindner (7): batctl: layer2 unicast packet fragmentation batctl: tcpdump add support for multiple header encapsulation batctl: tcpdump - add support for fragmented packets batctl: tcpdump - print encapsulated payload even if DUMP_TYPE_NONBAT is not set batctl: support for multiple mesh clouds batctl: fix crash if HOME environment variable is not set batctl: change email Simon Wunderlich (1): batctl: add manual entry for fragmentation Sven Eckelmann (9): batctl: Start new development cycle batctl: checkpatch cleanup of comments batctl: Correct format strings for 8 bit ttl batctl: Don't print uninitialised traceroute times batctl: Remove unused variables batctl: Initialise timeout before usage in error case batctl: Re-add ping interval after each loop batctl: Convert strtok to reentrant safe strtok_r batctl: update version for release ----------------------------------------------------------------------- -- batctl

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2010