linux-merge

linux-merge@lists.open-mesh.org

2 participants
7457 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20130402
by batman＠open-mesh.org 02 Apr '13

02 Apr '13

The following commit has been merged in the master branch: commit 9cb812c54e7fe4a1485c92430dc1fc289dd221dd Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Mar 13 23:02:28 2013 +0100 batman-adv: update Makefile copyright years Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile index 4b8f192..acbac2a 100644 --- a/net/batman-adv/Makefile +++ b/net/batman-adv/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +# Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: # # Marek Lindner, Simon Wunderlich # -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20130402
by batman＠open-mesh.org 02 Apr '13

02 Apr '13

The following commit has been merged in the master branch: commit cb4b0d48645fa29bc0e12537d4e3556c4bf79ac7 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sat Feb 16 14:42:39 2013 +0100 batman-adv: free an hard-interface before adding it When adding a new hard interface (e.g. wlan0) to a soft interface (e.g. bat0) and the former is already enslaved in another virtual interface (e.g. a software bridge) batman-adv has to free it first and then continue with the adding mechanism. In this way the behaviour becomes consistent with what "ip link set master" does. At the moment batman-adv enslaves the hard interface without checking for the master device, possibly causing strange behaviours which are never wanted by the users. 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> diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index f33ced8..522243a 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -307,11 +307,35 @@ batadv_hardif_deactivate_interface(struct batadv_hard_iface *hard_iface) batadv_update_min_mtu(hard_iface->soft_iface); } +/** + * batadv_master_del_slave - remove hard_iface from the current master interface + * @slave: the interface enslaved in another master + * @master: the master from which slave has to be removed + * + * Invoke ndo_del_slave on master passing slave as argument. In this way slave + * is free'd and master can correctly change its internal state. + * Return 0 on success, a negative value representing the error otherwise + */ +static int batadv_master_del_slave(struct batadv_hard_iface *slave, + struct net_device *master) +{ + int ret; + + if (!master) + return 0; + + ret = -EBUSY; + if (master->netdev_ops->ndo_del_slave) + ret = master->netdev_ops->ndo_del_slave(master, slave->net_dev); + + return ret; +} + int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, const char *iface_name) { struct batadv_priv *bat_priv; - struct net_device *soft_iface; + struct net_device *soft_iface, *master; __be16 ethertype = __constant_htons(ETH_P_BATMAN); int ret; @@ -321,11 +345,6 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, if (!atomic_inc_not_zero(&hard_iface->refcount)) goto out; - /* hard-interface is part of a bridge */ - if (hard_iface->net_dev->priv_flags & IFF_BRIDGE_PORT) - pr_err("You are about to enable batman-adv on '%s' which already is part of a bridge. Unless you know exactly what you are doing this is probably wrong and won't work the way you think it would.\n", - hard_iface->net_dev->name); - soft_iface = dev_get_by_name(&init_net, iface_name); if (!soft_iface) { @@ -347,6 +366,14 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, goto err_dev; } + /* check if the interface is enslaved in another virtual one and + * in that case unlink it first + */ + master = netdev_master_upper_dev_get(hard_iface->net_dev); + ret = batadv_master_del_slave(hard_iface, master); + if (ret) + goto err_dev; + hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20130402
by batman＠open-mesh.org 02 Apr '13

02 Apr '13

The following commit has been merged in the master branch: commit 3dbd550b8b2e204833d8305451bbde990e1cd743 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Feb 11 17:10:27 2013 +0800 batman-adv: Allow to modify slaves of soft-interfaces through rntl_link The sysfs configuration interface of batman-adv to add/remove slaves of an soft-iface is not deadlock free and doesn't follow the currently common way to modify slaves of an interface. An additional configuration interface though rtnl_link is introduced which provides easy device adding/removing with tools like "ip": $ ip link set dev eth0 master bat0 $ ip link set dev eth0 nomaster Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 6c32607..f33ced8 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -350,9 +350,13 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface); + ret = netdev_master_upper_dev_link(hard_iface->net_dev, soft_iface); + if (ret) + goto err_dev; + ret = bat_priv->bat_algo_ops->bat_iface_enable(hard_iface); if (ret < 0) - goto err_dev; + goto err_upper; hard_iface->if_num = bat_priv->num_ifaces; bat_priv->num_ifaces++; @@ -362,7 +366,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, bat_priv->bat_algo_ops->bat_iface_disable(hard_iface); bat_priv->num_ifaces--; hard_iface->if_status = BATADV_IF_NOT_IN_USE; - goto err_dev; + goto err_upper; } hard_iface->batman_adv_ptype.type = ethertype; @@ -401,7 +405,10 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, out: return 0; +err_upper: + netdev_upper_dev_unlink(hard_iface->net_dev, soft_iface); err_dev: + hard_iface->soft_iface = NULL; dev_put(soft_iface); err: batadv_hardif_free_ref(hard_iface); @@ -450,6 +457,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, if (!bat_priv->num_ifaces && autodel == BATADV_IF_CLEANUP_AUTO) batadv_softif_destroy_sysfs(hard_iface->soft_iface); + netdev_upper_dev_unlink(hard_iface->net_dev, hard_iface->soft_iface); hard_iface->soft_iface = NULL; batadv_hardif_free_ref(hard_iface); diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 545c863..403b8c4 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -509,6 +509,58 @@ free_bat_counters: return ret; } +/** + * batadv_softif_slave_add - Add a slave interface to a batadv_soft_interface + * @dev: batadv_soft_interface used as master interface + * @slave_dev: net_device which should become the slave interface + * + * Return 0 if successful or error otherwise. + */ +static int batadv_softif_slave_add(struct net_device *dev, + struct net_device *slave_dev) +{ + struct batadv_hard_iface *hard_iface; + int ret = -EINVAL; + + hard_iface = batadv_hardif_get_by_netdev(slave_dev); + if (!hard_iface || hard_iface->soft_iface != NULL) + goto out; + + ret = batadv_hardif_enable_interface(hard_iface, dev->name); + +out: + if (hard_iface) + batadv_hardif_free_ref(hard_iface); + return ret; +} + +/** + * batadv_softif_slave_del - Delete a slave iface from a batadv_soft_interface + * @dev: batadv_soft_interface used as master interface + * @slave_dev: net_device which should be removed from the master interface + * + * Return 0 if successful or error otherwise. + */ +static int batadv_softif_slave_del(struct net_device *dev, + struct net_device *slave_dev) +{ + struct batadv_hard_iface *hard_iface; + int ret = -EINVAL; + + hard_iface = batadv_hardif_get_by_netdev(slave_dev); + + if (!hard_iface || hard_iface->soft_iface != dev) + goto out; + + batadv_hardif_disable_interface(hard_iface, BATADV_IF_CLEANUP_KEEP); + ret = 0; + +out: + if (hard_iface) + batadv_hardif_free_ref(hard_iface); + return ret; +} + static const struct net_device_ops batadv_netdev_ops = { .ndo_init = batadv_softif_init_late, .ndo_open = batadv_interface_open, @@ -517,7 +569,9 @@ static const struct net_device_ops batadv_netdev_ops = { .ndo_set_mac_address = batadv_interface_set_mac_addr, .ndo_change_mtu = batadv_interface_change_mtu, .ndo_start_xmit = batadv_interface_tx, - .ndo_validate_addr = eth_validate_addr + .ndo_validate_addr = eth_validate_addr, + .ndo_add_slave = batadv_softif_slave_add, + .ndo_del_slave = batadv_softif_slave_del, }; /** -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20130402
by batman＠open-mesh.org 02 Apr '13

02 Apr '13

The following commit has been merged in the master branch: commit a15fd3612dd95341ad190def7faceebb41d6e346 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Feb 11 17:10:24 2013 +0800 batman-adv: Don't always delete softif when last slave was removed batman-adv has an unusual way to manage softinterfaces. These will be created automatically when a user writes to the batman-adv/mesh_iface file in sysfs and removed when no slave device exists anymore. This behaviour cannot be changed without breaking compatibility with existing code. Instead other interfaces should be able to slightly reduce this behaviour and provide a more common reaction to a removal of a slave interface. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index da000e9..74e3ec2f 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -408,7 +408,8 @@ err: return ret; } -void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface) +void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, + enum batadv_hard_if_cleanup autodel) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct batadv_hard_iface *primary_if = NULL; @@ -446,7 +447,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface) dev_put(hard_iface->soft_iface); /* nobody uses this interface anymore */ - if (!bat_priv->num_ifaces) + if (!bat_priv->num_ifaces && autodel == BATADV_IF_CLEANUP_AUTO) batadv_softif_destroy(hard_iface->soft_iface); hard_iface->soft_iface = NULL; @@ -533,7 +534,8 @@ static void batadv_hardif_remove_interface(struct batadv_hard_iface *hard_iface) /* first deactivate interface */ if (hard_iface->if_status != BATADV_IF_NOT_IN_USE) - batadv_hardif_disable_interface(hard_iface); + batadv_hardif_disable_interface(hard_iface, + BATADV_IF_CLEANUP_AUTO); if (hard_iface->if_status != BATADV_IF_NOT_IN_USE) return; diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h index 308437d..4989288 100644 --- a/net/batman-adv/hard-interface.h +++ b/net/batman-adv/hard-interface.h @@ -29,13 +29,24 @@ enum batadv_hard_if_state { BATADV_IF_I_WANT_YOU, }; +/** + * enum batadv_hard_if_cleanup - Cleanup modi for soft_iface after slave removal + * @BATADV_IF_CLEANUP_KEEP: Don't automatically delete soft-interface + * @BATADV_IF_CLEANUP_AUTO: Delete soft-interface after last slave was removed + */ +enum batadv_hard_if_cleanup { + BATADV_IF_CLEANUP_KEEP, + BATADV_IF_CLEANUP_AUTO, +}; + extern struct notifier_block batadv_hard_if_notifier; struct batadv_hard_iface* batadv_hardif_get_by_netdev(const struct net_device *net_dev); int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, const char *iface_name); -void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface); +void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, + enum batadv_hard_if_cleanup autodel); void batadv_hardif_remove_interfaces(void); int batadv_hardif_min_mtu(struct net_device *soft_iface); void batadv_update_min_mtu(struct net_device *soft_iface); diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index ce39f62..15a22ef 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -588,13 +588,15 @@ static ssize_t batadv_store_mesh_iface(struct kobject *kobj, } if (status_tmp == BATADV_IF_NOT_IN_USE) { - batadv_hardif_disable_interface(hard_iface); + batadv_hardif_disable_interface(hard_iface, + BATADV_IF_CLEANUP_AUTO); goto unlock; } /* if the interface already is in use */ if (hard_iface->if_status != BATADV_IF_NOT_IN_USE) - batadv_hardif_disable_interface(hard_iface); + batadv_hardif_disable_interface(hard_iface, + BATADV_IF_CLEANUP_AUTO); ret = batadv_hardif_enable_interface(hard_iface, buff); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20130402
by batman＠open-mesh.org 02 Apr '13

