linux-merge December 2015

linux-merge@lists.open-mesh.org

3 participants
64 discussions

Build check errors found: 2015-12-08
by postmaster＠open-mesh.org 08 Dec '15

08 Dec '15

Name of failed tests ==================== * difference between net-next and batadv next Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- Documentation/networking/batman-adv.txt | 9 net/batman-adv/bat_iv_ogm.c | 92 +------ net/batman-adv/bitarray.c | 12 net/batman-adv/bitarray.h | 12 net/batman-adv/bridge_loop_avoidance.c | 282 +++++------------------ net/batman-adv/bridge_loop_avoidance.h | 2 net/batman-adv/debugfs.c | 15 - net/batman-adv/distributed-arp-table.c | 46 +-- net/batman-adv/fragmentation.c | 26 -- net/batman-adv/fragmentation.h | 2 net/batman-adv/gateway_client.c | 14 - net/batman-adv/gateway_common.c | 119 +++++---- net/batman-adv/hard-interface.c | 18 - net/batman-adv/hash.h | 22 - net/batman-adv/main.c | 51 ++-- net/batman-adv/main.h | 21 - net/batman-adv/multicast.c | 35 +- net/batman-adv/multicast.h | 2 net/batman-adv/network-coding.c | 59 +--- net/batman-adv/originator.c | 241 +------------------ net/batman-adv/originator.h | 7 net/batman-adv/packet.h | 20 - net/batman-adv/routing.c | 61 +--- net/batman-adv/send.c | 32 +- net/batman-adv/send.h | 4 net/batman-adv/soft-interface.c | 18 - net/batman-adv/sysfs.c | 31 -- net/batman-adv/translation-table.c | 155 ++++-------- net/batman-adv/types.h | 90 ++----- 29 files changed, 455 insertions(+), 1043 deletions(-)

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20151207
by batman＠open-mesh.org 08 Dec '15

08 Dec '15

