commits November 2010

commits@lists.open-mesh.org

1 participants
95 discussions

batctl; branch, master, updated. v2010.1.0-72-g5888951
by postmaster＠open-mesh.org 04 Nov '10

04 Nov '10

The following commit has been merged in the master branch: commit 2ddbadd3c222af3a4dccd7142e25df561ee11232 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Thu Nov 4 14:03:39 2010 +0100 batctl: Correct format strings for 8 bit ttl Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/tcpdump.c b/tcpdump.c index 0f62e65..8898cf8 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -335,7 +335,7 @@ static void dump_batman_ucast(unsigned char *packet_buff, ssize_t buff_len, int printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt)); - printf("%s: UCAST, ttl %hu, ", + printf("%s: UCAST, ttl %hhu, ", get_name_by_macaddr((struct ether_addr *)unicast_packet->dest, read_opt), unicast_packet->ttl); @@ -388,7 +388,7 @@ static void dump_batman_frag(unsigned char *packet_buff, ssize_t buff_len, int r printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)unicast_frag_packet->orig, read_opt)); - printf("%s: FRAG, seq %hu, ttl %hu, flags [%c], ", + printf("%s: FRAG, seq %hu, ttl %hhu, flags [%c], ", get_name_by_macaddr((struct ether_addr *)unicast_frag_packet->dest, read_opt), ntohs(unicast_frag_packet->seqno), unicast_frag_packet->ttl, (unicast_frag_packet->flags & UNI_FRAG_HEAD ? 'H' : '.')); diff --git a/traceroute.c b/traceroute.c index dc97a01..0dc796a 100644 --- a/traceroute.c +++ b/traceroute.c @@ -199,9 +199,9 @@ int traceroute(char *mesh_iface, int argc, char **argv) } if (!bat_host) - printf("%2hu: %s", icmp_packet_out.ttl, (return_mac ? return_mac : "*")); + printf("%2hhu: %s", icmp_packet_out.ttl, (return_mac ? return_mac : "*")); else - printf("%2hu: %s (%s)", icmp_packet_out.ttl, bat_host->name, return_mac); + printf("%2hhu: %s (%s)", icmp_packet_out.ttl, bat_host->name, return_mac); for (i = 0; i < NUM_PACKETS; i++) { if (time_delta[i]) -- batctl

1 0

batctl; branch, master, updated. v2010.1.0-72-g5888951
by postmaster＠open-mesh.org 04 Nov '10

04 Nov '10

The following commit has been merged in the master branch: commit 57b5fbfd1be1ca15d8fa2fa43a3a223d2b639704 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Thu Nov 4 14:03:40 2010 +0100 batctl: Don't print uninitialised traceroute times The time_delta array is only initialised when no error occurs or only the select fails. This means that we may print uninitialised or output from previous ttl levels. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/traceroute.c b/traceroute.c index 0dc796a..f80ca4d 100644 --- a/traceroute.c +++ b/traceroute.c @@ -135,6 +135,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) for (i = 0; i < NUM_PACKETS; i++) { icmp_packet_out.seqno = htons(++seq_counter); + time_delta[i] = 0.0; if (write(trace_fd, (char *)&icmp_packet_out, sizeof(icmp_packet_out)) < 0) { printf("Error - can't write to batman adv kernel file '%s': %s\n", icmp_socket, strerror(errno)); @@ -151,10 +152,8 @@ int traceroute(char *mesh_iface, int argc, char **argv) res = select(trace_fd + 1, &read_socket, NULL, NULL, &tv); - if (res <= 0) { - time_delta[i] = 0.0; + if (res <= 0) continue; - } read_len = read(trace_fd, (char *)&icmp_packet_in, sizeof(icmp_packet_in)); -- batctl

1 0

batman-adv; branch, master, updated. v2010.1.0-221-g0b94a92
by postmaster＠open-mesh.org 04 Nov '10

04 Nov '10

The following commit has been merged in the master branch: commit 0b94a92fc2a084ebe2d7de5cfa0f726638e311f6 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Nov 4 13:43:22 2010 +0000 batman-adv: suppress false warning when changing the mac address Whenever the mac address of an batman interface is changed check_known_mac_addr() is called to print a warning if the newly added mac address exists an another batman interface. While looping through the batman interface list check_known_mac_addr() only compares mac addresses and does not make sure they belong to different interfaces, thus always printing a warning. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/hard-interface.c b/hard-interface.c index a9b8367..5a1d631 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -174,7 +174,7 @@ static void update_mac_addresses(struct batman_if *batman_if) batman_if->net_dev->dev_addr, ETH_ALEN); } -static void check_known_mac_addr(uint8_t *addr) +static void check_known_mac_addr(struct net_device *net_dev) { struct batman_if *batman_if; @@ -184,11 +184,16 @@ static void check_known_mac_addr(uint8_t *addr) (batman_if->if_status != IF_TO_BE_ACTIVATED)) continue; - if (!compare_orig(batman_if->net_dev->dev_addr, addr)) + if (batman_if->net_dev == net_dev) + continue; + + if (!compare_orig(batman_if->net_dev->dev_addr, + net_dev->dev_addr)) continue; pr_warning("The newly added mac address (%pM) already exists " - "on: %s\n", addr, batman_if->net_dev->name); + "on: %s\n", net_dev->dev_addr, + batman_if->net_dev->name); pr_warning("It is strongly recommended to keep mac addresses " "unique to avoid problems!\n"); } @@ -438,7 +443,7 @@ static struct batman_if *hardif_add_interface(struct net_device *net_dev) INIT_LIST_HEAD(&batman_if->list); kref_init(&batman_if->refcount); - check_known_mac_addr(batman_if->net_dev->dev_addr); + check_known_mac_addr(batman_if->net_dev); spin_lock(&if_list_lock); list_add_tail_rcu(&batman_if->list, &if_list); @@ -520,7 +525,7 @@ static int hard_if_event(struct notifier_block *this, if (batman_if->if_status == IF_NOT_IN_USE) goto hardif_put; - check_known_mac_addr(batman_if->net_dev->dev_addr); + check_known_mac_addr(batman_if->net_dev); update_mac_addresses(batman_if); bat_priv = netdev_priv(batman_if->soft_iface); -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.1.0-220-g31162e7
by postmaster＠open-mesh.org 04 Nov '10

04 Nov '10

The following commit has been merged in the master branch: commit 31162e763f614f0559670751188e1f967f093cbe Author: Linus Lüssing <linus.luessing(a)web.de> Date: Thu Nov 4 13:33:07 2010 +0000 batman-adv: Don't call sysfs_del_hardif() in atomic context sysfs_del_hardif invokes kobject_put, which might sleep. However, we are not allowed to sleep during a call_rcu. There is also no need to do the removal with an atomic call_rcu, as kobject_put only frees the kobject when there is no more reference to it anyway. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> diff --git a/hard-interface.c b/hard-interface.c index 37f0f8b..a9b8367 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -41,7 +41,6 @@ static void hardif_free_rcu(struct rcu_head *rcu) struct batman_if *batman_if; batman_if = container_of(rcu, struct batman_if, rcu); - sysfs_del_hardif(&batman_if->hardif_obj); dev_put(batman_if->net_dev); kref_put(&batman_if->refcount, hardif_free_ref); } @@ -470,6 +469,7 @@ static void hardif_remove_interface(struct batman_if *batman_if) /* caller must take if_list_lock */ list_del_rcu(&batman_if->list); + sysfs_del_hardif(&batman_if->hardif_obj); call_rcu(&batman_if->rcu, hardif_free_rcu); } -- batman-adv

1 0

linux integration; annotated tag, v2.6.37-rc1, created. v2.6.37-rc1
by postmaster＠open-mesh.org 01 Nov '10

01 Nov '10

The annotated tag, v2.6.37-rc1 has been created at 579cc3d8b5840f3355bad58e7ab23eae04ff9cb6 (tag) tagging c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (commit) replaces v2.6.36 tagged by Linus Torvalds on Mon Nov 1 07:54:35 2010 -0400 - Shortlog ------------------------------------------------------------ Linux 2.6.37-rc1 .. and the beginning of the 2010 KS -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAkzOqo0ACgkQF3YsRnbiHLtcnQCbBOtinZFDzrtdjuCWzydU1gp6 L+4An0CrrTbv3i/XdVq9veUifFXBqgQt =sC3v -----END PGP SIGNATURE----- Andreas Langer (1): Staging: batman-adv: layer2 unicast packet fragmentation Andy Shevchenko (1): staging: batman-adv: remove useless addr_to_string() Linus Lüssing (2): Staging: batman-adv: Always synchronize rcu's on module shutdown Staging: batman-adv: Fix resizing of broadcast seqno buffers on if deletion Marek Lindner (10): Staging: batman-adv: refactoring unicast payload code Staging: batman-adv: register the batman-adv packet type per interface Staging: batman-adv: attach each hard-interface to a soft-interface Staging: batman-adv: multiple mesh clouds Staging: batman-adv: removing redundant assignment of skb->dev Staging: batman-adv: Introduce update_primary_addr to update mac address Staging: batman-adv: document fragmentation sysfs API Staging: batman-adv: protect against ogm packet overflow by checking table length Staging: batman-adv: fix crash when new OGM is generated Staging: batman-adv: process OGMs bigger than MAX_AGGREGATION_BYTES Simon Wunderlich (2): Staging: batman-adv: Count Ethernet header for incoming packets Staging: batman-adv: move queue counters into bat_priv Sven Eckelmann (29): Revert: "Staging: batman-adv: Adding netfilter-bridge hooks" Staging: batman-adv: Remove CHANGELOG Staging: batman-adv: Start new development cycle Staging: batman-adv: Calculate hamming weight using optimized kernel functions Staging: batman-adv: Directly prepare icmp packets in socket buffer Staging: batman-adv: Keep header writable and unshared Staging: batman-adv: Only clone skb data for multiple broadcasts Staging: batman-adv: Aggregate batman packets directly in skb Staging: batman-adv: Prepare vis packets directly inside a skb Staging: batman-adv: Create copy of skb with pre-allocated headroom Staging: batman-adv: Provide full headers and packets as linear skb Staging: batman-adv: Remove duplicate of attached device name Staging: batman-adv: Don't inform about dropped packets in nodebug Staging: batman-adv: Update mtu of bat device by changing mtu of slave device Staging: batman-adv: Remove currently unused gw_* datastructures Staging: batman-adv: Add rcu TODO Staging: batman-adv: checkpatch cleanup of comments Staging: batman-adv: Move mailing list address to .org Staging: batman-adv: Mark debugfs files as nonseekable Staging: batman-adv: wait for call_rcu before unloading module Staging: batman-adv: Introduce if_list_lock to protect if_list Staging: batman-adv: Always protect list_for_each_entry_rcu with RCU Staging: batman-adv: Remove unneeded rcu_read_lock Staging: batman-adv: Use synchronize_rcu instead of call_rcu Staging: batman-adv: Use refcnt to track usage count of batman_if Staging: batman-adv: count batman_if list queries as reference Staging: batman-adv: Track references of batman_if in set_primary_if Staging: batman-adv: Add hash recommendations to TODO Staging: batman-adv: Don't dereference unchecked incoming soft_iface Tracey Dent (1): Staging: batman-adv: Makefile: replace the use of <module>-objs with <module>-y Vasiliy Kulikov (1): Staging: batman-adv: check kmalloc() return value ----------------------------------------------------------------------- -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2010