commits March 2013

commits@lists.open-mesh.org

1 participants
73 discussions

[batman-adv] master: batman-adv: change compat code to remove sparse warning (2caa9e1)
by postmaster＠open-mesh.org 01 Mar '13

01 Mar '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 2caa9e1a656f825d24a2517383bf30877753be40 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Thu Feb 28 12:08:47 2013 +0100 batman-adv: change compat code to remove sparse warning The latest compat patch fixing rtnl ops compile errors from 2.6.32 ("batman-adv: add compat support for the new netlink ops") fixes the compilation, but leaves some sparse errors: batman-adv/soft-interface.c:573:10: warning: Initializer entry defined twice batman-adv/soft-interface.c:574:10: also defined here This patch uses another approach by moving the initializers in a dummy struct instead. This also removes the sparse errors. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Antonio Quartulli <ordex(a)autistici.org> >--------------------------------------------------------------- 2caa9e1a656f825d24a2517383bf30877753be40 compat.h | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/compat.h b/compat.h index 64244ac..69c3dc2 100644 --- a/compat.h +++ b/compat.h @@ -135,23 +135,19 @@ static inline int batadv_param_set_copystring(const char *val, #define kstrtoul strict_strtoul #define kstrtol strict_strtol -#define batadv_softif_slave_add(x, y) \ -batadv_softif_slave_add(struct net_device *dev, struct ifreq *rq, int cmd)\ -{\ - return -EOPNOTSUPP;\ -}\ -static int __attribute__((unused)) __batadv_softif_slave_add(x, y) - -#define batadv_softif_slave_del(x, y) \ -__batadv_softif_slave_del(struct net_device *dev, struct net_device *slave_dev);\ -static int batadv_softif_slave_del(struct net_device *dev, struct ifreq *rq, int cmd)\ -{\ - return -EOPNOTSUPP;\ -}\ -static int __attribute__((unused)) __batadv_softif_slave_del(x, y) - -#define ndo_add_slave ndo_do_ioctl -#define ndo_del_slave ndo_do_ioctl +/* Hack for removing ndo_add/del_slave at the end of net_device_ops. + * This is somewhat ugly because it requires that ndo_validate_addr + * is at the end of this struct in soft-interface.c. + */ +#define ndo_validate_addr \ + ndo_validate_addr = eth_validate_addr, \ +}; \ +static const struct { \ + void *ndo_validate_addr; \ + void *ndo_add_slave; \ + void *ndo_del_slave; \ +} __attribute__((unused)) __useless_ops1 = { \ + .ndo_validate_addr #endif /* < KERNEL_VERSION(2, 6, 39) */

1 0

[batman-adv] master: batman-adv: change compat code to remove sparse warning (1ad46c9)
by postmaster＠open-mesh.org 01 Mar '13

01 Mar '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 1ad46c99623b89a1aa2140e5e588e1a354f024f1 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Thu Feb 28 12:08:47 2013 +0100 batman-adv: change compat code to remove sparse warning The latest compat patch fixing rtnl ops compile errors from 2.6.32 ("batman-adv: add compat support for the new netlink ops") fixes the compilation, but leaves some sparse errors: batman-adv/soft-interface.c:573:10: warning: Initializer entry defined twice batman-adv/soft-interface.c:574:10: also defined here This patch uses another approach by moving the initializers in a dummy struct instead. This also removes the sparse errors. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Antonio Quartulli <ordex(a)autistici.org> >--------------------------------------------------------------- 1ad46c99623b89a1aa2140e5e588e1a354f024f1 compat.h | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/compat.h b/compat.h index 64244ac..69c3dc2 100644 --- a/compat.h +++ b/compat.h @@ -135,23 +135,19 @@ static inline int batadv_param_set_copystring(const char *val, #define kstrtoul strict_strtoul #define kstrtol strict_strtol -#define batadv_softif_slave_add(x, y) \ -batadv_softif_slave_add(struct net_device *dev, struct ifreq *rq, int cmd)\ -{\ - return -EOPNOTSUPP;\ -}\ -static int __attribute__((unused)) __batadv_softif_slave_add(x, y) - -#define batadv_softif_slave_del(x, y) \ -__batadv_softif_slave_del(struct net_device *dev, struct net_device *slave_dev);\ -static int batadv_softif_slave_del(struct net_device *dev, struct ifreq *rq, int cmd)\ -{\ - return -EOPNOTSUPP;\ -}\ -static int __attribute__((unused)) __batadv_softif_slave_del(x, y) - -#define ndo_add_slave ndo_do_ioctl -#define ndo_del_slave ndo_do_ioctl +/* Hack for removing ndo_add/del_slave at the end of net_device_ops. + * This is somewhat ugly because it requires that ndo_validate_addr + * is at the end of this struct in soft-interface.c. + */ +#define ndo_validate_addr \ + ndo_validate_addr = eth_validate_addr, \ +}; \ +static const struct { \ + void *ndo_validate_addr; \ + void *ndo_add_slave; \ + void *ndo_del_slave; \ +} __attribute__((unused)) __useless_ops1 = { \ + .ndo_validate_addr #endif /* < KERNEL_VERSION(2, 6, 39) */

1 0

[batman-adv] master: batman-adv: remove interfacing enslaving loop private check (a3012c6)
by postmaster＠open-mesh.org 01 Mar '13

01 Mar '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit a3012c6733872fd6f3f6d105a61d1908ca456b23 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sat Feb 16 14:42:40 2013 +0100 batman-adv: remove interfacing enslaving loop private check Now that the new dev_upper API is used, the private check for enslaving loops is not needed anymore as this is performed by the new API itself. Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- a3012c6733872fd6f3f6d105a61d1908ca456b23 hard-interface.c | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/hard-interface.c b/hard-interface.c index fd99e42..b96f819 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -60,45 +60,6 @@ out: return hard_iface; } -/** - * batadv_is_on_batman_iface - check if a device is a batman iface descendant - * @net_dev: the device to check - * - * If the user creates any virtual device on top of a batman-adv interface, it - * is important to prevent this new interface to be used to create a new mesh - * network (this behaviour would lead to a batman-over-batman configuration). - * This function recursively checks all the fathers of the device passed as - * argument looking for a batman-adv soft interface. - * - * Returns true if the device is descendant of a batman-adv mesh interface (or - * if it is a batman-adv interface itself), false otherwise - */ -static bool batadv_is_on_batman_iface(const struct net_device *net_dev) -{ - struct net_device *parent_dev; - bool ret; - - /* check if this is a batman-adv mesh interface */ - if (batadv_softif_is_valid(net_dev)) - return true; - - /* no more parents..stop recursion */ - if (net_dev->iflink == net_dev->ifindex) - return false; - - /* recurse over the parent device */ - parent_dev = dev_get_by_index(&init_net, net_dev->iflink); - /* if we got a NULL parent_dev there is something broken.. */ - if (WARN(!parent_dev, "Cannot find parent device")) - return false; - - ret = batadv_is_on_batman_iface(parent_dev); - - if (parent_dev) - dev_put(parent_dev); - return ret; -} - static int batadv_is_valid_iface(const struct net_device *net_dev) { if (net_dev->flags & IFF_LOOPBACK) @@ -110,10 +71,6 @@ static int batadv_is_valid_iface(const struct net_device *net_dev) if (net_dev->addr_len != ETH_ALEN) return 0; - /* no batman over batman */ - if (batadv_is_on_batman_iface(net_dev)) - return 0; - return 1; }

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2013