commits February 2012

commits@lists.open-mesh.org

1 participants
131 discussions

batman-adv; branch, master, updated. v2012.0.0-59-g7deba89
by postmaster＠open-mesh.org 12 Feb '12

12 Feb '12

The following commit has been merged in the master branch: commit 7deba897566c8da9d390e969f8a0f2938ba4281d Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Feb 7 17:20:45 2012 +0800 batman-adv: refactoring API: find generalized name for bat_ogm_init callback Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index bbab00b..3eff7f0 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -30,7 +30,7 @@ #include "send.h" #include "bat_algo.h" -static void bat_iv_ogm_init(struct hard_iface *hard_iface) +static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) { struct batman_ogm_packet *batman_ogm_packet; @@ -1180,7 +1180,7 @@ static void bat_iv_ogm_receive(struct hard_iface *if_incoming, static struct bat_algo_ops batman_iv __read_mostly = { .name = "BATMAN IV", - .bat_ogm_init = bat_iv_ogm_init, + .bat_iface_enable = bat_iv_ogm_iface_enable, .bat_ogm_init_primary = bat_iv_ogm_init_primary, .bat_ogm_update_mac = bat_iv_ogm_update_mac, .bat_ogm_schedule = bat_iv_ogm_schedule, diff --git a/hard-interface.c b/hard-interface.c index e16c996..4052444 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -318,7 +318,7 @@ int hardif_enable_interface(struct hard_iface *hard_iface, hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface); - bat_priv->bat_algo_ops->bat_ogm_init(hard_iface); + bat_priv->bat_algo_ops->bat_iface_enable(hard_iface); if (!hard_iface->packet_buff) { bat_err(hard_iface->soft_iface, "Can't add interface packet " diff --git a/main.c b/main.c index 7750bca..8bc27e1 100644 --- a/main.c +++ b/main.c @@ -208,7 +208,7 @@ int bat_algo_register(struct bat_algo_ops *bat_algo_ops) } /* all algorithms must implement all ops (for now) */ - if (!bat_algo_ops->bat_ogm_init || + if (!bat_algo_ops->bat_iface_enable || !bat_algo_ops->bat_ogm_init_primary || !bat_algo_ops->bat_ogm_update_mac || !bat_algo_ops->bat_ogm_schedule || diff --git a/types.h b/types.h index a5b1a63..4b92248 100644 --- a/types.h +++ b/types.h @@ -377,8 +377,8 @@ struct recvlist_node { struct bat_algo_ops { struct hlist_node list; char *name; - /* init OGM when hard-interface is enabled */ - void (*bat_ogm_init)(struct hard_iface *hard_iface); + /* init routing info when hard-interface is enabled */ + void (*bat_iface_enable)(struct hard_iface *hard_iface); /* init primary OGM when primary interface is selected */ void (*bat_ogm_init_primary)(struct hard_iface *hard_iface); /* init mac addresses of the OGM belonging to this hard-interface */ -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-58-g5ab6f11
by postmaster＠open-mesh.org 12 Feb '12

12 Feb '12

