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 <[email protected]> Signed-off-by: Antonio Quartulli <[email protected]> --- v2, v3, v4: - no change to this patch v4: - added compat code compat.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ compat.h | 5 ++++- hard-interface.c | 43 ------------------------------------------- 3 files changed, 57 insertions(+), 44 deletions(-) diff --git a/compat.c b/compat.c index 764878f..da63ea6 100644 --- a/compat.c +++ b/compat.c @@ -24,6 +24,7 @@ #include <linux/in.h> #include <linux/version.h> #include "main.h" +#include "soft-interface.h" #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) @@ -85,3 +86,55 @@ void batadv_free_rcu_nc_path(struct rcu_head *rcu) #endif #endif /* < KERNEL_VERSION(3, 0, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) + +/** + * 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; +} + +int batadv_netdev_set_master(struct net_device *slave, + struct net_device *master) +{ + if (batadv_is_on_batman_iface(slave)) + return -1; + + return netdev_set_master(slave, master); +} + +#endif /* < KERNEL_VERSION(3, 9, 0) */ diff --git a/compat.h b/compat.h index 69c3dc2..79d4217 100644 --- a/compat.h +++ b/compat.h @@ -229,7 +229,10 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) \ }\ static int __batadv_interface_set_mac_addr(x, y) -#define netdev_master_upper_dev_link netdev_set_master +int batadv_netdev_set_master(struct net_device *slave, + struct net_device *master); + +#define netdev_master_upper_dev_link batadv_netdev_set_master #define netdev_upper_dev_unlink(slave, master) netdev_set_master(slave, NULL) #define netdev_master_upper_dev_get(dev) \ ({\ 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.8.1.4