02 Apr '13

The following commit has been merged in the master branch: commit a4ac28c0d06a1c22138225a228d3a4eaffe9dd77 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Feb 11 17:10:26 2013 +0800 batman-adv: Allow to use rntl_link for device creation/deletion The sysfs configuration interface of batman-adv to add/remove soft-interfaces is not deadlock free and doesn't follow the currently common way to create new virtual interfaces. An additional interface though rtnl_link is introduced which provides easy device creation/deletion with tools like "ip": $ ip link add dev bat0 type batadv $ ip link del dev bat0 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 0495a7d..62b1f89 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -71,6 +71,7 @@ static int __init batadv_init(void) batadv_debugfs_init(); register_netdevice_notifier(&batadv_hard_if_notifier); + rtnl_link_register(&batadv_link_ops); pr_info("B.A.T.M.A.N. advanced %s (compatibility version %i) loaded\n", BATADV_SOURCE_VERSION, BATADV_COMPAT_VERSION); @@ -81,6 +82,7 @@ static int __init batadv_init(void) static void __exit batadv_exit(void) { batadv_debugfs_destroy(); + rtnl_link_unregister(&batadv_link_ops); unregister_netdevice_notifier(&batadv_hard_if_notifier); batadv_hardif_remove_interfaces(); diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 0afd4ee..a9e12e6 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -152,6 +152,7 @@ enum batadv_uev_type { #include <linux/percpu.h> #include <linux/slab.h> #include <net/sock.h> /* struct sock */ +#include <net/rtnetlink.h> #include <linux/jiffies.h> #include <linux/seq_file.h> #include "types.h" diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index bc77a5be..545c863 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -570,6 +570,8 @@ struct net_device *batadv_softif_create(const char *name) if (!soft_iface) return NULL; + soft_iface->rtnl_link_ops = &batadv_link_ops; + ret = register_netdevice(soft_iface); if (ret < 0) { pr_err("Unable to register the batman interface '%s': %i\n", @@ -592,6 +594,26 @@ void batadv_softif_destroy_sysfs(struct net_device *soft_iface) queue_work(batadv_event_workqueue, &bat_priv->cleanup_work); } +/** + * batadv_softif_destroy_netlink - deletion of batadv_soft_interface via netlink + * @soft_iface: the to-be-removed batman-adv interface + * @head: list pointer + */ +static void batadv_softif_destroy_netlink(struct net_device *soft_iface, + struct list_head *head) +{ + struct batadv_hard_iface *hard_iface; + + list_for_each_entry(hard_iface, &batadv_hardif_list, list) { + if (hard_iface->soft_iface == soft_iface) + batadv_hardif_disable_interface(hard_iface, + BATADV_IF_CLEANUP_KEEP); + } + + batadv_sysfs_del_meshif(soft_iface); + unregister_netdevice_queue(soft_iface, head); +} + int batadv_softif_is_valid(const struct net_device *net_dev) { if (net_dev->netdev_ops->ndo_start_xmit == batadv_interface_tx) @@ -600,6 +622,13 @@ int batadv_softif_is_valid(const struct net_device *net_dev) return 0; } +struct rtnl_link_ops batadv_link_ops __read_mostly = { + .kind = "batadv", + .priv_size = sizeof(struct batadv_priv), + .setup = batadv_softif_init_early, + .dellink = batadv_softif_destroy_netlink, +}; + /* ethtool */ static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) { diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 49bc66b..2f2472c 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -27,5 +27,6 @@ void batadv_interface_rx(struct net_device *soft_iface, struct net_device *batadv_softif_create(const char *name); void batadv_softif_destroy_sysfs(struct net_device *soft_iface); int batadv_softif_is_valid(const struct net_device *net_dev); +extern struct rtnl_link_ops batadv_link_ops; #endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */ -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20130402
by batman＠open-mesh.org 02 Apr '13