The following commit has been merged in the master branch: commit 5ab6f11b076d4e9f4db313e9452a1f47d66e8bd5 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Feb 7 17:19:58 2012 +0800 batman-adv: move ogm initialization into the proper function Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/hard-interface.c b/hard-interface.c index 612f2c8..e16c996 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -337,7 +337,6 @@ int hardif_enable_interface(struct hard_iface *hard_iface, hard_iface->batman_adv_ptype.dev = hard_iface->net_dev; dev_add_pack(&hard_iface->batman_adv_ptype); - atomic_set(&hard_iface->seqno, 1); atomic_set(&hard_iface->frag_seqno, 1); bat_info(hard_iface->soft_iface, "Adding interface: %s\n", hard_iface->net_dev->name); @@ -463,6 +462,13 @@ static struct hard_iface *hardif_add_interface(struct net_device *net_dev) check_known_mac_addr(hard_iface->net_dev); list_add_tail_rcu(&hard_iface->list, &hardif_list); + /** + * This can't be called via a bat_priv callback because + * we have no bat_priv yet. + */ + atomic_set(&hard_iface->seqno, 1); + hard_iface->packet_buff = NULL; + return hard_iface; free_if: -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-57-gf86649b
by postmaster＠open-mesh.org 12 Feb '12

12 Feb '12

The following commit has been merged in the master branch: commit f86649b10214e8e98bdec161cefa13dcc8cb1e41 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Feb 12 14:35:30 2012 +0100 batman-adv: Backport dev_hw_addr_random 910ccacb9dd2bfac8ce1ac411af514fe72fa84c0 introduced the hardware address initialization using dev_hw_addr_random. This function was added to linux with linux 2.6.36. Older kernel versions have to igore the NET_ADDR_RANDOM variable and use random_ether_addr directly. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/compat.h b/compat.h index e90409f..88866da 100644 --- a/compat.h +++ b/compat.h @@ -104,6 +104,15 @@ static inline int __param_set_copystring(const char *val, } #define param_set_copystring __param_set_copystring +static inline void dev_hw_addr_random(struct net_device *dev, u8 *hwaddr) +{ + random_ether_addr(hwaddr); +} + +/* hack for dev->addr_assign_type &= ~NET_ADDR_RANDOM; */ +#define addr_assign_type ifindex +#define NET_ADDR_RANDOM 0 + #endif /* < KERNEL_VERSION(2, 6, 36) */ -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-56-g8e2c2d3
by postmaster＠open-mesh.org 12 Feb '12

12 Feb '12

The following commit has been merged in the master branch: commit 8e2c2d3e8bbc09020dd4ac7da5f922d79eca02f4 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Feb 12 14:35:29 2012 +0100 batman-adv: Remove useless branch for NET_ADDR_RANDOM 910ccacb9dd2bfac8ce1ac411af514fe72fa84c0 introduced a branch for a statement that doesn't need it. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/soft-interface.c b/soft-interface.c index 0087052..3750e9b 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -108,8 +108,7 @@ static int interface_set_mac_addr(struct net_device *dev, void *p) } memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); - if (dev->addr_assign_type & NET_ADDR_RANDOM) - dev->addr_assign_type &= ~NET_ADDR_RANDOM; + dev->addr_assign_type &= ~NET_ADDR_RANDOM; return 0; } -- batman-adv

1 0

batctl; branch, master, updated. v2012.0.0-13-g1cce965
by postmaster＠open-mesh.org 11 Feb '12

11 Feb '12

The following commit has been merged in the master branch: commit 1cce9654449331d13b5576e845453ff2613dbe43 Merge: e01ed433c8e63b7cdb8bf9ee6641af3c6748da0b 2ecb2c8b060b63f801d9070633806a0ba5e6ff3f Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Feb 11 19:18:03 2012 +0800 Merge branch 'next' -- batctl

1 0

batctl; branch, next, updated. v2012.0.0-8-g2ecb2c8
by postmaster＠open-mesh.org 11 Feb '12

11 Feb '12

The following commit has been merged in the next branch: commit 2ecb2c8b060b63f801d9070633806a0ba5e6ff3f Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Feb 6 22:04:17 2012 +0800 batctl: tr / ping - ignore packets with wrong sequence number Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/ping.c b/ping.c index dff0f33..791cfb7 100644 --- a/ping.c +++ b/ping.c @@ -196,6 +196,7 @@ int ping(char *mesh_iface, int argc, char **argv) goto sleep; } +read_packet: start_timer(); FD_ZERO(&read_socket); @@ -229,6 +230,10 @@ int ping(char *mesh_iface, int argc, char **argv) goto sleep; } + /* after receiving an unexpected seqno we keep waiting for our answer */ + if (htons(seq_counter) != icmp_packet_in.seqno) + goto read_packet; + switch (icmp_packet_in.msg_type) { case ECHO_REPLY: time_delta = end_timer(); diff --git a/traceroute.c b/traceroute.c index f9e62cd..fdc9e4a 100644 --- a/traceroute.c +++ b/traceroute.c @@ -142,6 +142,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) continue; } +read_packet: start_timer(); tv.tv_sec = 2; @@ -168,6 +169,10 @@ int traceroute(char *mesh_iface, int argc, char **argv) continue; } + /* after receiving an unexpected seqno we keep waiting for our answer */ + if (htons(seq_counter) != icmp_packet_in.seqno) + goto read_packet; + switch (icmp_packet_in.msg_type) { case ECHO_REPLY: dst_reached = 1; -- batctl

1 0

batctl; branch, master, updated. v2012.0.0-11-ge01ed43
by postmaster＠open-mesh.org 11 Feb '12

11 Feb '12

The following commit has been merged in the master branch: commit e01ed433c8e63b7cdb8bf9ee6641af3c6748da0b Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Feb 9 09:58:25 2012 +0100 batctl: fix DBG_BLA log level value When "batctl ll" is launched with argument "bla", the wrong log_level value (1 << 4) is written into sysfs instead of the correct (1 << 3) Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/sys.c b/sys.c index 6cf4714..eeb7005 100644 --- a/sys.c +++ b/sys.c @@ -223,7 +223,7 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) else if (strcmp(argv[i], "tt") == 0) log_level |= (1 << 2); else if (strcmp(argv[i], "bla") == 0) - log_level |= (1 << 4); + log_level |= (1 << 3); else { log_level_usage(); goto out; -- batctl

1 0

batman-adv; branch, master, updated. v2012.0.0-55-g2c9280e
by postmaster＠open-mesh.org 11 Feb '12

11 Feb '12

The following commit has been merged in the master branch: commit 2c9280e830f1eef480f4df23d4d48c1fa5c1a8e4 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Feb 10 12:21:55 2012 +0100 batman-adv: Fix daily check regression in blaII 9fd6b0615b5499b270d39a92b8790e206cf75833 introduced some regressions in the daily checks on open-mesh.org. Those were only visible when CONFIG_BATMAN_ADV_BLA was disabled. The reason was the usage of defines to replace the calls for not available functions. The actual c compiler is not able to distinguish between the used and unused variables because it doesn't see the function call anymore. The second problem was the use of simple subscopes where "do {} while(0)" whould have been necessary. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/bridge_loop_avoidance.h b/bridge_loop_avoidance.h index 24d7f16..2758b8c 100644 --- a/bridge_loop_avoidance.h +++ b/bridge_loop_avoidance.h @@ -46,9 +46,10 @@ void bla_free(struct bat_priv *bat_priv); #define bla_claim_table_seq_print_text (0) #define bla_is_backbone_gw_orig(...) (0) #define bla_check_bcast_duplist(...) (0) -#define bla_update_orig_address(...) {} +#define bla_update_orig_address(...) do {} while (0) #define bla_init(...) (1) -#define bla_free(...) {} +#define bla_free(...) do {} while (0) + #endif /* ifdef CONFIG_BATMAN_ADV_BLA */ diff --git a/soft-interface.c b/soft-interface.c index 7047a47..0087052 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -135,7 +135,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) uint8_t stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x00}; unsigned int header_len = 0; int data_len = skb->len, ret; - short vid = -1; + short vid __maybe_unused = -1; bool do_bcast = false; if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE) @@ -256,7 +256,7 @@ void interface_rx(struct net_device *soft_iface, struct bat_priv *bat_priv = netdev_priv(soft_iface); struct ethhdr *ethhdr; struct vlan_ethhdr *vhdr; - short vid = -1; + short vid __maybe_unused = -1; /* check if enough space is available for pulling, and pull */ if (!pskb_may_pull(skb, hdr_size)) -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-54-g910ccac
by postmaster＠open-mesh.org 11 Feb '12

11 Feb '12

The following commit has been merged in the master branch: commit 910ccacb9dd2bfac8ce1ac411af514fe72fa84c0 Author: Danny Kukawka <danny.kukawka(a)bisect.de> Date: Wed Feb 8 22:10:47 2012 +0100 batman-adv: use dev_hw_addr_random() instead of random_ether_addr() Use dev_hw_addr_random() instead of calling random_ether_addr() to set addr_assign_type correctly to NET_ADDR_RANDOM. Reset the state to NET_ADDR_PERM as soon as the MAC get changed via .ndo_set_mac_address. Signed-off-by: Danny Kukawka <danny.kukawka(a)bisect.de> [lindner_marek(a)yahoo.de: minor flag handling modification] Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/soft-interface.c b/soft-interface.c index 8de8779..7047a47 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -108,6 +108,9 @@ static int interface_set_mac_addr(struct net_device *dev, void *p) } memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); + if (dev->addr_assign_type & NET_ADDR_RANDOM) + dev->addr_assign_type &= ~NET_ADDR_RANDOM; + return 0; } @@ -323,7 +326,6 @@ static const struct net_device_ops bat_netdev_ops = { static void interface_setup(struct net_device *dev) { struct bat_priv *priv = netdev_priv(dev); - char dev_addr[ETH_ALEN]; ether_setup(dev); @@ -340,8 +342,7 @@ static void interface_setup(struct net_device *dev) dev->hard_header_len = BAT_HEADER_LEN; /* generate random address */ - random_ether_addr(dev_addr); - memcpy(dev->dev_addr, dev_addr, ETH_ALEN); + dev_hw_addr_random(dev, dev->dev_addr); SET_ETHTOOL_OPS(dev, &bat_ethtool_ops); -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-53-g9c7df12
by postmaster＠open-mesh.org 11 Feb '12

11 Feb '12

The following commit has been merged in the master branch: commit 9c7df129e4e85c3a8aa3e249725fc1587e74ab8c Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Nov 23 11:35:44 2011 +0100 batman-adv: add biggest_unsigned_int(x) macro in case of dynamic type variable, it could be needed to compute at compile time its maximal value. This macro helps in doing that for unsigned integer types Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/main.h b/main.h index 2ba8724..e669eea 100644 --- a/main.h +++ b/main.h @@ -231,6 +231,9 @@ static inline bool has_timed_out(unsigned long timestamp, unsigned int timeout) /* Returns the smallest signed integer in two's complement with the sizeof x */ #define smallest_signed_int(x) (1u << (7u + 8u * (sizeof(x) - 1u))) +/* Returns the biggest unsigned integer with the sizeof x */ +#define biggest_unsigned_int(x) (~(x)0) + /* 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 -- batman-adv

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits February 2012