The following commit has been merged in the master branch: commit a1a66b1100373ead1fa2383bc3dee42c508bb504 Author: Andrew Lunn <andrew(a)lunn.ch> Date: Thu Dec 3 21:12:33 2015 +0100 batman-adv: Act on NETDEV_*_TYPE_CHANGE events A network interface can change type. It may change from a type which batman does not support, e.g. hdlc, to one it does, e.g. hdlc-eth. When an interface changes type, it sends two notifications. Handle these notifications. Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> Signed-off-by: David S. Miller <davem(a)davemloft.net> diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index aa8867e..a58184f 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -709,7 +709,8 @@ static int batadv_hard_if_event(struct notifier_block *this, } hard_iface = batadv_hardif_get_by_netdev(net_dev); - if (!hard_iface && event == NETDEV_REGISTER) + if (!hard_iface && (event == NETDEV_REGISTER || + event == NETDEV_POST_TYPE_CHANGE)) hard_iface = batadv_hardif_add_interface(net_dev); if (!hard_iface) @@ -724,6 +725,7 @@ static int batadv_hard_if_event(struct notifier_block *this, batadv_hardif_deactivate_interface(hard_iface); break; case NETDEV_UNREGISTER: + case NETDEV_PRE_TYPE_CHANGE: list_del_rcu(&hard_iface->list); batadv_hardif_remove_interface(hard_iface); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20151207
by batman＠open-mesh.org 08 Dec '15

08 Dec '15

The following commit has been merged in the master branch: commit 6dffb0447c25476f499d205dfceb1972e8dae919 Author: Jiri Pirko <jiri(a)mellanox.com> Date: Thu Dec 3 12:12:10 2015 +0100 net: propagate upper priv via netdev_master_upper_dev_link Eliminate netdev_master_upper_dev_link_private and pass priv directly as a parameter of netdev_master_upper_dev_link. Signed-off-by: Jiri Pirko <jiri(a)mellanox.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 9e0f8a7..9240157 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1204,7 +1204,7 @@ static int bond_master_upper_dev_link(struct net_device *bond_dev, { int err; - err = netdev_master_upper_dev_link_private(slave_dev, bond_dev, slave); + err = netdev_master_upper_dev_link(slave_dev, bond_dev, slave); if (err) return err; slave_dev->flags |= IFF_SLAVE; diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index d2f3ee8..b37f8d1 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1083,7 +1083,7 @@ static int team_upper_dev_link(struct net_device *dev, { int err; - err = netdev_master_upper_dev_link(port_dev, dev); + err = netdev_master_upper_dev_link(port_dev, dev, NULL); if (err) return err; port_dev->priv_flags |= IFF_TEAM_PORT; diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index c2d54c4..59c5bdd 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -624,7 +624,7 @@ static int do_vrf_add_slave(struct net_device *dev, struct net_device *port_dev) goto out_fail; } - ret = netdev_master_upper_dev_link(port_dev, dev); + ret = netdev_master_upper_dev_link(port_dev, dev, NULL); if (ret < 0) goto out_unregister; diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 1506be5..939b8f3 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3619,10 +3619,8 @@ struct net_device *netdev_master_upper_dev_get(struct net_device *dev); struct net_device *netdev_master_upper_dev_get_rcu(struct net_device *dev); int netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev); int netdev_master_upper_dev_link(struct net_device *dev, - struct net_device *upper_dev); -int netdev_master_upper_dev_link_private(struct net_device *dev, - struct net_device *upper_dev, - void *private); + struct net_device *upper_dev, + void *upper_priv); void netdev_upper_dev_unlink(struct net_device *dev, struct net_device *upper_dev); void netdev_adjacent_rename_links(struct net_device *dev, char *oldname); diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index f11345e..a7f4f10 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -464,7 +464,8 @@ 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); + ret = netdev_master_upper_dev_link(hard_iface->net_dev, + soft_iface, NULL); if (ret) goto err_dev; diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index ec02f58..781abc34 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -493,7 +493,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) dev->priv_flags |= IFF_BRIDGE_PORT; - err = netdev_master_upper_dev_link(dev, br->dev); + err = netdev_master_upper_dev_link(dev, br->dev, NULL); if (err) goto err5; diff --git a/net/core/dev.c b/net/core/dev.c index 939cd1b..27d052b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5421,7 +5421,7 @@ static void __netdev_adjacent_dev_unlink_neighbour(struct net_device *dev, static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, - void *private) + void *upper_priv) { struct netdev_notifier_changeupper_info changeupper_info; struct netdev_adjacent *i, *j, *to_i, *to_j; @@ -5452,7 +5452,7 @@ static int __netdev_upper_dev_link(struct net_device *dev, if (ret) return ret; - ret = __netdev_adjacent_dev_link_neighbour(dev, upper_dev, private, + ret = __netdev_adjacent_dev_link_neighbour(dev, upper_dev, upper_priv, master); if (ret) return ret; @@ -5557,6 +5557,7 @@ EXPORT_SYMBOL(netdev_upper_dev_link); * netdev_master_upper_dev_link - Add a master link to the upper device * @dev: device * @upper_dev: new upper device + * @upper_priv: upper device private * * Adds a link to device which is upper to this one. In this case, only * one master upper device can be linked, although other non-master devices @@ -5565,20 +5566,13 @@ EXPORT_SYMBOL(netdev_upper_dev_link); * counts are adjusted and the function returns zero. */ int netdev_master_upper_dev_link(struct net_device *dev, - struct net_device *upper_dev) + struct net_device *upper_dev, + void *upper_priv) { - return __netdev_upper_dev_link(dev, upper_dev, true, NULL); + return __netdev_upper_dev_link(dev, upper_dev, true, upper_priv); } EXPORT_SYMBOL(netdev_master_upper_dev_link); -int netdev_master_upper_dev_link_private(struct net_device *dev, - struct net_device *upper_dev, - void *private) -{ - return __netdev_upper_dev_link(dev, upper_dev, true, private); -} -EXPORT_SYMBOL(netdev_master_upper_dev_link_private); - /** * netdev_upper_dev_unlink - Removes a link to upper device * @dev: device diff --git a/net/openvswitch/vport-netdev.c b/net/openvswitch/vport-netdev.c index b327368..3ee3df1 100644 --- a/net/openvswitch/vport-netdev.c +++ b/net/openvswitch/vport-netdev.c @@ -105,7 +105,7 @@ struct vport *ovs_netdev_link(struct vport *vport, const char *name) rtnl_lock(); err = netdev_master_upper_dev_link(vport->dev, - get_dpdev(vport->dp)); + get_dpdev(vport->dp), NULL); if (err) goto error_unlock; -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20151207
by batman＠open-mesh.org 08 Dec '15

08 Dec '15

The following commit has been merged in the master branch: commit 29bf24afb29042f568fa67b1b0eee46796725ed2 Author: Jiri Pirko <jiri(a)mellanox.com> Date: Thu Dec 3 12:12:11 2015 +0100 net: add possibility to pass information about upper device via notifier Sometimes the drivers and other code would find it handy to know some internal information about upper device being changed. So allow upper-code to pass information down to notifier listeners during linking. Signed-off-by: Jiri Pirko <jiri(a)mellanox.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 9240157..fa3ed1d 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1204,7 +1204,7 @@ static int bond_master_upper_dev_link(struct net_device *bond_dev, { int err; - err = netdev_master_upper_dev_link(slave_dev, bond_dev, slave); + err = netdev_master_upper_dev_link(slave_dev, bond_dev, slave, NULL); if (err) return err; slave_dev->flags |= IFF_SLAVE; diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index b37f8d1..f7b6ff7 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1083,7 +1083,7 @@ static int team_upper_dev_link(struct net_device *dev, { int err; - err = netdev_master_upper_dev_link(port_dev, dev, NULL); + err = netdev_master_upper_dev_link(port_dev, dev, NULL, NULL); if (err) return err; port_dev->priv_flags |= IFF_TEAM_PORT; diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 59c5bdd..8944a49 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -624,7 +624,7 @@ static int do_vrf_add_slave(struct net_device *dev, struct net_device *port_dev) goto out_fail; } - ret = netdev_master_upper_dev_link(port_dev, dev, NULL); + ret = netdev_master_upper_dev_link(port_dev, dev, NULL, NULL); if (ret < 0) goto out_unregister; diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 939b8f3..aea556c 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2163,6 +2163,7 @@ struct netdev_notifier_changeupper_info { struct net_device *upper_dev; /* new upper dev */ bool master; /* is upper dev master */ bool linking; /* is the nofication for link or unlink */ + void *upper_info; /* upper dev info */ }; static inline void netdev_notifier_info_init(struct netdev_notifier_info *info, @@ -3620,7 +3621,7 @@ struct net_device *netdev_master_upper_dev_get_rcu(struct net_device *dev); int netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev); int netdev_master_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, - void *upper_priv); + void *upper_priv, void *upper_info); void netdev_upper_dev_unlink(struct net_device *dev, struct net_device *upper_dev); void netdev_adjacent_rename_links(struct net_device *dev, char *oldname); diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index a7f4f10..aa8867e 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -465,7 +465,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, bat_priv = netdev_priv(hard_iface->soft_iface); ret = netdev_master_upper_dev_link(hard_iface->net_dev, - soft_iface, NULL); + soft_iface, NULL, NULL); if (ret) goto err_dev; diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 781abc34..8d1d4a2 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -493,7 +493,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) dev->priv_flags |= IFF_BRIDGE_PORT; - err = netdev_master_upper_dev_link(dev, br->dev, NULL); + err = netdev_master_upper_dev_link(dev, br->dev, NULL, NULL); if (err) goto err5; diff --git a/net/core/dev.c b/net/core/dev.c index 27d052b..8ed8866 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5421,7 +5421,7 @@ static void __netdev_adjacent_dev_unlink_neighbour(struct net_device *dev, static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, - void *upper_priv) + void *upper_priv, void *upper_info) { struct netdev_notifier_changeupper_info changeupper_info; struct netdev_adjacent *i, *j, *to_i, *to_j; @@ -5445,6 +5445,7 @@ static int __netdev_upper_dev_link(struct net_device *dev, changeupper_info.upper_dev = upper_dev; changeupper_info.master = master; changeupper_info.linking = true; + changeupper_info.upper_info = upper_info; ret = call_netdevice_notifiers_info(NETDEV_PRECHANGEUPPER, dev, &changeupper_info.info); @@ -5549,7 +5550,7 @@ rollback_mesh: int netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev) { - return __netdev_upper_dev_link(dev, upper_dev, false, NULL); + return __netdev_upper_dev_link(dev, upper_dev, false, NULL, NULL); } EXPORT_SYMBOL(netdev_upper_dev_link); @@ -5558,6 +5559,7 @@ EXPORT_SYMBOL(netdev_upper_dev_link); * @dev: device * @upper_dev: new upper device * @upper_priv: upper device private + * @upper_info: upper info to be passed down via notifier * * Adds a link to device which is upper to this one. In this case, only * one master upper device can be linked, although other non-master devices @@ -5567,9 +5569,10 @@ EXPORT_SYMBOL(netdev_upper_dev_link); */ int netdev_master_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, - void *upper_priv) + void *upper_priv, void *upper_info) { - return __netdev_upper_dev_link(dev, upper_dev, true, upper_priv); + return __netdev_upper_dev_link(dev, upper_dev, true, + upper_priv, upper_info); } EXPORT_SYMBOL(netdev_master_upper_dev_link); diff --git a/net/openvswitch/vport-netdev.c b/net/openvswitch/vport-netdev.c index 3ee3df1..8f4dd4c 100644 --- a/net/openvswitch/vport-netdev.c +++ b/net/openvswitch/vport-netdev.c @@ -105,7 +105,7 @@ struct vport *ovs_netdev_link(struct vport *vport, const char *name) rtnl_lock(); err = netdev_master_upper_dev_link(vport->dev, - get_dpdev(vport->dp), NULL); + get_dpdev(vport->dp), NULL, NULL); if (err) goto error_unlock; -- LinuxNextTracking

1 0

Build check errors found: 2015-12-07
by postmaster＠open-mesh.org 07 Dec '15

07 Dec '15

1 0

Coverity Scan: Analysis completed for batmand
by scan-admin＠coverity.com 07 Dec '15

07 Dec '15

Your request for analysis of batmand has been completed successfully. The results are available at https://scan.coverity.com/projects/batmand Analysis Summary: New defects found: 0 Defects eliminated: 0

1 0

Build check errors found: 2015-12-06
by postmaster＠open-mesh.org 06 Dec '15

06 Dec '15

1 0

Build check errors found: 2015-12-05
by postmaster＠open-mesh.org 05 Dec '15

05 Dec '15

Name of failed tests ==================== * difference between net-next and batadv next Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- Documentation/networking/batman-adv.txt | 9 net/batman-adv/bat_iv_ogm.c | 92 +------ net/batman-adv/bitarray.c | 12 net/batman-adv/bitarray.h | 12 net/batman-adv/bridge_loop_avoidance.c | 282 +++++------------------ net/batman-adv/bridge_loop_avoidance.h | 2 net/batman-adv/debugfs.c | 15 - net/batman-adv/distributed-arp-table.c | 46 +-- net/batman-adv/fragmentation.c | 26 -- net/batman-adv/fragmentation.h | 2 net/batman-adv/gateway_client.c | 14 - net/batman-adv/gateway_common.c | 119 +++++---- net/batman-adv/hard-interface.c | 14 - net/batman-adv/hash.h | 22 - net/batman-adv/main.c | 51 ++-- net/batman-adv/main.h | 21 - net/batman-adv/multicast.c | 35 +- net/batman-adv/multicast.h | 2 net/batman-adv/network-coding.c | 59 +--- net/batman-adv/originator.c | 241 +------------------ net/batman-adv/originator.h | 7 net/batman-adv/packet.h | 20 - net/batman-adv/routing.c | 61 +--- net/batman-adv/send.c | 32 +- net/batman-adv/send.h | 4 net/batman-adv/soft-interface.c | 18 - net/batman-adv/sysfs.c | 31 -- net/batman-adv/translation-table.c | 155 ++++-------- net/batman-adv/types.h | 90 ++----- 29 files changed, 452 insertions(+), 1042 deletions(-)

1 0

Build check errors found: 2015-12-04
by postmaster＠open-mesh.org 04 Dec '15

04 Dec '15

Name of failed tests ==================== * difference between net-next and batadv next Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- Documentation/networking/batman-adv.txt | 9 net/batman-adv/bat_iv_ogm.c | 92 +------ net/batman-adv/bitarray.c | 12 net/batman-adv/bitarray.h | 12 net/batman-adv/bridge_loop_avoidance.c | 282 +++++------------------ net/batman-adv/bridge_loop_avoidance.h | 2 net/batman-adv/debugfs.c | 15 - net/batman-adv/distributed-arp-table.c | 46 +-- net/batman-adv/fragmentation.c | 26 -- net/batman-adv/fragmentation.h | 2 net/batman-adv/gateway_client.c | 14 - net/batman-adv/gateway_common.c | 119 +++++---- net/batman-adv/hard-interface.c | 14 - net/batman-adv/hash.h | 22 - net/batman-adv/main.c | 51 ++-- net/batman-adv/main.h | 21 - net/batman-adv/multicast.c | 35 +- net/batman-adv/multicast.h | 2 net/batman-adv/network-coding.c | 59 +--- net/batman-adv/originator.c | 241 +------------------ net/batman-adv/originator.h | 7 net/batman-adv/packet.h | 20 - net/batman-adv/routing.c | 61 +--- net/batman-adv/send.c | 32 +- net/batman-adv/send.h | 4 net/batman-adv/soft-interface.c | 18 - net/batman-adv/sysfs.c | 31 -- net/batman-adv/translation-table.c | 155 ++++-------- net/batman-adv/types.h | 90 ++----- 29 files changed, 452 insertions(+), 1042 deletions(-)

