B.A.T.M.A.N June 2010

b.a.t.m.a.n@lists.open-mesh.org

24 participants
44 discussions

[B.A.T.M.A.N.] WBMv3: a Babel perspective
by Juliusz Chroboczek 12 Jun '10

12 Jun '10

Hi, Many of us spent last week-end at the third edition of the Wireless BattleMesh in Bracciano, north of Rome, experimenting with wireless mesh routing technologies. Here's a quick summary of the events, from the perspective of the Babel routing protocol. 1. The main event ***************** The main goal of the meeting was to evaluate the real-world behaviour of a bunch of wireless mesh routing protocols. Five protocols were evaluated: OLSR, Babel, and three variants of BATMAN. The protocol were tested in three static topologies: a broken network, a network with massive packet loss, and a network with high but reasonable packet loss. Elektra has written up a summary of the results (thanks!) of which I've put a copy on http://www.pps.jussieu.fr/~jch/software/babel/wbmv3-elektra.pdf In short: (1) when the network is broken, Babel is the first to collapse; (2) Babel behaves well when the network is usable; (3) Babel generates too many small packets on broken networks. I believe that (1) is normal: Babel reacts faster than the other protocols to mobility, and therefore tends to be less stable than the others in broken networks. Point (3) is due to the route request mechanism: a Babel node in a broken network is trying too hard to discover new routes. I'm not sure whether that can be fixed without losing Babel's fast reaction to mobility. 2. Helicopters with webcams and sharks with lasers ************************************************** In addition to the main event, described above, there were a few interesting side events. The Roman crowd (ninux.org) have been working on running Linux on a model helicopter equipped with Wifi and a webcam; the goal would have been to stream video from the over a Babel mesh. Which got me excited like a child before Christmas. Unfortunately, they didn't have time to complete the experiment (due to issues with ffmpeg, as far as I understand), which is a huge pity. Let's hope we hear from the webcam-equipped helicopter soon. There were no sharks equipped with lasers, whether running Linux or otherwise. 3. Diversity-aware routing ************************** Zoobab and myself have been trying to work on diversity-aware routing protocols. There is now a branch of babeld (known as babelz) which performs diversity-aware routing, and appears to work. However, due to wine, beer, grappa and other factors outside of our control, we haven't managed to obtain any useful measurements from babelz. Babelz should be made public as soon as I find some time to finish debugging it. In the meantime, let me know if you want a copy. 4. Babel for OpenBSD ******************** Dermiste has finished the Babel port to OpenBSD, and we've been able to do some debugging -- it appears to work now. This implies that Babel should be easy to port to other Kame stacks (notably FreeBSD and Darwin). The code hasn't been merged into the trunk yet. 5. Time-lapse video ******************* Somebody (who?) has been experimenting with time-lapse video. The results are quite amusing -- search Youtube for "BattleMeshV3". My only regret the time-lapse video has been made on DRM'd hardware running proprietary software. (Folks, we need hackable digital cameras -- CHDK is not enough.) 6. Other stuff ************** I've had a lot of extremely interesting discussions with a lot of extremely interesting people. In no particular order, I've learnt a lot about automatic tunnelling of IPv4 in v6, The Pirate Party, solar cells, BMX, Liquid Democracy, MOSFETs, Ugo Foscolo, rural exodus in the Greek islands, wireless networking in Catalogna and groundsheets. My liver has almost recovered. 7. Thanks ********* Yes, thanks. Juliusz

2 2

[B.A.T.M.A.N.] WBMv3: photos and slides
by Juliusz Chroboczek 11 Jun '10

11 Jun '10

Dear all, 1. A selection of my photos from Bracciano are in http://coloquinte.cristau.org/~jch/wbmv3/ username "ninux", password "Bracciano". The full-size originals are available on demand, of course. (Many thanks to J.C. for the web server.) 2. The slides that I used for the Babel talk are in http://www.pps.jussieu.fr/~jch/software/babel/babel-funkfeuer.pdf The (somewhat fragmentary) slides of the closing talk are on http://www.pps.jussieu.fr/~jch/software/babel/twf-bracciano.pdf 3. I'll send a longer, more technical mail about the meeting later tonight. Juliusz

1 0

[B.A.T.M.A.N.] release cycle
by Marek Lindner 10 Jun '10

10 Jun '10

Hi, while sitting in Bracciano (at the WMBv3), enjoying the sun and the excellent wine we were thinking about our current release cycle. Since we began merging our code into the official linux tree we published a new version roughly every 3 months to have a compatible batman-adv/batctl version for each linux release. For instance: * linux 2.6.33 => batman-adv/batctl 0.2.0 * linux 2.6.34 => batman-adv/batctl 0.2.1 * linux 2.6.35 => batman-adv/batctl 0.2.2 (to be released soon) Due to various reasons these minor versions (0.2.1 & 0.2.2) contain much more than just bugfixes. Individual features & major changes have been backported from the trunk. This has the advantage of adding new features faster instead of holding them back for months but on the other hand might introduce new bugs at the same time. How to move forward from here ? After a long and healthy discussion we came to the following proposal: * We keep the 3 months release cycle containing new features. All new features go into the trunk first and when ready can be staged for the upcoming release. This way, we won't have major releases anylonger but rather a constant flow of new stuff. * To reflect the new & changed nature of the release, the version numbering has to change a bit. The following releases (after 0.2.2) will look like this: 0.3, 0.4, etc. We thought about adopting the linux numbering scheme but it might lead to confusion as you can use a new batman with older kernels. * If we find a volunteer to take the job, we would be interested in having a "stable" branch. The maintainer could pick any release of interest, fetch stability patches flying around and apply only those to the branch. Comments ? If nobody objects we would start pretty soon following these guidelines. Regards, Marek

3 2

[B.A.T.M.A.N.] [PATCH] batman-adv: Ignore debugfs on kernels without debugfs support
by Sven Eckelmann 10 Jun '10

10 Jun '10

