commits

commits@lists.open-mesh.org

1 participants
12232 discussions

[git] batman-adv branch, master, updated. f01af72e428717f15f2f612c07fd8ed57da19b7c
by postmaster＠open-mesh.net 18 Oct '09

18 Oct '09

The following commit has been merged in the master branch: commit a8ea1ec663906950aa93b33bf3879c42ae5adff0 Author: simon <simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Oct 17 18:08:34 2009 +0000 as routing.c uses cancel_delayed_work_sync(), add compat.h to support kernels < 2.6.23 git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1449 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/routing.c b/routing.c index 081140e..7e40363 100644 --- a/routing.c +++ b/routing.c @@ -34,6 +34,7 @@ #include "ring_buffer.h" #include "vis.h" #include "aggregation.h" +#include "compat.h" -- batman-adv

1 0

[git] batman-adv branch, master, updated. f01af72e428717f15f2f612c07fd8ed57da19b7c
by postmaster＠open-mesh.net 18 Oct '09

18 Oct '09

The following commit has been merged in the master branch: commit 4fab6a00f5a44ee5ca30e556575d8c707a9b7e61 Author: simon <simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Oct 17 17:56:02 2009 +0000 enable pre2.6.25 kernels again by adding compatibility for strict_strto[u]l() git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1447 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/compat.h b/compat.h index 2f0877c..cd3e71f 100644 --- a/compat.h +++ b/compat.h @@ -60,3 +60,14 @@ #define cancel_delayed_work_sync(wq) cancel_rearming_delayed_work(wq) #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) +#define strict_strtoul(cp, base, res) \ + ({ \ + int ret = 0; \ + char *endp; \ + *res = simple_strtoul(cp, &endp, base); \ + if (cp == endp) \ + ret = -EINVAL; \ + ret; \ +}) +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) */ diff --git a/proc.c b/proc.c index 8718079..7677de0 100644 --- a/proc.c +++ b/proc.c @@ -26,6 +26,7 @@ #include "types.h" #include "hash.h" #include "vis.h" +#include "compat.h" uint8_t vis_format = DOT_DRAW; @@ -146,7 +147,7 @@ static ssize_t proc_orig_interval_write(struct file *file, { char *interval_string; int not_copied = 0; - long originator_interval_tmp; + unsigned long originator_interval_tmp; int retval; interval_string = kmalloc(count, GFP_KERNEL); @@ -157,7 +158,7 @@ static ssize_t proc_orig_interval_write(struct file *file, not_copied = copy_from_user(interval_string, buffer, count); interval_string[count - not_copied - 1] = 0; - retval = strict_strtol(interval_string, 10, &originator_interval_tmp); + retval = strict_strtoul(interval_string, 10, &originator_interval_tmp); if (retval) { debug_log(LOG_TYPE_WARN, "New originator interval invalid\n"); goto end; @@ -290,7 +291,7 @@ static ssize_t proc_log_level_write(struct file *instance, { char *log_level_string, *tokptr, *cp; int finished, not_copied = 0; - uint8_t log_level_tmp = 0; + unsigned long log_level_tmp = 0; log_level_string = kmalloc(count, GFP_KERNEL); @@ -300,10 +301,8 @@ static ssize_t proc_log_level_write(struct file *instance, not_copied = copy_from_user(log_level_string, userbuffer, count); log_level_string[count - not_copied - 1] = 0; - log_level_tmp = simple_strtol(log_level_string, &cp, 10); - - if (cp == log_level_string) { - /* was not (beginning with) a number, doing textual parsing */ + if (strict_strtoul(log_level_string, 10, &log_level_tmp) < 0) { + /* was not a number, doing textual parsing */ log_level_tmp = 0; tokptr = log_level_string; @@ -663,7 +662,7 @@ static ssize_t proc_aggr_write(struct file *file, const char __user *buffer, { char *aggr_string; int not_copied = 0; - long aggregation_enabled_tmp; + unsigned long aggregation_enabled_tmp; aggr_string = kmalloc(count, GFP_KERNEL); @@ -673,7 +672,7 @@ static ssize_t proc_aggr_write(struct file *file, const char __user *buffer, not_copied = copy_from_user(aggr_string, buffer, count); aggr_string[count - not_copied - 1] = 0; - strict_strtol(aggr_string, 10, &aggregation_enabled_tmp); + strict_strtoul(aggr_string, 10, &aggregation_enabled_tmp); if ((aggregation_enabled_tmp != 0) && (aggregation_enabled_tmp != 1)) { debug_log(LOG_TYPE_WARN, "Aggregation can only be enabled (1) or disabled (0), given value: %li\n", aggregation_enabled_tmp); -- batman-adv