1 0

Build check errors found: 2015-12-03
by postmaster＠open-mesh.org 03 Dec '15

03 Dec '15

Name of failed tests ==================== * difference between net-next and batadv next Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- Documentation/networking/batman-adv.txt | 9 net/batman-adv/bat_iv_ogm.c | 92 +------ net/batman-adv/bitarray.c | 12 net/batman-adv/bitarray.h | 12 net/batman-adv/bridge_loop_avoidance.c | 282 +++++------------------ net/batman-adv/bridge_loop_avoidance.h | 2 net/batman-adv/debugfs.c | 15 - net/batman-adv/distributed-arp-table.c | 46 +-- net/batman-adv/fragmentation.c | 26 -- net/batman-adv/fragmentation.h | 2 net/batman-adv/gateway_client.c | 14 - net/batman-adv/gateway_common.c | 119 +++++---- net/batman-adv/hard-interface.c | 11 net/batman-adv/hash.h | 22 - net/batman-adv/main.c | 51 ++-- net/batman-adv/main.h | 21 - net/batman-adv/multicast.c | 35 +- net/batman-adv/multicast.h | 2 net/batman-adv/network-coding.c | 59 +--- net/batman-adv/originator.c | 241 +------------------ net/batman-adv/originator.h | 7 net/batman-adv/packet.h | 20 - net/batman-adv/routing.c | 61 +--- net/batman-adv/send.c | 32 +- net/batman-adv/send.h | 4 net/batman-adv/soft-interface.c | 18 - net/batman-adv/sysfs.c | 31 -- net/batman-adv/translation-table.c | 155 ++++-------- net/batman-adv/types.h | 90 ++----- 29 files changed, 450 insertions(+), 1041 deletions(-)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge December 2015