All code for debugfs is ignored when the creation of the batman-adv root directory in debugfs fails. It must also be ignored when the debugfs_create_dir tells us that debugfs is not implemented to prevent a crash during the unload of the module. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- Must be applied in both maint and trunk. batman-adv-kernelland/bat_debugfs.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/batman-adv-kernelland/bat_debugfs.c b/batman-adv-kernelland/bat_debugfs.c index cf2545a..b8081e3 100644 --- a/batman-adv-kernelland/bat_debugfs.c +++ b/batman-adv-kernelland/bat_debugfs.c @@ -101,6 +101,8 @@ static struct bat_debuginfo *mesh_debuginfos[] = { void debugfs_init(void) { bat_debugfs = debugfs_create_dir(DEBUGFS_BAT_SUBDIR, NULL); + if (bat_debugfs == ERR_PTR(-ENODEV)) + bat_debugfs = NULL; } void debugfs_destroy(void) -- 1.7.1

2 1

[B.A.T.M.A.N.] [PATCH-trunk] batman-adv: Mark locally used symbols as static
by Sven Eckelmann 09 Jun '10

09 Jun '10

Functions and variables which are used only inside one object file can be declared as static. This helped to find unused functions/variables * mainIfAddr_default * main_if_was_up and functions with declarations but missing definitions * hash_debug * orig_find * send_own_packet_work Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv-kernelland/bitarray.c | 2 +- batman-adv-kernelland/bitarray.h | 3 - batman-adv-kernelland/hard-interface.c | 2 +- batman-adv-kernelland/hash.c | 2 +- batman-adv-kernelland/hash.h | 6 -- batman-adv-kernelland/originator.c | 32 +++++----- batman-adv-kernelland/originator.h | 2 - batman-adv-kernelland/routing.c | 2 +- batman-adv-kernelland/routing.h | 2 - batman-adv-kernelland/send.c | 4 +- batman-adv-kernelland/send.h | 2 - batman-adv-kernelland/soft-interface.c | 104 ++++++++++++++--------------- batman-adv-kernelland/soft-interface.h | 6 -- batman-adv-kernelland/translation-table.c | 9 ++- batman-adv-kernelland/translation-table.h | 3 - batman-adv-kernelland/vis.c | 4 +- batman-adv-kernelland/vis.h | 3 - 17 files changed, 80 insertions(+), 108 deletions(-) diff --git a/batman-adv-kernelland/bitarray.c b/batman-adv-kernelland/bitarray.c index a607827..c10fe03 100644 --- a/batman-adv-kernelland/bitarray.c +++ b/batman-adv-kernelland/bitarray.c @@ -63,7 +63,7 @@ void bit_mark(TYPE_OF_WORD *seq_bits, int32_t n) } /* shift the packet array by n places. */ -void bit_shift(TYPE_OF_WORD *seq_bits, int32_t n) +static void bit_shift(TYPE_OF_WORD *seq_bits, int32_t n) { int32_t word_offset, word_num; int32_t i; diff --git a/batman-adv-kernelland/bitarray.h b/batman-adv-kernelland/bitarray.h index 4c351eb..dad13bf 100644 --- a/batman-adv-kernelland/bitarray.h +++ b/batman-adv-kernelland/bitarray.h @@ -32,9 +32,6 @@ uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint32_t last_seqno, /* turn corresponding bit on, so we can remember that we got the packet */ void bit_mark(TYPE_OF_WORD *seq_bits, int32_t n); -/* shift the packet array by n places. */ -void bit_shift(TYPE_OF_WORD *seq_bits, int32_t n); - /* receive and process one packet, returns 1 if received seq_num is considered * new, 0 if old */ diff --git a/batman-adv-kernelland/hard-interface.c b/batman-adv-kernelland/hard-interface.c index ad2e496..70fd314 100644 --- a/batman-adv-kernelland/hard-interface.c +++ b/batman-adv-kernelland/hard-interface.c @@ -435,7 +435,7 @@ out: return NOTIFY_DONE; } -int batman_skb_recv_finish(struct sk_buff *skb) +static int batman_skb_recv_finish(struct sk_buff *skb) { return NF_ACCEPT; } diff --git a/batman-adv-kernelland/hash.c b/batman-adv-kernelland/hash.c index d4a4adc..1286f8f 100644 --- a/batman-adv-kernelland/hash.c +++ b/batman-adv-kernelland/hash.c @@ -23,7 +23,7 @@ #include "hash.h" /* clears the hash */ -void hash_init(struct hashtable_t *hash) +static void hash_init(struct hashtable_t *hash) { int i; diff --git a/batman-adv-kernelland/hash.h b/batman-adv-kernelland/hash.h index ea6d21e..0505595 100644 --- a/batman-adv-kernelland/hash.h +++ b/batman-adv-kernelland/hash.h @@ -56,9 +56,6 @@ struct hashtable_t { * argument and the size the second */ }; -/* clears the hash */ -void hash_init(struct hashtable_t *hash); - /* allocates and clears the hash */ struct hashtable_t *hash_new(int size, hashdata_compare_cb compare, hashdata_choose_cb choose); @@ -98,7 +95,4 @@ struct hashtable_t *hash_resize(struct hashtable_t *hash, int size); * the returned iterator to access the elements until hash_it_t returns NULL. */ struct hash_it_t *hash_iterate(struct hashtable_t *hash, struct hash_it_t *iter_in); - -/* print the hash table for debugging */ -void hash_debug(struct hashtable_t *hash); #endif diff --git a/batman-adv-kernelland/originator.c b/batman-adv-kernelland/originator.c index 28e35b6..89b7cca 100644 --- a/batman-adv-kernelland/originator.c +++ b/batman-adv-kernelland/originator.c @@ -58,21 +58,6 @@ err: return 0; } -void originator_free(void) -{ - unsigned long flags; - - if (!orig_hash) - return; - - cancel_delayed_work_sync(&purge_orig_wq); - - spin_lock_irqsave(&orig_hash_lock, flags); - hash_delete(orig_hash, free_orig_node); - orig_hash = NULL; - spin_unlock_irqrestore(&orig_hash_lock, flags); -} - struct neigh_node * create_neighbor(struct orig_node *orig_node, struct orig_node *orig_neigh_node, uint8_t *neigh, struct batman_if *if_incoming) @@ -95,7 +80,7 @@ create_neighbor(struct orig_node *orig_node, struct orig_node *orig_neigh_node, return neigh_node; } -void free_orig_node(void *data) +static void free_orig_node(void *data) { struct list_head *list_pos, *list_pos_tmp; struct neigh_node *neigh_node; @@ -116,6 +101,21 @@ void free_orig_node(void *data) kfree(orig_node); } +void originator_free(void) +{ + unsigned long flags; + + if (!orig_hash) + return; + + cancel_delayed_work_sync(&purge_orig_wq); + + spin_lock_irqsave(&orig_hash_lock, flags); + hash_delete(orig_hash, free_orig_node); + orig_hash = NULL; + spin_unlock_irqrestore(&orig_hash_lock, flags); +} + /* this function finds or creates an originator entry for the given * address if it does not exits */ struct orig_node *get_orig_node(uint8_t *addr) diff --git a/batman-adv-kernelland/originator.h b/batman-adv-kernelland/originator.h index e91e8a1..6632538 100644 --- a/batman-adv-kernelland/originator.h +++ b/batman-adv-kernelland/originator.h @@ -20,10 +20,8 @@ */ int originator_init(void); -void free_orig_node(void *data); void originator_free(void); void purge_orig(struct work_struct *work); -struct orig_node *orig_find(char *mac); struct orig_node *get_orig_node(uint8_t *addr); struct neigh_node * create_neighbor(struct orig_node *orig_node, struct orig_node *orig_neigh_node, diff --git a/batman-adv-kernelland/routing.c b/batman-adv-kernelland/routing.c index b906f79..8800257 100644 --- a/batman-adv-kernelland/routing.c +++ b/batman-adv-kernelland/routing.c @@ -35,7 +35,7 @@ #include "compat.h" #include "gateway_client.h" -DECLARE_WAIT_QUEUE_HEAD(thread_wait); +static DECLARE_WAIT_QUEUE_HEAD(thread_wait); void slide_own_bcast_window(struct batman_if *batman_if) { diff --git a/batman-adv-kernelland/routing.h b/batman-adv-kernelland/routing.h index d14c405..43387a2 100644 --- a/batman-adv-kernelland/routing.h +++ b/batman-adv-kernelland/routing.h @@ -21,8 +21,6 @@ #include "types.h" -extern wait_queue_head_t thread_wait; - void slide_own_bcast_window(struct batman_if *batman_if); void receive_bat_packet(struct ethhdr *ethhdr, struct batman_packet *batman_packet, diff --git a/batman-adv-kernelland/send.c b/batman-adv-kernelland/send.c index 8df44a6..7db86c2 100644 --- a/batman-adv-kernelland/send.c +++ b/batman-adv-kernelland/send.c @@ -33,6 +33,8 @@ #include "compat.h" +static void send_outstanding_bcast_packet(struct work_struct *work); + /* apply hop penalty for a normal link */ static uint8_t hop_penalty(const uint8_t tq) { @@ -448,7 +450,7 @@ out: return NETDEV_TX_BUSY; } -void send_outstanding_bcast_packet(struct work_struct *work) +static void send_outstanding_bcast_packet(struct work_struct *work) { struct batman_if *batman_if; struct delayed_work *delayed_work = diff --git a/batman-adv-kernelland/send.h b/batman-adv-kernelland/send.h index feaa2fc..0a0990d 100644 --- a/batman-adv-kernelland/send.h +++ b/batman-adv-kernelland/send.h @@ -21,7 +21,6 @@ #include "types.h" -void send_own_packet_work(struct work_struct *work); int send_skb_packet(struct sk_buff *skb, struct batman_if *batman_if, uint8_t *dst_addr); @@ -34,6 +33,5 @@ void schedule_forward_packet(struct orig_node *orig_node, uint8_t directlink, int hna_buff_len, struct batman_if *if_outgoing); int add_bcast_packet_to_list(struct sk_buff *skb); -void send_outstanding_bcast_packet(struct work_struct *work); void send_outstanding_bat_packet(struct work_struct *work); void purge_outstanding_packets(struct batman_if *batman_if); diff --git a/batman-adv-kernelland/soft-interface.c b/batman-adv-kernelland/soft-interface.c index cfa40b6..6d8cab7 100644 --- a/batman-adv-kernelland/soft-interface.c +++ b/batman-adv-kernelland/soft-interface.c @@ -39,7 +39,6 @@ static int32_t skb_packets; static int32_t skb_bad_packets; unsigned char mainIfAddr[ETH_ALEN]; -static unsigned char mainIfAddr_default[ETH_ALEN]; static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd); static void bat_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info); @@ -64,11 +63,6 @@ void set_main_if_addr(uint8_t *addr) memcpy(mainIfAddr, addr, ETH_ALEN); } -int main_if_was_up(void) -{ - return (memcmp(mainIfAddr, mainIfAddr_default, ETH_ALEN) != 0 ? 1 : 0); -} - int my_skb_push(struct sk_buff *skb, unsigned int len) { int result = 0; @@ -86,69 +80,25 @@ int my_skb_push(struct sk_buff *skb, unsigned int len) return 0; } -#ifdef HAVE_NET_DEVICE_OPS -static const struct net_device_ops bat_netdev_ops = { - .ndo_open = interface_open, - .ndo_stop = interface_release, - .ndo_get_stats = interface_stats, - .ndo_set_mac_address = interface_set_mac_addr, - .ndo_change_mtu = interface_change_mtu, - .ndo_start_xmit = interface_tx, - .ndo_validate_addr = eth_validate_addr -}; -#endif - -void interface_setup(struct net_device *dev) -{ - struct bat_priv *priv = netdev_priv(dev); - char dev_addr[ETH_ALEN]; - - ether_setup(dev); - -#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; -#endif - dev->destructor = free_netdev; - - dev->mtu = hardif_min_mtu(); - dev->hard_header_len = BAT_HEADER_LEN; /* reserve more space in the - * skbuff for our header */ - - /* generate random address */ - random_ether_addr(dev_addr); - memcpy(dev->dev_addr, dev_addr, ETH_ALEN); - - SET_ETHTOOL_OPS(dev, &bat_ethtool_ops); - - memset(priv, 0, sizeof(struct bat_priv)); -} - -int interface_open(struct net_device *dev) +static int interface_open(struct net_device *dev) { netif_start_queue(dev); return 0; } -int interface_release(struct net_device *dev) +static int interface_release(struct net_device *dev) { netif_stop_queue(dev); return 0; } -struct net_device_stats *interface_stats(struct net_device *dev) +static struct net_device_stats *interface_stats(struct net_device *dev) { struct bat_priv *priv = netdev_priv(dev); return &priv->stats; } -int interface_set_mac_addr(struct net_device *dev, void *p) +static int interface_set_mac_addr(struct net_device *dev, void *p) { struct sockaddr *addr = p; @@ -166,7 +116,7 @@ int interface_set_mac_addr(struct net_device *dev, void *p) return 0; } -int interface_change_mtu(struct net_device *dev, int new_mtu) +static int interface_change_mtu(struct net_device *dev, int new_mtu) { /* check ranges */ if ((new_mtu < 68) || (new_mtu > hardif_min_mtu())) @@ -328,6 +278,50 @@ void interface_rx(struct sk_buff *skb, int hdr_size) netif_rx(skb); } +#ifdef HAVE_NET_DEVICE_OPS +static const struct net_device_ops bat_netdev_ops = { + .ndo_open = interface_open, + .ndo_stop = interface_release, + .ndo_get_stats = interface_stats, + .ndo_set_mac_address = interface_set_mac_addr, + .ndo_change_mtu = interface_change_mtu, + .ndo_start_xmit = interface_tx, + .ndo_validate_addr = eth_validate_addr +}; +#endif + +void interface_setup(struct net_device *dev) +{ + struct bat_priv *priv = netdev_priv(dev); + char dev_addr[ETH_ALEN]; + + ether_setup(dev); + +#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; +#endif + dev->destructor = free_netdev; + + dev->mtu = hardif_min_mtu(); + dev->hard_header_len = BAT_HEADER_LEN; /* reserve more space in the + * skbuff for our header */ + + /* generate random address */ + random_ether_addr(dev_addr); + memcpy(dev->dev_addr, dev_addr, ETH_ALEN); + + SET_ETHTOOL_OPS(dev, &bat_ethtool_ops); + + memset(priv, 0, sizeof(struct bat_priv)); +} + /* ethtool */ static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) { diff --git a/batman-adv-kernelland/soft-interface.h b/batman-adv-kernelland/soft-interface.h index e7f59af..3852c57 100644 --- a/batman-adv-kernelland/soft-interface.h +++ b/batman-adv-kernelland/soft-interface.h @@ -20,13 +20,7 @@ */ void set_main_if_addr(uint8_t *addr); -int main_if_was_up(void); void interface_setup(struct net_device *dev); -int interface_open(struct net_device *dev); -int interface_release(struct net_device *dev); -struct net_device_stats *interface_stats(struct net_device *dev); -int interface_set_mac_addr(struct net_device *dev, void *addr); -int interface_change_mtu(struct net_device *dev, int new_mtu); int interface_tx(struct sk_buff *skb, struct net_device *dev); void interface_rx(struct sk_buff *skb, int hdr_size); int my_skb_push(struct sk_buff *skb, unsigned int len); diff --git a/batman-adv-kernelland/translation-table.c b/batman-adv-kernelland/translation-table.c index 8edc175..619a9a8 100644 --- a/batman-adv-kernelland/translation-table.c +++ b/batman-adv-kernelland/translation-table.c @@ -33,7 +33,10 @@ atomic_t hna_local_changed; DEFINE_SPINLOCK(hna_local_hash_lock); static DEFINE_SPINLOCK(hna_global_hash_lock); +static void hna_local_purge(struct work_struct *work); static DECLARE_DELAYED_WORK(hna_local_purge_wq, hna_local_purge); +static void _hna_global_del_orig(struct hna_global_entry *hna_global_entry, + char *message); static void hna_local_start_timer(void) { @@ -243,7 +246,7 @@ void hna_local_remove(uint8_t *addr, char *message) spin_unlock_irqrestore(&hna_local_hash_lock, flags); } -void hna_local_purge(struct work_struct *work) +static void hna_local_purge(struct work_struct *work) { struct hna_local_entry *hna_local_entry; HASHIT(hashit); @@ -424,8 +427,8 @@ int hna_global_seq_print_text(struct seq_file *seq, void *offset) return 0; } -void _hna_global_del_orig(struct hna_global_entry *hna_global_entry, - char *message) +static void _hna_global_del_orig(struct hna_global_entry *hna_global_entry, + char *message) { bat_dbg(DBG_ROUTES, "Deleting global hna entry %pM (via %pM): %s\n", hna_global_entry->addr, hna_global_entry->orig_node->orig, diff --git a/batman-adv-kernelland/translation-table.h b/batman-adv-kernelland/translation-table.h index 8b3429e..232208f 100644 --- a/batman-adv-kernelland/translation-table.h +++ b/batman-adv-kernelland/translation-table.h @@ -26,14 +26,11 @@ void hna_local_add(uint8_t *addr); void hna_local_remove(uint8_t *addr, char *message); int hna_local_fill_buffer(unsigned char *buff, int buff_len); int hna_local_seq_print_text(struct seq_file *seq, void *offset); -void hna_local_purge(struct work_struct *work); void hna_local_free(void); int hna_global_init(void); void hna_global_add_orig(struct orig_node *orig_node, unsigned char *hna_buff, int hna_buff_len); int hna_global_seq_print_text(struct seq_file *seq, void *offset); -void _hna_global_del_orig(struct hna_global_entry *hna_global_entry, - char *orig_str); void hna_global_del_orig(struct orig_node *orig_node, char *message); void hna_global_free(void); struct orig_node *transtable_search(uint8_t *addr); diff --git a/batman-adv-kernelland/vis.c b/batman-adv-kernelland/vis.c index 68ee903..9e53462 100644 --- a/batman-adv-kernelland/vis.c +++ b/batman-adv-kernelland/vis.c @@ -44,8 +44,8 @@ _dummy > smallest_signed_int(_dummy); }) #define seq_after(x, y) seq_before(y, x) -struct hashtable_t *vis_hash; -DEFINE_SPINLOCK(vis_hash_lock); +static struct hashtable_t *vis_hash; +static DEFINE_SPINLOCK(vis_hash_lock); static DEFINE_SPINLOCK(recv_list_lock); static struct vis_info *my_vis_info; static struct list_head send_list; /* always locked with vis_hash_lock */ diff --git a/batman-adv-kernelland/vis.h b/batman-adv-kernelland/vis.h index 5dd6521..1cfadce 100644 --- a/batman-adv-kernelland/vis.h +++ b/batman-adv-kernelland/vis.h @@ -44,9 +44,6 @@ struct recvlist_node { uint8_t mac[ETH_ALEN]; }; -extern struct hashtable_t *vis_hash; -extern spinlock_t vis_hash_lock; - int vis_seq_print_text(struct seq_file *seq, void *offset); void receive_server_sync_packet(struct bat_priv *bat_priv, struct vis_packet *vis_packet, -- 1.7.1

2 2

[B.A.T.M.A.N.] [PATCH-trunk] batman-adv: Remove unused code from compat.h
by Sven Eckelmann 09 Jun '10

09 Jun '10

Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv-kernelland/compat.h | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/batman-adv-kernelland/compat.h b/batman-adv-kernelland/compat.h index 614d116..af0e9d8 100644 --- a/batman-adv-kernelland/compat.h +++ b/batman-adv-kernelland/compat.h @@ -43,9 +43,6 @@ #define skb_mac_header(_skb) \ ((_skb)->mac.raw) -#define skb_network_header(_skb) \ - ((_skb)->nh.raw) - #define skb_mac_header(_skb) \ ((_skb)->mac.raw) @@ -53,17 +50,6 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) -#define transtable_local_read(kobj, attr, buff, off, count) \ - transtable_local_read(kobj, buff, off, count) -#define transtable_global_read(kobj, attr, buff, off, count) \ - transtable_global_read(kobj, buff, off, count) -#define originators_read(kobj, attr, buff, off, count) \ - originators_read(kobj, buff, off, count) -#define gateways_read(kobj, attr, buff, off, count) \ - gateways_read(kobj, buff, off, count) -#define vis_data_read(kobj, attr, buff, off, count) \ - vis_data_read(kobj, buff, off, count) - static inline int skb_clone_writable(struct sk_buff *skb, unsigned int len) { /* skb->hdr_len not available, just "not writable" to enforce a copy */ -- 1.7.1

2 2

[B.A.T.M.A.N.] BMX, client node doesn't choose a gateway node.
by "Sebastián D. Criado" 08 Jun '10

08 Jun '10

Hello, I'm having a problem with BMX when trying to make a client node connect to a gateway node. It's BatMan-eXp 0.3-rc1 rv1636 (compatibility version 10). The following is a detail of the tests performed. For some time we have been using B.A.T.M.A.N.-Experimental to communicate our nodes, but, in the last revision that we are testing we are experiencing problems when a client node tries to connect to a gateway node which provides Internet access. It's the version that brings OpenWRT Backfire (r21564). We have been using the version r1157 of BMX and in this version all of our nodes are working fine. A client node, with version rv1636, never chooses a gateway node. It has been proved that although there are two nodes with the version rv1636 (a gateway and a client) the client node still doesn't chooses a gateway. It should be noted also that the nodes can see each other and there is communication between them. It is possible to ping between a node with rv1636 and a node with r1157 without any problem. The start of the client node it's made with: /usr/sbin/bmxd dev=ath2 -o 2000 -r 1 Am I doing something wrong? Here it's data from the debug: bmxd -cd1 Originator brc Nexthop [outgoingIF] Potential nexthops ... [MainIF/IP: ath2/5.217.236.96, UT: 0:00:14:26] 5.170.251.84 ( 87) 5.217.134.125 [ ath2] 5.255.22.64 ( 84) 5.217.134.125 ( 98) 5.217.134.125 [ ath2] 5.255.22.64 ( 98) 5.255.22.64 ( 99) 5.255.22.64 [ ath2] 5.217.134.125 ( 92) bmxd -cd2 Originator bestNextHop # preferred gateway: 0.0.0.0 5.217.134.125 5.217.134.125 98, gw_class 25 - 512KBit/128KBit, reliability: 0, supported tunnel types 2WT, 1WT 5.255.22.64 5.255.22.64 99, gw_class 25 - 512KBit/128KBit, reliability: 0, supported tunnel types 2WT, 1WT 5.170.251.84 5.217.134.125 86, gw_class 169 - 3MBit/768KBit, reliability: 0, supported tunnel types 2WT, 1WT bmxd -cd4 ------------------ DEBUG ------------------ Outstanding OGM for sending: 5.255.22.64 (seqno 13462 ttl 49) at 899745 5.217.236.96 (seqno 60294 ttl 50) at 900000 5.217.134.125 (seqno 35844 ttl 49) at 900086 BMX 0.3-rc1 rv1636, 5.217.236.96, LWS 20, PWS 100, OGI 2000ms, UT 0:00:15:00, CPU 1.1 Neighbor viaIF Originator RTQ RQ TQ lseq lvld rid nid 5.217.134.125 ath2 5.217.134.125 99 100 99 35844 0 7 1 5.255.22.64 ath2 5.255.22.64 100 100 100 13462 0 2 2 Originator outgoingIF bestNextHop TQ(rcnt) knownSince lsqn(diff) lvld pws ~ogi cpu hop 5.170.251.84 ath2 5.217.134.125 88 93 0:00:13:24 57688 0 1 100 2013 1 2 5.217.134.125 ath2 5.217.134.125 98 99 0:00:14:58 35844 0 0 100 2026 9 1 5.255.22.64 ath2 5.255.22.64 99 100 0:00:14:59 13462 0 0 100 1973 1 1 3 known Originator(s), averages: 95 97 0 100 2004 3 1 Originator Announced networks HNAs: network/netmask or interface/IF (B:blocked)... Originator bestNextHop # preferred gateway: 0.0.0.0 5.217.134.125 5.217.134.125 98, gw_class 25 - 512KBit/128KBit, reliability: 0, supported tunnel types 2WT, 1WT 5.255.22.64 5.255.22.64 99, gw_class 25 - 512KBit/128KBit, reliability: 0, supported tunnel types 2WT, 1WT 5.170.251.84 5.217.134.125 88, gw_class 169 - 3MBit/768KBit, reliability: 0, supported tunnel types 2WT, 1WT Originator Announced services ip:port:seqno ... --------------- END DEBUG --------------- ------------------ DEBUG ------------------ Outstanding OGM for sending: 5.170.251.84 (seqno 57689 ttl 48) at 900886 5.217.236.96 (seqno 60295 ttl 50) at 902000 BMX 0.3-rc1 rv1636, 5.217.236.96, LWS 20, PWS 100, OGI 2000ms, UT 0:00:15:01, CPU 1.1 Neighbor viaIF Originator RTQ RQ TQ lseq lvld rid nid 5.217.134.125 ath2 5.217.134.125 99 100 99 35844 1 7 1 5.255.22.64 ath2 5.255.22.64 100 100 100 13462 1 2 2 Originator outgoingIF bestNextHop TQ(rcnt) knownSince lsqn(diff) lvld pws ~ogi cpu hop 5.170.251.84 ath2 5.217.134.125 88 94 0:00:13:25 57689 0 0 100 1985 1 2 5.217.134.125 ath2 5.217.134.125 98 99 0:00:14:59 35844 0 1 100 2026 9 1 5.255.22.64 ath2 5.255.22.64 99 100 0:00:15:00 13462 0 1 100 1973 1 1 3 known Originator(s), averages: 95 97 0 100 1994 3 1 Originator Announced networks HNAs: network/netmask or interface/IF (B:blocked)... Originator bestNextHop # preferred gateway: 0.0.0.0 5.217.134.125 5.217.134.125 98, gw_class 25 - 512KBit/128KBit, reliability: 0, supported tunnel types 2WT, 1WT 5.255.22.64 5.255.22.64 99, gw_class 25 - 512KBit/128KBit, reliability: 0, supported tunnel types 2WT, 1WT 5.170.251.84 5.217.134.125 88, gw_class 169 - 3MBit/768KBit, reliability: 0, supported tunnel types 2WT, 1WT Originator Announced services ip:port:seqno ... --------------- END DEBUG --------------- ------------------ DEBUG ------------------ Outstanding OGM for sending: 5.217.134.125 (seqno 35845 ttl 49) at 902186 5.217.236.96 (seqno 60296 ttl 50) at 904000 BMX 0.3-rc1 rv1636, 5.217.236.96, LWS 20, PWS 100, OGI 2000ms, UT 0:00:15:02, CPU 0.9 Neighbor viaIF Originator RTQ RQ TQ lseq lvld rid nid 5.217.134.125 ath2 5.217.134.125 99 100 99 35845 0 7 1 5.255.22.64 ath2 5.255.22.64 100 100 100 13463 1 2 2 Originator outgoingIF bestNextHop TQ(rcnt) knownSince lsqn(diff) lvld pws ~ogi cpu hop 5.170.251.84 ath2 5.217.134.125 88 94 0:00:13:26 57689 0 2 100 1985 1 2 5.217.134.125 ath2 5.217.134.125 98 99 0:00:15:00 35845 0 0 100 2035 3 1 5.255.22.64 ath2 5.255.22.64 99 100 0:00:15:01 13463 0 1 100 1977 1 1 3 known Originator(s), averages: 95 97 1 100 1999 1 1 Originator Announced networks HNAs: network/netmask or interface/IF (B:blocked)... Originator bestNextHop # preferred gateway: 0.0.0.0 5.217.134.125 5.217.134.125 98, gw_class 25 - 512KBit/128KBit, reliability: 0, supported tunnel types 2WT, 1WT 5.255.22.64 5.255.22.64 99, gw_class 25 - 512KBit/128KBit, reliability: 0, supported tunnel types 2WT, 1WT 5.170.251.84 5.217.134.125 88, gw_class 169 - 3MBit/768KBit, reliability: 0, supported tunnel types 2WT, 1WT Originator Announced services ip:port:seqno ... --------------- END DEBUG --------------- ------------------ DEBUG ------------------ Outstanding OGM for sending: 5.255.22.64 (seqno 13464 ttl 49) at 903665 5.217.236.96 (seqno 60296 ttl 50) at 904000 BMX 0.3-rc1 rv1636, 5.217.236.96, LWS 20, PWS 100, OGI 2000ms, UT 0:00:15:04, CPU 0.9 Neighbor viaIF Originator RTQ RQ TQ lseq lvld rid nid 5.217.134.125 ath2 5.217.134.125 99 100 99 35845 1 7 1 5.255.22.64 ath2 5.255.22.64 100 100 100 13464 0 2 2 Originator outgoingIF bestNextHop TQ(rcnt) knownSince lsqn(diff) lvld pws ~ogi cpu hop 5.170.251.84 ath2 5.217.134.125 88 95 0:00:13:28 57690 0 0 100 2018 1 2 5.217.134.125 ath2 5.217.134.125 98 99 0:00:15:02 35845 0 1 100 2035 3 1 5.255.22.64 ath2 5.255.22.64 99 100 0:00:15:03 13464 0 0 100 1970 3 1 3 known Originator(s), averages: 95 98 0 100 2007 2 1 Originator Announced networks HNAs: network/netmask or interface/IF (B:blocked)... Originator bestNextHop # preferred gateway: 0.0.0.0 5.217.134.125 5.217.134.125 98, gw_class 25 - 512KBit/128KBit, reliability: 0, supported tunnel types 2WT, 1WT 5.255.22.64 5.255.22.64 99, gw_class 25 - 512KBit/128KBit, reliability: 0, supported tunnel types 2WT, 1WT 5.170.251.84 5.217.134.125 88, gw_class 169 - 3MBit/768KBit, reliability: 0, supported tunnel types 2WT, 1WT Originator Announced services ip:port:seqno ... --------------- END DEBUG --------------- ------------------ DEBUG ------------------ Outstanding OGM for sending: 5.170.251.84 (seqno 57691 ttl 48) at 904905 5.217.236.96 (seqno 60297 ttl 50) at 906000 BMX 0.3-rc1 rv1636, 5.217.236.96, LWS 20, PWS 100, OGI 2000ms, UT 0:00:15:05, CPU 0.9 Neighbor viaIF Originator RTQ RQ TQ lseq lvld rid nid 5.217.134.125 ath2 5.217.134.125 99 100 99 35846 1 7 1 5.255.22.64 ath2 5.255.22.64 100 100 100 13464 1 2 2 Originator outgoingIF bestNextHop TQ(rcnt) knownSince lsqn(diff) lvld pws ~ogi cpu hop 5.170.251.84 ath2 5.217.134.125 88 95 0:00:13:29 57691 0 0 100 1987 1 2 5.217.134.125 ath2 5.217.134.125 98 99 0:00:15:03 35846 0 1 100 2031 3 1 5.255.22.64 ath2 5.255.22.64 99 100 0:00:15:04 13464 0 1 100 1970 3 1 3 known Originator(s), averages: 95 98 0 100 1996 2 1 Originator Announced networks HNAs: network/netmask or interface/IF (B:blocked)... Originator bestNextHop # preferred gateway: 0.0.0.0 5.217.134.125 5.217.134.125 98, gw_class 25 - 512KBit/128KBit, reliability: 0, supported tunnel types 2WT, 1WT 5.255.22.64 5.255.22.64 99, gw_class 25 - 512KBit/128KBit, reliability: 0, supported tunnel types 2WT, 1WT 5.170.251.84 5.217.134.125 88, gw_class 169 - 3MBit/768KBit, reliability: 0, supported tunnel types 2WT, 1WT Originator Announced services ip:port:seqno ... --------------- END DEBUG --------------- bmxd -cd5 Memory usage information: tag: 504, num malloc: 1, bytes per malloc: 44, total: 44 tag: 123, num malloc: 4, bytes per malloc: 10, total: 40 tag: 103, num malloc: 4, bytes per malloc: 16, total: 64 tag: 428, num malloc: 2, bytes per malloc: 20, total: 40 tag: 403, num malloc: 8, bytes per malloc: 44, total: 352 tag: 429, num malloc: 4, bytes per malloc: 8, total: 32 tag: 327, num malloc: 14, bytes per malloc: 16, total: 224 tag: 402, num malloc: 4, bytes per malloc: 104, total: 416 tag: 209, num malloc: 1, bytes per malloc: 1045, total: 1045 tag: 742, num malloc: 8, bytes per malloc: 16, total: 128 tag: 741, num malloc: 2, bytes per malloc: 24, total: 48 tag: 206, num malloc: 1, bytes per malloc: 1200, total: 1200 tag: 778, num malloc: 5, bytes per malloc: 5, total: 25 tag: 777, num malloc: 5, bytes per malloc: 24, total: 120 tag: 201, num malloc: 1, bytes per malloc: 20, total: 20 tag: 109, num malloc: 3, bytes per malloc: 16, total: 48 tag: 312, num malloc: 4, bytes per malloc: 24, total: 96 tag: 315, num malloc: 3, bytes per malloc: 12, total: 36 bmxd -cd8 BMX 0.3-rc1 rv1636, 5.217.236.96, LWS 20, PWS 100, OGI 2000ms, UT 0:00:05:19, CPU 3.0 Neighbor viaIF Originator RTQ RQ TQ lseq lvld rid nid 5.217.134.125 ath2 5.217.134.125 100 100 100 36095 0 7 2 5.255.22.64 ath2 5.255.22.64 100 100 100 13711 1 2 1 Originator outgoingIF bestNextHop TQ(rcnt) knownSince lsqn(diff) lvld pws ~ogi cpu hop 5.170.251.84 ath2 5.217.134.125 86 99 0:00:03:40 57940 0 0 100 2010 1 2 5.211.219.234 ath2 5.217.134.125 3 12 0:00:01:33 26027 0 62 100 1000 1 2 5.217.134.125 ath2 5.217.134.125 88 100 0:00:05:18 36095 0 0 100 1971 3 1 5.255.22.64 ath2 5.217.134.125 88 99 0:00:05:17 13711 0 1 100 2003 1 2 4 known Originator(s), averages: 66 77 15 100 1746 1 1 bmxd -cd10 Neighbor viaIF Originator RTQ RQ TQ lseq lvld rid nid 5.217.134.125 ath2 5.217.134.125 100 100 100 36117 0 7 2 5.255.22.64 ath2 5.255.22.64 100 100 100 13733 1 2 1 /usr/sbin/bmxd dev=ath2 -o 2000 -r 1 -d 3 [2718 0] INFO resetting muted dbg history [2718 0] INFO BatMan-eXp 0.3-rc1 rv1636 (compatibility version 10): /usr/sbin/bmxd dev=ath2 -o 2000 -r 1 -d 3 [2718 0] INFO add rule from 0.0.0.0/0 table 64 prio 6400 iif (null) type 1 [2718 0] INFO add rule from 0.0.0.0/0 table 65 prio 6401 iif (null) type 1 [2718 0] INFO add route to 127.0.0.0/8 table 65 via 0.0.0.0 dev lo ifi 0 RTN_THROW TRACK_MY_HNA [2718 0] INFO add route to 10.236.96.192/26 table 65 via 0.0.0.0 dev eth0 ifi 0 RTN_THROW TRACK_MY_HNA [2718 0] INFO add route to 10.236.96.0/25 table 65 via 0.0.0.0 dev ath0 ifi 0 RTN_THROW TRACK_MY_HNA [2718 0] INFO add route to 10.236.96.128/26 table 65 via 0.0.0.0 dev ath1 ifi 0 RTN_THROW TRACK_MY_HNA [2718 0] INFO enabled wireless dev ath2 5.217.236.96/8 brc 5.255.255.255 (use ath2 /l=1 to optimize for ethernet) [2718 186] INFO get_lndev(): creating new lndev 5.255.22.64 ath2 5.217.236.96 [2718 186] INFO found new gateway 5.255.22.64, announced by 5.255.22.64 -> class: 25 - 512KBit/128KBit, new supported tunnel types TWT, OWT [2718 1744] INFO get_lndev(): creating new lndev 5.217.134.125 ath2 5.217.236.96 [2718 1744] INFO found new gateway 5.217.134.125, announced by 5.217.134.125 -> class: 25 - 512KBit/128KBit, new supported tunnel types TWT, OWT [2718 97400] INFO change route to 5.217.134.125 via 5.217.134.125 ath2 2 / 100 (prev. via 0.0.0.0 -- 0) [2718 97846] INFO change route to 5.255.22.64 via 5.255.22.64 ath2 2 / 100 (prev. via 0.0.0.0 -- 0) [2718 99630] INFO found new gateway 5.170.251.84, announced by 5.170.251.84 -> class: 169 - 3MBit/768KBit, new supported tunnel types TWT, OWT [2718 101616] INFO change route to 5.170.251.84 via 5.255.22.64 ath2 1 / 100 (prev. via 0.0.0.0 -- 0) [2718 103160] INFO change route to 5.170.251.84 via 5.217.134.125 ath2 2 / 100 (prev. via 5.255.22.64 ath2 1) [2718 113731] INFO change route to 5.255.22.64 via 5.217.134.125 ath2 12 / 100 (prev. via 5.255.22.64 ath2 9) [2718 121286] INFO change route to 5.217.134.125 via 5.255.22.64 ath2 19 / 100 (prev. via 5.217.134.125 ath2 17) [2718 134729] INFO change route to 5.170.251.84 via 5.255.22.64 ath2 25 / 100 (prev. via 5.217.134.125 ath2 23) [2718 141059] INFO change route to 5.217.134.125 via 5.217.134.125 ath2 31 / 100 (prev. via 5.255.22.64 ath2 30) [2718 144809] INFO change route to 5.170.251.84 via 5.217.134.125 ath2 27 / 100 (prev. via 5.255.22.64 ath2 25) [2718 226464] INFO change route to 5.211.219.234 via 5.217.134.125 ath2 2 / 100 (prev. via 0.0.0.0 -- 0) [2718 226464] INFO found new gateway 5.211.219.234, announced by 5.211.219.234 -> class: 161 - 1536KBit/384KBit, new supported tunnel types TWT, OWT [2718 357780] INFO change route to 5.211.219.234 via 0.0.0.0 -- 0 / 100 (prev. via 5.217.134.125 ath2 0) [2718 357780] INFO Gateway class of originator 5.211.219.234 changed from 161 to 0, port 4306, addr 5.211.219.234, new supported tunnel types -, - [2718 357780] INFO Gateway 5.211.219.234 removed from gateway list [2718 378477] INFO change route to 5.255.22.64 via 5.255.22.64 ath2 93 / 100 (prev. via 5.217.134.125 ath2 92) *(CTRL+C pressed) ^C[2718 490754] ERROR handler(): called with signal 2 [2718 490814] WARN can't select! Waiting a moment! errno: Interrupted system call [2718 490818] INFO change route to 5.170.251.84 via 0.0.0.0 -- 0 / 100 (prev. via 5.217.134.125 ath2 0) [2718 490818] INFO Gateway class of originator 5.170.251.84 changed from 169 to 0, port 4306, addr 5.170.251.84, new supported tunnel types -, - [2718 490818] INFO Gateway 5.170.251.84 removed from gateway list [2718 490818] INFO change route to 5.217.134.125 via 0.0.0.0 -- 0 / 100 (prev. via 5.217.134.125 ath2 0) [2718 490818] INFO Gateway class of originator 5.217.134.125 changed from 25 to 0, port 4306, addr 5.217.134.125, new supported tunnel types -, - [2718 490818] INFO Gateway 5.217.134.125 removed from gateway list [2718 490818] INFO change route to 5.255.22.64 via 0.0.0.0 -- 0 / 100 (prev. via 5.255.22.64 ath2 0) [2718 490818] INFO Gateway class of originator 5.255.22.64 changed from 25 to 0, port 4306, addr 5.255.22.64, new supported tunnel types -, - [2718 490818] INFO Gateway 5.255.22.64 removed from gateway list [2718 490818] INFO deactivating plugin bmx_hna_plugin [2718 490818] INFO deactivating plugin bmx_vis_plugin [2718 490818] INFO deactivating plugin bmx_tunnel_plugin [2718 490818] INFO deactivating plugin bmx_srv_plugin [2718 490818] INFO del route to 127.0.0.0/8 table 65 via 0.0.0.0 dev (null) ifi 0 RTN_THROW TRACK_MY_HNA [2718 490818] INFO del route to 10.236.96.192/26 table 65 via 0.0.0.0 dev (null) ifi 0 RTN_THROW TRACK_MY_HNA [2718 490818] INFO del route to 10.236.96.0/25 table 65 via 0.0.0.0 dev (null) ifi 0 RTN_THROW TRACK_MY_HNA [2718 490818] INFO del route to 10.236.96.128/26 table 65 via 0.0.0.0 dev (null) ifi 0 RTN_THROW TRACK_MY_HNA [2718 490818] INFO del rule from 0.0.0.0/0 table 64 prio 6400 iif (null) type 1 [2718 490818] INFO del rule from 0.0.0.0/0 table 65 prio 6401 iif (null) type 1 [2718 490818] WARN deactivating IF ath2 5.217.236.96 -- Sebastian.Criado(a)gmail.com - GPG: 1024D/7D98DF14 37E4 246A F17B 689F 9F2D|counter.li.org: #146768 0578 B1AA 8CDB 7D98 DF14|http://www.lugro.org.ar http://noalamatricula.wordpress.com/about/ read! "Si el Universo fuera un programa estaría hecho en C, y correría sobre un sistema UNIX" Anónimo.

2 2

[B.A.T.M.A.N.] Staging: batman-adv for 2.6.35
by Sven Eckelmann 06 Jun '10

06 Jun '10

Hi, here are some patches which fixes different bugs in 2.6.35. These patches collide with patches you already have received for 2.6.36. I will resend those patches with resolved merge problems. Best regards, Sven Eckelmann drivers/staging/batman-adv/bat_sysfs.c | 24 ++++++++++++------------ drivers/staging/batman-adv/device.c | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) Dan Carpenter (1): Staging: batman-adv: return -EFAULT on copy_to_user errors Javier Martinez Canillas (1): Staging: batman-adv: fix function prototype

1 2

[B.A.T.M.A.N.] [PATCH 1/3] batman: Correct gw_speed down bit mask
by Sven Eckelmann 05 Jun '10

05 Jun '10

We want to get bits .OOOO... and not as the mask would suggest .OOOOO.. when we decode the encoded bits for the download part of the gateway speed. Reported-By: Bill Meier <wmeier(a)newsguy.com> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman/batman.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/batman/batman.c b/batman/batman.c index 4374af5..ab689b2 100644 --- a/batman/batman.c +++ b/batman/batman.c @@ -482,7 +482,7 @@ void update_gw_list(struct orig_node *orig_node, uint8_t new_gwflags, uint16_t g void get_gw_speeds(unsigned char gw_class, int *down, int *up) { char sbit = (gw_class & 0x80) >> 7; - char dpart = (gw_class & 0x7C) >> 3; + char dpart = (gw_class & 0x78) >> 3; char upart = (gw_class & 0x07); *down = 32 * (sbit + 2) * (1 << dpart); -- 1.7.1

2 4

[B.A.T.M.A.N.] [PATCH] batman-adv: return -EFAULT on copy_to_user errors
by Sven Eckelmann 05 Jun '10

05 Jun '10

From: Dan Carpenter <error27(a)gmail.com> copy_to_user() returns the number of bites remaining but we want to return a negative error code here. Signed-off-by: Dan Carpenter <error27(a)gmail.com> [sven.eckelmann(a)gmx.de: Move change from device.c to icmp_socket.c] Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- This patch is already applied in maint and must be applied in master. batman-adv-kernelland/icmp_socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/batman-adv-kernelland/icmp_socket.c b/batman-adv-kernelland/icmp_socket.c index bad87fd..08cca22 100644 --- a/batman-adv-kernelland/icmp_socket.c +++ b/batman-adv-kernelland/icmp_socket.c @@ -148,7 +148,7 @@ static ssize_t bat_socket_read(struct file *file, char __user *buf, kfree(socket_packet); if (error) - return error; + return -EFAULT; return packet_len; } -- 1.7.1

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N June 2010