1 0

[git] batman-adv branch, master, updated. f01af72e428717f15f2f612c07fd8ed57da19b7c
by postmaster＠open-mesh.net 18 Oct '09

18 Oct '09

The following commit has been merged in the master branch: commit 957c36fbdb1d37b4d7b6b2faccb1ce3f34fc50ce Author: simon <simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Oct 17 16:28:30 2009 +0000 use random ethernet address generator from the kernel git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1446 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/soft-interface.c b/soft-interface.c index d916764..08a16e3 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -119,8 +119,7 @@ void interface_setup(struct net_device *dev) * skbuff for our header */ /* generate random address */ - *(u16 *)dev_addr = __constant_htons(0x00FF); - get_random_bytes(dev_addr + sizeof(u16), 4); + random_ether_addr(dev_addr); memcpy(dev->dev_addr, dev_addr, sizeof(dev->dev_addr)); SET_ETHTOOL_OPS(dev, &bat_ethtool_ops); -- batman-adv

1 0

r1453 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 18 Oct '09

18 Oct '09

Author: marek Date: 2009-10-18 11:47:08 +0000 (Sun, 18 Oct 2009) New Revision: 1453 Modified: trunk/batman-adv-kernelland/soft-interface.c Log: [batman-adv] remove last LINUX_VERSION_CODE check outside of compat.h Modified: trunk/batman-adv-kernelland/soft-interface.c =================================================================== --- trunk/batman-adv-kernelland/soft-interface.c 2009-10-17 22:11:17 UTC (rev 1452) +++ trunk/batman-adv-kernelland/soft-interface.c 2009-10-18 11:47:08 UTC (rev 1453) @@ -83,7 +83,7 @@ return 0; } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) +#ifdef HAVE_NET_DEVICE_OPS static const struct net_device_ops bat_netdev_ops = { .ndo_open = interface_open, .ndo_stop = interface_release, @@ -93,7 +93,7 @@ .ndo_start_xmit = interface_tx, .ndo_validate_addr = eth_validate_addr }; -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */ +#endif void interface_setup(struct net_device *dev) { @@ -102,16 +102,16 @@ ether_setup(dev); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) +#ifdef HAVE_NET_DEVICE_OPS + dev->netdev_ops = &bat_netdev_ops; +#else dev->open = interface_open; dev->stop = interface_release; dev->get_stats = interface_stats; dev->set_mac_address = interface_set_mac_addr; dev->change_mtu = interface_change_mtu; dev->hard_start_xmit = interface_tx; -#else - dev->netdev_ops = &bat_netdev_ops; -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) */ +#endif dev->destructor = free_netdev; dev->mtu = hardif_min_mtu();

1 0

[SCM] UNNAMED PROJECT branch, linux, updated. b0e4cc81db8213bfdca376557cc35dcda9298364
by postmaster＠open-mesh.net 18 Oct '09

18 Oct '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "UNNAMED PROJECT". The branch, linux has been updated via b0e4cc81db8213bfdca376557cc35dcda9298364 (commit) from b419258e72e383c9710a6b67d296145f55b08eb0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b0e4cc81db8213bfdca376557cc35dcda9298364 Author: Andrew Lunn <andrew(a)lunn.ch> Date: Sun Oct 18 12:44:49 2009 +0200 Add missing Kconfig file, without which we cannot build in tree. ----------------------------------------------------------------------- Summary of changes: drivers/staging/batman-adv/Kconfig | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) create mode 100644 drivers/staging/batman-adv/Kconfig hooks/post-receive -- UNNAMED PROJECT