02 Apr '13

The following commit has been merged in the master branch: commit e07932ae6fb74ef707b2b27762fb0ad8aea4b55f Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Feb 11 17:10:25 2013 +0800 batman-adv: rename batadv_softif_destroy to reflect sysfs use case Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> CC: Sven Eckelmann <sven(a)narfation.org> Acked-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 74e3ec2f..6c32607 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -448,7 +448,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, /* nobody uses this interface anymore */ if (!bat_priv->num_ifaces && autodel == BATADV_IF_CLEANUP_AUTO) - batadv_softif_destroy(hard_iface->soft_iface); + batadv_softif_destroy_sysfs(hard_iface->soft_iface); hard_iface->soft_iface = NULL; batadv_hardif_free_ref(hard_iface); diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index e889bfb..bc77a5be 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -581,7 +581,11 @@ struct net_device *batadv_softif_create(const char *name) return soft_iface; } -void batadv_softif_destroy(struct net_device *soft_iface) +/** + * batadv_softif_destroy_sysfs - deletion of batadv_soft_interface via sysfs + * @soft_iface: the to-be-removed batman-adv interface + */ +void batadv_softif_destroy_sysfs(struct net_device *soft_iface) { struct batadv_priv *bat_priv = netdev_priv(soft_iface); diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 43182e5..49bc66b 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -25,7 +25,7 @@ void batadv_interface_rx(struct net_device *soft_iface, struct sk_buff *skb, struct batadv_hard_iface *recv_if, int hdr_size, struct batadv_orig_node *orig_node); struct net_device *batadv_softif_create(const char *name); -void batadv_softif_destroy(struct net_device *soft_iface); +void batadv_softif_destroy_sysfs(struct net_device *soft_iface); int batadv_softif_is_valid(const struct net_device *net_dev); #endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */ -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20130402
by batman＠open-mesh.org 02 Apr '13

02 Apr '13

The following commit has been merged in the master branch: commit b3246020e27ecc7c50cc77535936987d6eb6c869 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Feb 11 17:10:23 2013 +0800 batman-adv: Move deinitialization of soft-interface to destructor The deinitialization of the soft-interface created in ndo_init/constructor should be done in the destructor and not directly before calling unregister_netdevice Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index c5cb0a7..e889bfb 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -417,7 +417,6 @@ static void batadv_softif_destroy_finish(struct work_struct *work) cleanup_work); soft_iface = bat_priv->soft_iface; - batadv_debugfs_del_meshif(soft_iface); batadv_sysfs_del_meshif(soft_iface); rtnl_lock(); @@ -522,6 +521,17 @@ static const struct net_device_ops batadv_netdev_ops = { }; /** + * batadv_softif_free - Deconstructor of batadv_soft_interface + * @dev: Device to cleanup and remove + */ +static void batadv_softif_free(struct net_device *dev) +{ + batadv_debugfs_del_meshif(dev); + batadv_mesh_free(dev); + free_netdev(dev); +} + +/** * batadv_softif_init_early - early stage initialization of soft interface * @dev: registered network device to modify */ @@ -532,7 +542,7 @@ static void batadv_softif_init_early(struct net_device *dev) ether_setup(dev); dev->netdev_ops = &batadv_netdev_ops; - dev->destructor = free_netdev; + dev->destructor = batadv_softif_free; dev->tx_queue_len = 0; /* can't call min_mtu, because the needed variables @@ -575,7 +585,6 @@ void batadv_softif_destroy(struct net_device *soft_iface) { struct batadv_priv *bat_priv = netdev_priv(soft_iface); - batadv_mesh_free(soft_iface); queue_work(batadv_event_workqueue, &bat_priv->cleanup_work); } -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20130402
by batman＠open-mesh.org 02 Apr '13

02 Apr '13

The following commit has been merged in the master branch: commit 37130293fd50918c5498bafafd18735a24229cb9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Feb 11 17:10:22 2013 +0800 batman-adv: Move soft-interface initialization to ndo_init The initialization of an net_device object should be done in the init/constructor function and not from the outside after the register_netdevice was done to avoid race conditions. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 368219e..da000e9 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -563,6 +563,11 @@ static int batadv_hard_if_event(struct notifier_block *this, struct batadv_hard_iface *primary_if = NULL; struct batadv_priv *bat_priv; + if (batadv_softif_is_valid(net_dev) && event == NETDEV_REGISTER) { + batadv_sysfs_add_meshif(net_dev); + return NOTIFY_DONE; + } + hard_iface = batadv_hardif_get_by_netdev(net_dev); if (!hard_iface && event == NETDEV_REGISTER) hard_iface = batadv_hardif_add_interface(net_dev); diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index f93ae42..c5cb0a7 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -402,55 +402,6 @@ static void batadv_set_lockdep_class(struct net_device *dev) } /** - * batadv_softif_init - Late stage initialization of soft interface - * @dev: registered network device to modify - * - * Returns error code on failures - */ -static int batadv_softif_init(struct net_device *dev) -{ - batadv_set_lockdep_class(dev); - - return 0; -} - -static const struct net_device_ops batadv_netdev_ops = { - .ndo_init = batadv_softif_init, - .ndo_open = batadv_interface_open, - .ndo_stop = batadv_interface_release, - .ndo_get_stats = batadv_interface_stats, - .ndo_set_mac_address = batadv_interface_set_mac_addr, - .ndo_change_mtu = batadv_interface_change_mtu, - .ndo_start_xmit = batadv_interface_tx, - .ndo_validate_addr = eth_validate_addr -}; - -static void batadv_interface_setup(struct net_device *dev) -{ - struct batadv_priv *priv = netdev_priv(dev); - - ether_setup(dev); - - dev->netdev_ops = &batadv_netdev_ops; - dev->destructor = free_netdev; - dev->tx_queue_len = 0; - - /* can't call min_mtu, because the needed variables - * have not been initialized yet - */ - dev->mtu = ETH_DATA_LEN; - /* reserve more space in the skbuff for our header */ - dev->hard_header_len = BATADV_HEADER_LEN; - - /* generate random address */ - eth_hw_addr_random(dev); - - SET_ETHTOOL_OPS(dev, &batadv_ethtool_ops); - - memset(priv, 0, sizeof(*priv)); -} - -/** * batadv_softif_destroy_finish - cleans up the remains of a softif * @work: work queue item * @@ -474,21 +425,22 @@ static void batadv_softif_destroy_finish(struct work_struct *work) rtnl_unlock(); } -struct net_device *batadv_softif_create(const char *name) +/** + * batadv_softif_init_late - late stage initialization of soft interface + * @dev: registered network device to modify + * + * Returns error code on failures + */ +static int batadv_softif_init_late(struct net_device *dev) { - struct net_device *soft_iface; struct batadv_priv *bat_priv; int ret; size_t cnt_len = sizeof(uint64_t) * BATADV_CNT_NUM; - soft_iface = alloc_netdev(sizeof(*bat_priv), name, - batadv_interface_setup); - - if (!soft_iface) - goto out; + batadv_set_lockdep_class(dev); - bat_priv = netdev_priv(soft_iface); - bat_priv->soft_iface = soft_iface; + bat_priv = netdev_priv(dev); + bat_priv->soft_iface = dev; INIT_WORK(&bat_priv->cleanup_work, batadv_softif_destroy_finish); /* batadv_interface_stats() needs to be available as soon as @@ -496,14 +448,7 @@ struct net_device *batadv_softif_create(const char *name) */ bat_priv->bat_counters = __alloc_percpu(cnt_len, __alignof__(uint64_t)); if (!bat_priv->bat_counters) - goto free_soft_iface; - - ret = register_netdevice(soft_iface); - if (ret < 0) { - pr_err("Unable to register the batman interface '%s': %i\n", - name, ret); - goto free_bat_counters; - } + return -ENOMEM; atomic_set(&bat_priv->aggregated_ogms, 1); atomic_set(&bat_priv->bonding, 0); @@ -541,41 +486,89 @@ struct net_device *batadv_softif_create(const char *name) bat_priv->primary_if = NULL; bat_priv->num_ifaces = 0; - ret = batadv_algo_select(bat_priv, batadv_routing_algo); - if (ret < 0) - goto unreg_soft_iface; - batadv_nc_init_bat_priv(bat_priv); - ret = batadv_sysfs_add_meshif(soft_iface); + ret = batadv_algo_select(bat_priv, batadv_routing_algo); if (ret < 0) - goto unreg_soft_iface; + goto free_bat_counters; - ret = batadv_debugfs_add_meshif(soft_iface); + ret = batadv_debugfs_add_meshif(dev); if (ret < 0) - goto unreg_sysfs; + goto free_bat_counters; - ret = batadv_mesh_init(soft_iface); + ret = batadv_mesh_init(dev); if (ret < 0) goto unreg_debugfs; - return soft_iface; + return 0; unreg_debugfs: - batadv_debugfs_del_meshif(soft_iface); -unreg_sysfs: - batadv_sysfs_del_meshif(soft_iface); -unreg_soft_iface: - free_percpu(bat_priv->bat_counters); - unregister_netdevice(soft_iface); - return NULL; - + batadv_debugfs_del_meshif(dev); free_bat_counters: free_percpu(bat_priv->bat_counters); -free_soft_iface: - free_netdev(soft_iface); -out: - return NULL; + + return ret; +} + +static const struct net_device_ops batadv_netdev_ops = { + .ndo_init = batadv_softif_init_late, + .ndo_open = batadv_interface_open, + .ndo_stop = batadv_interface_release, + .ndo_get_stats = batadv_interface_stats, + .ndo_set_mac_address = batadv_interface_set_mac_addr, + .ndo_change_mtu = batadv_interface_change_mtu, + .ndo_start_xmit = batadv_interface_tx, + .ndo_validate_addr = eth_validate_addr +}; + +/** + * batadv_softif_init_early - early stage initialization of soft interface + * @dev: registered network device to modify + */ +static void batadv_softif_init_early(struct net_device *dev) +{ + struct batadv_priv *priv = netdev_priv(dev); + + ether_setup(dev); + + dev->netdev_ops = &batadv_netdev_ops; + dev->destructor = free_netdev; + dev->tx_queue_len = 0; + + /* can't call min_mtu, because the needed variables + * have not been initialized yet + */ + dev->mtu = ETH_DATA_LEN; + /* reserve more space in the skbuff for our header */ + dev->hard_header_len = BATADV_HEADER_LEN; + + /* generate random address */ + eth_hw_addr_random(dev); + + SET_ETHTOOL_OPS(dev, &batadv_ethtool_ops); + + memset(priv, 0, sizeof(*priv)); +} + +struct net_device *batadv_softif_create(const char *name) +{ + struct net_device *soft_iface; + int ret; + + soft_iface = alloc_netdev(sizeof(struct batadv_priv), name, + batadv_softif_init_early); + if (!soft_iface) + return NULL; + + ret = register_netdevice(soft_iface); + if (ret < 0) { + pr_err("Unable to register the batman interface '%s': %i\n", + name, ret); + free_netdev(soft_iface); + return NULL; + } + + return soft_iface; } void batadv_softif_destroy(struct net_device *soft_iface) -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20130402
by batman＠open-mesh.org 02 Apr '13

02 Apr '13

The following commit has been merged in the master branch: commit e6a0b495ffee1301c239da49818008e7de3c2ae1 Author: Martin Hundebøll <martin(a)hundeboll.net> Date: Thu Mar 14 21:30:21 2013 +0100 batman-adv: Fix endianness errors for network coding Add a htonl() in network_coding.c when reading the sequence number from received ogm_packet, to avoid wrong byte ordering when comparing with a host value. This bug was introduced in 3ed7ada3f0bbcd058567bc0a8f9729a73eba7db6 ("batman-adv: network coding - detect coding nodes and remove these after timeout"). Change the type of coded_packet->coded_len from uint16 to __be16 to avoid wrong assumptions about endianness in later uses. Introduced in c3289f3650d34b60296000a629c99f2488f7c3dd ("batman-adv: network coding - code and transmit packets if possible"). Reported-by: Fengguang Wu <fengguang.wu(a)intel.com> Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 5728079..086c107 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -654,7 +654,7 @@ static bool batadv_can_nc_with_orig(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, struct batadv_ogm_packet *ogm_packet) { - if (orig_node->last_real_seqno != ogm_packet->seqno) + if (orig_node->last_real_seqno != ntohl(ogm_packet->seqno)) return false; if (orig_node->last_ttl != ogm_packet->header.ttl + 1) return false; diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index a079958..a51ccfc 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@ -308,7 +308,7 @@ struct batadv_coded_packet { uint8_t second_source[ETH_ALEN]; uint8_t second_orig_dest[ETH_ALEN]; __be32 second_crc; - uint16_t coded_len; + __be16 coded_len; }; #endif /* _NET_BATMAN_ADV_PACKET_H_ */ -- LinuxNextTracking

1 0

Build check errors found: 2013-04-02
by postmaster＠open-mesh.org 01 Apr '13

01 Apr '13

Name of failed tests ==================== checkpatch master bridge_loop_avoidance.c checkpatch master gateway_client.c checkpatch master main.c checkpatch master translation-table.c checkpatch next bridge_loop_avoidance.c checkpatch next gateway_client.c checkpatch next main.c checkpatch next translation-table.c cppcheck master cppcheck next sparse master linux-2.6.29 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.29 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.29 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.29 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse master linux-2.6.30 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.30 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.30 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.30 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse master linux-2.6.31 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.31 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.31 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.31 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse master linux-2.6.32 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.32 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.32 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.32 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse master linux-2.6.34 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.34 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.34 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.34 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse master linux-2.6.35 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.35 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.35 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.35 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse master linux-2.6.36 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.36 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.36 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.36 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse master linux-2.6.37 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.37 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.37 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.37 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse master linux-2.6.38 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.38 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.38 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse master linux-2.6.38 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.29 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse next linux-2.6.29 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.29 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.29 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse next linux-2.6.30 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse next linux-2.6.30 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.30 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.30 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse next linux-2.6.31 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse next linux-2.6.31 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.31 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.31 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse next linux-2.6.32 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse next linux-2.6.32 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.32 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.32 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse next linux-2.6.34 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse next linux-2.6.34 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.34 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.34 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse next linux-2.6.35 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse next linux-2.6.35 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.35 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.35 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse next linux-2.6.36 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse next linux-2.6.36 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.36 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.36 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse next linux-2.6.37 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse next linux-2.6.37 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.37 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.37 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse next linux-2.6.38 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y sparse next linux-2.6.38 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.38 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n sparse next linux-2.6.38 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y Output of different failed tests ================================ checkpatch next bridge_loop_avoidance.c: >>>>>>>> WARNING: Prefer seq_puts to seq_printf #1613: FILE: bridge_loop_avoidance.c:1613: + seq_printf(seq, WARNING: Prefer seq_puts to seq_printf #1658: FILE: bridge_loop_avoidance.c:1658: + seq_printf(seq, WARNING: Prefer seq_puts to seq_printf #1679: FILE: bridge_loop_avoidance.c:1679: + seq_printf(seq, total: 0 errors, 3 warnings, 0 checks, 1690 lines checked checkpatch next gateway_client.c: >>>>>>>> WARNING: Prefer seq_puts to seq_printf #483: FILE: gateway_client.c:483: + seq_printf(seq, total: 0 errors, 1 warnings, 0 checks, 712 lines checked checkpatch next main.c: >>>>>>>> WARNING: Prefer seq_puts to seq_printf #215: FILE: main.c:215: + seq_printf(seq, WARNING: Prefer seq_puts to seq_printf #224: FILE: main.c:224: + seq_printf(seq, total: 0 errors, 2 warnings, 0 checks, 501 lines checked checkpatch next translation-table.c: >>>>>>>> WARNING: Prefer seq_puts to seq_printf #477: FILE: translation-table.c:477: + seq_printf(seq, WARNING: Prefer seq_puts to seq_printf #976: FILE: translation-table.c:976: + seq_printf(seq, WARNING: Prefer seq_puts to seq_printf #1018: FILE: translation-table.c:1018: + seq_printf(seq, total: 0 errors, 3 warnings, 0 checks, 2573 lines checked cppcheck next: >>>>>>>> [gateway_client.c:181]: (style) Variable 'max_gw_factor' is assigned a value that is never used [gateway_client.c:178]: (style) Variable 'max_tq' is assigned a value that is never used [translation-table.c:944]: (style) Variable 'best_tq' is assigned a value that is never used sparse master linux-2.6.32 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y: >>>>>>>> include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. /home/batman/build_test/tmp/hard-interface.c:381:43: error: subtraction of functions? Share your drugs include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. sparse master linux-2.6.32 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n: >>>>>>>> include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. /home/batman/build_test/tmp/hard-interface.c:381:43: error: subtraction of functions? Share your drugs include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. sparse master linux-2.6.38 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y: >>>>>>>> /home/batman/build_test/tmp/hard-interface.c:381:43: error: subtraction of functions? Share your drugs sparse next linux-2.6.32 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y: >>>>>>>> include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. /home/batman/build_test/tmp/hard-interface.c:329:43: error: subtraction of functions? Share your drugs include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. sparse next linux-2.6.32 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n: >>>>>>>> include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. /home/batman/build_test/tmp/hard-interface.c:329:43: error: subtraction of functions? Share your drugs include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. sparse next linux-2.6.32 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y: >>>>>>>> include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. /home/batman/build_test/tmp/hard-interface.c:329:43: error: subtraction of functions? Share your drugs include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. include/linux/skbuff.h:357:41: error: invalid bitfield specifier for type restricted __be16. sparse next linux-2.6.38 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n: >>>>>>>> /home/batman/build_test/tmp/hard-interface.c:329:43: error: subtraction of functions? Share your drugs

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge