linux-merge August 2015

linux-merge@lists.open-mesh.org

3 participants
82 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20150831
by batman＠open-mesh.org 31 Aug '15

31 Aug '15

The following commit has been merged in the master branch: commit 3f32f8a6874ae2515c8894588a5c60dd65ecc7e5 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Jul 26 04:59:15 2015 +0800 batman-adv: rearrange batadv_neigh_node_new() arguments to follow convention Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Acked-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 5e93af4..912d9c3 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -298,7 +298,7 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, { struct batadv_neigh_node *neigh_node; - neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr, orig_node); + neigh_node = batadv_neigh_node_new(orig_node, hard_iface, neigh_addr); if (!neigh_node) goto out; diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index d6d9809..099a84a 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -444,16 +444,17 @@ out: /** * batadv_neigh_node_new - create and init a new neigh_node object + * @orig_node: originator object representing the neighbour * @hard_iface: the interface where the neighbour is connected to * @neigh_addr: the mac address of the neighbour interface - * @orig_node: originator object representing the neighbour * * Allocates a new neigh_node object and initialises all the generic fields. * Returns the new object or NULL on failure. */ struct batadv_neigh_node * -batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, - const u8 *neigh_addr, struct batadv_orig_node *orig_node) +batadv_neigh_node_new(struct batadv_orig_node *orig_node, + struct batadv_hard_iface *hard_iface, + const u8 *neigh_addr) { struct batadv_neigh_node *neigh_node; diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index 3fc76f6..fde3438 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@ -46,8 +46,9 @@ batadv_neigh_node_get(const struct batadv_orig_node *orig_node, const struct batadv_hard_iface *hard_iface, const u8 *addr); struct batadv_neigh_node * -batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, - const u8 *neigh_addr, struct batadv_orig_node *orig_node); +batadv_neigh_node_new(struct batadv_orig_node *orig_node, + struct batadv_hard_iface *hard_iface, + const u8 *neigh_addr); void batadv_neigh_node_free_ref(struct batadv_neigh_node *neigh_node); struct batadv_neigh_node * batadv_orig_router_get(struct batadv_orig_node *orig_node, -- LinuxNextTracking

1 0

Build check errors found: 2015-08-31
by postmaster＠open-mesh.org 30 Aug '15

30 Aug '15

Name of failed tests ==================== * checkpatch master ./net/batman-adv/main.c * checkpatch next ./net/batman-adv/main.c * difference between net-next and batadv next Output of different failed tests ================================ checkpatch next ./net/batman-adv/main.c --------------------------------------- CHECK: 'wether' may be misspelled - perhaps 'whether'? #911: FILE: ./net/batman-adv/main.c:911: + * @ogm_source: flag indicating wether the tvlv is an ogm or a unicast packet CHECK: 'wether' may be misspelled - perhaps 'whether'? #964: FILE: ./net/batman-adv/main.c:964: + * @ogm_source: flag indicating wether the tvlv is an ogm or a unicast packet total: 0 errors, 0 warnings, 2 checks, 1284 lines checked difference between net-next and batadv next ------------------------------------------- net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/multicast.c | 4 ++-- net/batman-adv/network-coding.c | 2 +- net/batman-adv/translation-table.c | 5 ++++- 4 files changed, 8 insertions(+), 5 deletions(-)

1 0

Build check errors found: 2015-08-30
by postmaster＠open-mesh.org 29 Aug '15

29 Aug '15

Name of failed tests ==================== * checkpatch master ./net/batman-adv/main.c * checkpatch next ./net/batman-adv/main.c * difference between net-next and batadv next Output of different failed tests ================================ checkpatch next ./net/batman-adv/main.c --------------------------------------- CHECK: 'wether' may be misspelled - perhaps 'whether'? #911: FILE: ./net/batman-adv/main.c:911: + * @ogm_source: flag indicating wether the tvlv is an ogm or a unicast packet CHECK: 'wether' may be misspelled - perhaps 'whether'? #964: FILE: ./net/batman-adv/main.c:964: + * @ogm_source: flag indicating wether the tvlv is an ogm or a unicast packet total: 0 errors, 0 warnings, 2 checks, 1284 lines checked difference between net-next and batadv next ------------------------------------------- net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/multicast.c | 4 ++-- net/batman-adv/network-coding.c | 2 +- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/translation-table.c | 5 ++++- 5 files changed, 9 insertions(+), 6 deletions(-)

1 0

Build check errors found: 2015-08-29
by postmaster＠open-mesh.org 28 Aug '15

28 Aug '15

Name of failed tests ==================== * checkpatch master ./net/batman-adv/main.c * checkpatch next ./net/batman-adv/main.c * difference between net-next and batadv next Output of different failed tests ================================ checkpatch next ./net/batman-adv/main.c --------------------------------------- CHECK: 'wether' may be misspelled - perhaps 'whether'? #911: FILE: ./net/batman-adv/main.c:911: + * @ogm_source: flag indicating wether the tvlv is an ogm or a unicast packet CHECK: 'wether' may be misspelled - perhaps 'whether'? #964: FILE: ./net/batman-adv/main.c:964: + * @ogm_source: flag indicating wether the tvlv is an ogm or a unicast packet total: 0 errors, 0 warnings, 2 checks, 1284 lines checked difference between net-next and batadv next ------------------------------------------- net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/multicast.c | 4 ++-- net/batman-adv/network-coding.c | 2 +- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/translation-table.c | 5 ++++- 5 files changed, 9 insertions(+), 6 deletions(-)

1 0

Build check errors found: 2015-08-28
by postmaster＠open-mesh.org 27 Aug '15

27 Aug '15

Name of failed tests ==================== * checkpatch master ./net/batman-adv/main.c * checkpatch next ./net/batman-adv/main.c * difference between net-next and batadv next Output of different failed tests ================================ checkpatch next ./net/batman-adv/main.c --------------------------------------- CHECK: 'wether' may be misspelled - perhaps 'whether'? #911: FILE: ./net/batman-adv/main.c:911: + * @ogm_source: flag indicating wether the tvlv is an ogm or a unicast packet CHECK: 'wether' may be misspelled - perhaps 'whether'? #964: FILE: ./net/batman-adv/main.c:964: + * @ogm_source: flag indicating wether the tvlv is an ogm or a unicast packet total: 0 errors, 0 warnings, 2 checks, 1284 lines checked difference between net-next and batadv next ------------------------------------------- net/batman-adv/bat_iv_ogm.c | 30 +++++++- net/batman-adv/distributed-arp-table.c | 2 net/batman-adv/gateway_client.c | 50 ++++++++++--- net/batman-adv/gateway_client.h | 2 net/batman-adv/hard-interface.c | 44 ----------- net/batman-adv/main.c | 2 net/batman-adv/main.h | 2 net/batman-adv/multicast.c | 4 - net/batman-adv/network-coding.c | 2 net/batman-adv/originator.c | 90 +++++++++--------------- net/batman-adv/originator.h | 9 +- net/batman-adv/soft-interface.c | 4 - net/batman-adv/translation-table.c | 5 + net/batman-adv/types.h | 2 14 files changed, 125 insertions(+), 123 deletions(-)

1 0

Build check errors found: 2015-08-27
by postmaster＠open-mesh.org 26 Aug '15

26 Aug '15

Name of failed tests ==================== * checkpatch master ./net/batman-adv/main.c * checkpatch next ./net/batman-adv/main.c * difference between net-next and batadv next Output of different failed tests ================================ checkpatch next ./net/batman-adv/main.c --------------------------------------- CHECK: 'wether' may be misspelled - perhaps 'whether'? #911: FILE: ./net/batman-adv/main.c:911: + * @ogm_source: flag indicating wether the tvlv is an ogm or a unicast packet CHECK: 'wether' may be misspelled - perhaps 'whether'? #964: FILE: ./net/batman-adv/main.c:964: + * @ogm_source: flag indicating wether the tvlv is an ogm or a unicast packet total: 0 errors, 0 warnings, 2 checks, 1284 lines checked difference between net-next and batadv next ------------------------------------------- net/batman-adv/bat_iv_ogm.c | 30 +++++++- net/batman-adv/distributed-arp-table.c | 2 net/batman-adv/gateway_client.c | 50 ++++++++++--- net/batman-adv/gateway_client.h | 2 net/batman-adv/hard-interface.c | 44 ----------- net/batman-adv/main.c | 2 net/batman-adv/main.h | 2 net/batman-adv/multicast.c | 4 - net/batman-adv/network-coding.c | 2 net/batman-adv/originator.c | 90 +++++++++--------------- net/batman-adv/originator.h | 9 +- net/batman-adv/soft-interface.c | 4 - net/batman-adv/translation-table.c | 5 + net/batman-adv/types.h | 2 14 files changed, 125 insertions(+), 123 deletions(-)

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150826
by batman＠open-mesh.org 26 Aug '15

26 Aug '15

The following commit has been merged in the master branch: commit 87b40f534d2a266eec55a897e9a93f3b022c901d Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jul 17 10:03:42 2015 +0200 batman-adv: Fix conditional statements indentation commit 29b9256e6631 ("batman-adv: consider outgoing interface in OGM sending") incorrectly indented the interface check code. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index df54118..5c12200 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -968,7 +968,7 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) rcu_read_lock(); list_for_each_entry_rcu(tmp_hard_iface, &batadv_hardif_list, list) { if (tmp_hard_iface->soft_iface != hard_iface->soft_iface) - continue; + continue; batadv_iv_ogm_queue_add(bat_priv, *ogm_buff, *ogm_buff_len, hard_iface, tmp_hard_iface, 1, send_time); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150826
by batman＠open-mesh.org 26 Aug '15

26 Aug '15

The following commit has been merged in the master branch: commit 854d2a63de86a769db4dbed75b660f544b3c0c7a Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri Jul 17 22:25:59 2015 +0800 batman-adv: beautify supported routing algorithm list Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 50fc07b..e61c5f3 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -584,7 +584,7 @@ int batadv_algo_seq_print_text(struct seq_file *seq, void *offset) seq_puts(seq, "Available routing algorithms:\n"); hlist_for_each_entry(bat_algo_ops, &batadv_algo_list, list) { - seq_printf(seq, "%s\n", bat_algo_ops->name); + seq_printf(seq, " * %s\n", bat_algo_ops->name); } return 0; -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150826
by batman＠open-mesh.org 26 Aug '15

26 Aug '15

The following commit has been merged in the master branch: commit 0b8336f5fc26f263821534d7a9a3633748692207 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jun 21 19:40:09 2015 +0200 batman-adv: Fix gw_bandwidth calculation on 32 bit systems The TVLV for the gw_bandwidth stores everything as u32. But the gw_bandwidth reads the signed long which limits the maximum value to (2 ** 31 - 1) on systems with 4 byte long. Also the input value is always converted from either Mibit/s or Kibit/s to 100Kibit/s. This reduces the values even further when the user sets it via the default unit Kibit/s. It may even cause an integer overflow and end up with a value the user never intended. Instead read the values as u64, check for possible overflows, do the unit adjustments and then reduce the size to u32. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index 6b930a6..0cb5e6b 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -22,6 +22,7 @@ #include <linux/errno.h> #include <linux/byteorder/generic.h> #include <linux/kernel.h> +#include <linux/math64.h> #include <linux/netdevice.h> #include <linux/stddef.h> #include <linux/string.h> @@ -44,7 +45,7 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, { enum batadv_bandwidth_units bw_unit_type = BATADV_BW_UNIT_KBIT; char *slash_ptr, *tmp_ptr; - long ldown, lup; + u64 ldown, lup; int ret; slash_ptr = strchr(buff, '/'); @@ -62,7 +63,7 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, *tmp_ptr = '\0'; } - ret = kstrtol(buff, 10, &ldown); + ret = kstrtou64(buff, 10, &ldown); if (ret) { batadv_err(net_dev, "Download speed of gateway mode invalid: %s\n", @@ -72,14 +73,31 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, switch (bw_unit_type) { case BATADV_BW_UNIT_MBIT: - *down = ldown * 10; + /* prevent overflow */ + if (U64_MAX / 10 < ldown) { + batadv_err(net_dev, + "Download speed of gateway mode too large: %s\n", + buff); + return false; + } + + ldown *= 10; break; case BATADV_BW_UNIT_KBIT: default: - *down = ldown / 100; + ldown = div_u64(ldown, 100); break; } + if (U32_MAX < ldown) { + batadv_err(net_dev, + "Download speed of gateway mode too large: %s\n", + buff); + return false; + } + + *down = ldown; + /* we also got some upload info */ if (slash_ptr) { bw_unit_type = BATADV_BW_UNIT_KBIT; @@ -95,7 +113,7 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, *tmp_ptr = '\0'; } - ret = kstrtol(slash_ptr + 1, 10, &lup); + ret = kstrtou64(slash_ptr + 1, 10, &lup); if (ret) { batadv_err(net_dev, "Upload speed of gateway mode invalid: %s\n", @@ -105,13 +123,30 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, switch (bw_unit_type) { case BATADV_BW_UNIT_MBIT: - *up = lup * 10; + /* prevent overflow */ + if (U64_MAX / 10 < lup) { + batadv_err(net_dev, + "Upload speed of gateway mode too large: %s\n", + slash_ptr + 1); + return false; + } + + lup *= 10; break; case BATADV_BW_UNIT_KBIT: default: - *up = lup / 100; + lup = div_u64(lup, 100); break; } + + if (U32_MAX < lup) { + batadv_err(net_dev, + "Upload speed of gateway mode too large: %s\n", + slash_ptr + 1); + return false; + } + + *up = lup; } return true; -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150826
by batman＠open-mesh.org 26 Aug '15

26 Aug '15

The following commit has been merged in the master branch: commit 7c26a53ba5e7e4bf2be3cb93f2fffaefccff2e3b Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Jun 28 22:16:06 2015 +0800 batman-adv: convert bat_priv->tt.req_list to hlist Since the list's tail is never accessed using a double linked list head wastes memory. Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 40750cb..d277ba7 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -148,7 +148,7 @@ int batadv_mesh_init(struct net_device *soft_iface) INIT_HLIST_HEAD(&bat_priv->mcast.want_all_ipv6_list); #endif INIT_LIST_HEAD(&bat_priv->tt.changes_list); - INIT_LIST_HEAD(&bat_priv->tt.req_list); + INIT_HLIST_HEAD(&bat_priv->tt.req_list); INIT_LIST_HEAD(&bat_priv->tt.roam_list); #ifdef CONFIG_BATMAN_ADV_MCAST INIT_HLIST_HEAD(&bat_priv->mcast.mla_list); diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 596e326..734b456 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -2224,12 +2224,13 @@ static u32 batadv_tt_local_crc(struct batadv_priv *bat_priv, static void batadv_tt_req_list_free(struct batadv_priv *bat_priv) { - struct batadv_tt_req_node *node, *safe; + struct batadv_tt_req_node *node; + struct hlist_node *safe; spin_lock_bh(&bat_priv->tt.req_list_lock); - list_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) { - list_del_init(&node->list); + hlist_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) { + hlist_del_init(&node->list); kfree(node); } @@ -2259,13 +2260,14 @@ static void batadv_tt_save_orig_buffer(struct batadv_priv *bat_priv, static void batadv_tt_req_purge(struct batadv_priv *bat_priv) { - struct batadv_tt_req_node *node, *safe; + struct batadv_tt_req_node *node; + struct hlist_node *safe; spin_lock_bh(&bat_priv->tt.req_list_lock); - list_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) { + hlist_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) { if (batadv_has_timed_out(node->issued_at, BATADV_TT_REQUEST_TIMEOUT)) { - list_del_init(&node->list); + hlist_del_init(&node->list); kfree(node); } } @@ -2287,7 +2289,7 @@ batadv_tt_req_node_new(struct batadv_priv *bat_priv, struct batadv_tt_req_node *tt_req_node_tmp, *tt_req_node = NULL; spin_lock_bh(&bat_priv->tt.req_list_lock); - list_for_each_entry(tt_req_node_tmp, &bat_priv->tt.req_list, list) { + hlist_for_each_entry(tt_req_node_tmp, &bat_priv->tt.req_list, list) { if (batadv_compare_eth(tt_req_node_tmp, orig_node) && !batadv_has_timed_out(tt_req_node_tmp->issued_at, BATADV_TT_REQUEST_TIMEOUT)) @@ -2301,7 +2303,7 @@ batadv_tt_req_node_new(struct batadv_priv *bat_priv, ether_addr_copy(tt_req_node->addr, orig_node->orig); tt_req_node->issued_at = jiffies; - list_add(&tt_req_node->list, &bat_priv->tt.req_list); + hlist_add_head(&tt_req_node->list, &bat_priv->tt.req_list); unlock: spin_unlock_bh(&bat_priv->tt.req_list_lock); return tt_req_node; @@ -2552,8 +2554,8 @@ out: batadv_hardif_free_ref(primary_if); if (ret && tt_req_node) { spin_lock_bh(&bat_priv->tt.req_list_lock); - /* list_del_init() verifies tt_req_node still is in the list */ - list_del_init(&tt_req_node->list); + /* hlist_del_init() verifies tt_req_node still is in the list */ + hlist_del_init(&tt_req_node->list); spin_unlock_bh(&bat_priv->tt.req_list_lock); kfree(tt_req_node); } @@ -2949,7 +2951,8 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv, struct batadv_tvlv_tt_data *tt_data, u8 *resp_src, u16 num_entries) { - struct batadv_tt_req_node *node, *safe; + struct batadv_tt_req_node *node; + struct hlist_node *safe; struct batadv_orig_node *orig_node = NULL; struct batadv_tvlv_tt_change *tt_change; u8 *tvlv_ptr = (u8 *)tt_data; @@ -2987,10 +2990,10 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv, /* Delete the tt_req_node from pending tt_requests list */ spin_lock_bh(&bat_priv->tt.req_list_lock); - list_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) { + hlist_for_each_entry_safe(node, safe, &bat_priv->tt.req_list, list) { if (!batadv_compare_eth(node->addr, resp_src)) continue; - list_del_init(&node->list); + hlist_del_init(&node->list); kfree(node); } diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index fe3695c..2f5e6c3 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -537,7 +537,7 @@ struct batadv_priv_tt { struct list_head changes_list; struct batadv_hashtable *local_hash; struct batadv_hashtable *global_hash; - struct list_head req_list; + struct hlist_head req_list; struct list_head roam_list; spinlock_t changes_list_lock; /* protects changes */ spinlock_t req_list_lock; /* protects req_list */ @@ -1006,7 +1006,7 @@ struct batadv_tt_change_node { struct batadv_tt_req_node { u8 addr[ETH_ALEN]; unsigned long issued_at; - struct list_head list; + struct hlist_node list; }; /** -- LinuxNextTracking

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge August 2015