1 0

[SCM] UNNAMED PROJECT branch, linux, updated. b419258e72e383c9710a6b67d296145f55b08eb0
by postmaster＠open-mesh.net 18 Oct '09

18 Oct '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "UNNAMED PROJECT". The branch, linux has been updated via b419258e72e383c9710a6b67d296145f55b08eb0 (commit) via faa2b6a225b1cb26bffbfc68ff8d03ae6355172b (commit) via 3918736320778f443670ccfb030a5f3c000f2716 (commit) via 3204078dde2bf74a458fce08ccf3c1e12699f0cc (commit) from d93dc92113ce51879f6b289382113f7b9e584658 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b419258e72e383c9710a6b67d296145f55b08eb0 Merge: faa2b6a225b1cb26bffbfc68ff8d03ae6355172b d93dc92113ce51879f6b289382113f7b9e584658 Author: Andrew Lunn <andrew(a)lunn.ch> Date: Sun Oct 18 11:58:17 2009 +0200 Merge branch 'linux' of batman-git:/srv/git/batman into linux commit faa2b6a225b1cb26bffbfc68ff8d03ae6355172b Author: Andrew Lunn <andrew(a)lunn.ch> Date: Fri Oct 16 23:21:25 2009 +0200 Allow batman-adv to be build inside staging. commit 3918736320778f443670ccfb030a5f3c000f2716 Author: Andrew Lunn <andrew(a)lunn.ch> Date: Fri Oct 16 23:16:11 2009 +0200 Allow staging drivers to be used with UML. commit 3204078dde2bf74a458fce08ccf3c1e12699f0cc Author: Andrew Lunn <andrew(a)lunn.ch> Date: Fri Oct 16 23:14:37 2009 +0200 UML register interrupt race condition fix. uml_request_irq enables the interrupt before registering an interrupt handler. This causes trouble when an interrupt occurs between enabling the interrupt and before registering the handler. The interrupts remains perminently disabled... Also, change the way interrupts return. With older Linux kernels, __do_IRQ would call all chained interrupt handlers. Now it only calls handlers until one returns a value indicating it has handled the interrupt. We need to ensure all UML network interrupt handlers get called, so don't return a value indicating we have handled the interrupt. ----------------------------------------------------------------------- Summary of changes: arch/um/Kconfig.rest | 2 ++ arch/um/drivers/net_kern.c | 2 +- arch/um/kernel/irq.c | 9 ++++----- drivers/staging/Kconfig | 2 ++ drivers/staging/Makefile | 1 + drivers/staging/batman-adv/Makefile | 34 ++-------------------------------- 6 files changed, 12 insertions(+), 38 deletions(-) hooks/post-receive -- UNNAMED PROJECT

1 0

[SCM] UNNAMED PROJECT branch, linux, updated. d93dc92113ce51879f6b289382113f7b9e584658
by postmaster＠open-mesh.net 17 Oct '09

17 Oct '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "UNNAMED PROJECT". The branch, linux has been updated via d93dc92113ce51879f6b289382113f7b9e584658 (commit) from e3161ae38a532b87543fb236ca30448da2ae2ee7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d93dc92113ce51879f6b289382113f7b9e584658 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Oct 18 00:04:31 2009 +0800 batman-adv: move TODO into the batman-adv folder ----------------------------------------------------------------------- Summary of changes: drivers/staging/{ => batman-adv}/TODO | 0 1 files changed, 0 insertions(+), 0 deletions(-) rename drivers/staging/{ => batman-adv}/TODO (100%) hooks/post-receive -- UNNAMED PROJECT

1 0

[SCM] UNNAMED PROJECT branch, linux, updated. e3161ae38a532b87543fb236ca30448da2ae2ee7
by postmaster＠open-mesh.net 17 Oct '09

17 Oct '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "UNNAMED PROJECT". The branch, linux has been updated via e3161ae38a532b87543fb236ca30448da2ae2ee7 (commit) from da4e013690bb9d038235f4334530d3977774a14b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e3161ae38a532b87543fb236ca30448da2ae2ee7 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Oct 18 00:00:34 2009 +0800 batman-adv: initial TODO file added ----------------------------------------------------------------------- Summary of changes: drivers/staging/TODO | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) create mode 100644 drivers/staging/TODO hooks/post-receive -- UNNAMED PROJECT

1 0

r1452 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 17 Oct '09

17 Oct '09

Author: marek Date: 2009-10-17 22:11:17 +0000 (Sat, 17 Oct 2009) New Revision: 1452 Modified: trunk/batman-adv-kernelland/hard-interface.c Log: [batman-adv] print a warning when an existing mac address is added again Modified: trunk/batman-adv-kernelland/hard-interface.c =================================================================== --- trunk/batman-adv-kernelland/hard-interface.c 2009-10-17 22:01:20 UTC (rev 1451) +++ trunk/batman-adv-kernelland/hard-interface.c 2009-10-17 22:11:17 UTC (rev 1452) @@ -70,6 +70,28 @@ return min_mtu; } +void check_known_mac_addr(uint8_t *addr) +{ + struct batman_if *batman_if; + char mac_string[ETH_STR_LEN]; + + rcu_read_lock(); + list_for_each_entry_rcu(batman_if, &if_list, list) { + if ((batman_if->if_active != IF_ACTIVE) && + (batman_if->if_active != IF_TO_BE_ACTIVATED)) + continue; + + if (!compare_orig(batman_if->net_dev->dev_addr, addr)) + continue; + + addr_to_string(mac_string, addr); + debug_log(LOG_TYPE_WARN, "The newly added mac address (%s) already exists on: %s\n", + mac_string, batman_if->dev); + debug_log(LOG_TYPE_WARN, "It is strongly recommended to keep mac addresses unique to avoid problems!\n"); + } + rcu_read_unlock(); +} + /* adjusts the MTU if a new interface with a smaller MTU appeared. */ void update_min_mtu(void) { @@ -191,6 +213,8 @@ goto bind_err; } + check_known_mac_addr(batman_if->net_dev->dev_addr); + batman_if->raw_sock->sk->sk_user_data = batman_if->raw_sock->sk->sk_data_ready; batman_if->raw_sock->sk->sk_data_ready = batman_data_ready;

1 0

r1451 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 17 Oct '09

17 Oct '09

Author: simon Date: 2009-10-17 22:01:20 +0000 (Sat, 17 Oct 2009) New Revision: 1451 Modified: trunk/batman-adv-kernelland/routing.c Log: drop false packets which are found in the padding of Ethernet frames. Modified: trunk/batman-adv-kernelland/routing.c =================================================================== --- trunk/batman-adv-kernelland/routing.c 2009-10-17 19:28:57 UTC (rev 1450) +++ trunk/batman-adv-kernelland/routing.c 2009-10-17 22:01:20 UTC (rev 1451) @@ -400,6 +400,19 @@ char is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0, is_broadcast = 0, is_bidirectional, is_single_hop_neigh, is_duplicate; unsigned short if_incoming_seqno; + /* Silently drop when the batman packet is actually not a correct packet. + * + * This might happen if a packet is padded (e.g. Ethernet has a + * minimum frame length of 64 byte) and the aggregation interprets + * it as an additional length. + * + * TODO: A more sane solution would be to have a bit in the batman_packet + * to detect whether the packet is the last packet in an aggregation. + * Here we expect that the padding is always zero (or not 0x01) + */ + if (batman_packet->packet_type != BAT_PACKET) + return; + /* could be changed by schedule_own_packet() */ if_incoming_seqno = atomic_read(&if_incoming->seqno);

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits