commits December 2015

commits@lists.open-mesh.org

1 participants
47 discussions

[batman-adv] master's head updated: Merge branch 'next' (1a19216)
by postmaster＠open-mesh.org 14 Dec '15

14 Dec '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 84e11be batman-adv: Fix build with linux < 3.9.0 1a19216 Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (1a19216)
by postmaster＠open-mesh.org 14 Dec '15

14 Dec '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 1a192169db4c0fd88f720ead8121f276e8bd0483 Merge: 06b58ea 84e11be Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Dec 14 20:49:09 2015 +0800 Merge branch 'next' >--------------------------------------------------------------- 1a192169db4c0fd88f720ead8121f276e8bd0483 compat-include/linux/netdevice.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

1 0

[batman-adv] next: batman-adv: Fix build with linux < 3.9.0 (84e11be)
by postmaster＠open-mesh.org 14 Dec '15

14 Dec '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 84e11bed303d18950cdffae44e9a61423eb344c3 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Dec 14 09:48:31 2015 +0100 batman-adv: Fix build with linux < 3.9.0 netdev_master_upper_dev_link already had a compat layer definition for linux < 3.9. Move these two different definitions to the same block to avoid using redefinitions which can break the build. Fixes: e19f387b9538 ("batman-adv: add possibility to pass information about upper device via notifier") Fixes: d794c1cd9d4f ("batman-adv: propagate upper priv via netdev_master_upper_dev_link") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 84e11bed303d18950cdffae44e9a61423eb344c3 compat-include/linux/netdevice.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index 10253e0..eca7668 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -84,7 +84,6 @@ static inline int batadv_netdev_set_master(struct net_device *slave, #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) -#define netdev_master_upper_dev_link netdev_set_master #define netdev_upper_dev_unlink(slave, master) netdev_set_master(slave, NULL) #define netdev_master_upper_dev_get(dev) \ ({\ @@ -120,7 +119,12 @@ static inline int batadv_netdev_set_master(struct net_device *slave, #endif /* < KERNEL_VERSION(3, 19, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) + +#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) \ + netdev_set_master(dev, upper_dev) + +#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) #define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) \ netdev_master_upper_dev_link(dev, upper_dev)

1 0

[batman-adv] master's head updated: Merge branch 'next' (06b58ea)
by postmaster＠open-mesh.org 13 Dec '15

13 Dec '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: d794c1c batman-adv: propagate upper priv via netdev_master_upper_dev_link e19f387 batman-adv: add possibility to pass information about upper device via notifier 399bf29 batman-adv: Act on NETDEV_*_TYPE_CHANGE events 06b58ea Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (06b58ea)
by postmaster＠open-mesh.org 13 Dec '15

13 Dec '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 06b58ead0365df4c4846850d66b82e650c5c113a Merge: 544f94c 399bf29 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Dec 13 14:31:04 2015 +0800 Merge branch 'next' >--------------------------------------------------------------- 06b58ead0365df4c4846850d66b82e650c5c113a compat-include/linux/netdevice.h | 10 ++++++++++ net/batman-adv/hard-interface.c | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-)

1 0

[batman-adv] next: batman-adv: Act on NETDEV_*_TYPE_CHANGE events (399bf29)
by postmaster＠open-mesh.org 13 Dec '15

13 Dec '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 399bf29c6a307fdcc835a8b7262bce56df71f977 Author: Andrew Lunn <andrew(a)lunn.ch> Date: Tue Dec 8 21:35:58 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> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 399bf29c6a307fdcc835a8b7262bce56df71f977 compat-include/linux/netdevice.h | 3 +++ net/batman-adv/hard-interface.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index 34e5ac7..10253e0 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -58,6 +58,9 @@ struct batadv_dev_addr_list { int da_gusers; }; +#define NETDEV_PRE_TYPE_CHANGE 0x000E +#define NETDEV_POST_TYPE_CHANGE 0x000F + #endif /* < KERNEL_VERSION(2, 6, 35) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 2d1470f..49e05d2 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -714,7 +714,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) @@ -729,6 +730,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);

1 0

[batman-adv] next: batman-adv: add possibility to pass information about upper device via notifier (e19f387)
by postmaster＠open-mesh.org 13 Dec '15

13 Dec '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit e19f387b9538a65eb260d3182e0352d259e150c1 Author: Jiri Pirko <jiri(a)mellanox.com> Date: Tue Dec 8 21:35:14 2015 +0100 batman-adv: 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> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- e19f387b9538a65eb260d3182e0352d259e150c1 compat-include/linux/netdevice.h | 2 +- net/batman-adv/hard-interface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index a8da7bf..34e5ac7 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -119,7 +119,7 @@ static inline int batadv_netdev_set_master(struct net_device *slave, #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) -#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv) \ +#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) \ netdev_master_upper_dev_link(dev, upper_dev) #endif /* < KERNEL_VERSION(4, 5, 0) */ diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 484c50e..2d1470f 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -467,7 +467,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;

1 0

[batman-adv] next: net: add possibility to pass information about upper device via notifier (4291a5b)
by postmaster＠open-mesh.org 13 Dec '15

13 Dec '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 4291a5bfc1f7a839561a73c3769c013628a486fe Author: Jiri Pirko <jiri(a)mellanox.com> Date: Tue Dec 8 21:35:14 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> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 4291a5bfc1f7a839561a73c3769c013628a486fe compat-include/linux/netdevice.h | 2 +- net/batman-adv/hard-interface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index a8da7bf..34e5ac7 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -119,7 +119,7 @@ static inline int batadv_netdev_set_master(struct net_device *slave, #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) -#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv) \ +#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) \ netdev_master_upper_dev_link(dev, upper_dev) #endif /* < KERNEL_VERSION(4, 5, 0) */ diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 484c50e..2d1470f 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -467,7 +467,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;

1 0

[batman-adv] next: batman-adv: propagate upper priv via netdev_master_upper_dev_link (d794c1c)
by postmaster＠open-mesh.org 13 Dec '15

13 Dec '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit d794c1cd9d4f9101d135cc7bfd8ff37604bc06f3 Author: Jiri Pirko <jiri(a)mellanox.com> Date: Tue Dec 8 21:35:13 2015 +0100 batman-adv: 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> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- d794c1cd9d4f9101d135cc7bfd8ff37604bc06f3 compat-include/linux/netdevice.h | 7 +++++++ net/batman-adv/hard-interface.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index f19f624..a8da7bf 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -117,4 +117,11 @@ static inline int batadv_netdev_set_master(struct net_device *slave, #endif /* < KERNEL_VERSION(3, 19, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) + +#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv) \ + netdev_master_upper_dev_link(dev, upper_dev) + +#endif /* < KERNEL_VERSION(4, 5, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_NETDEVICE_H_ */ diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index bef9147..484c50e 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -466,7 +466,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;

1 0

[linux-merge]; annotated tag, v4.4-rc4, created. v4.4-rc4
by postmaster＠open-mesh.org 07 Dec '15

07 Dec '15

The annotated tag, v4.4-rc4 has been created at 4b74253c4cd4f47aa99e52a0741a9084279fbd1a (tag) tagging 527e9316f8ec44bd53d90fb9f611fa7ffff52bb9 (commit) replaces v4.4-rc3 tagged by Linus Torvalds on Sun Dec 6 15:43:22 2015 -0800 - Shortlog ------------------------------------------------------------ Linux 4.4-rc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJWZMgaAAoJEHm+PkMAQRiGGcIH+gNS/hbN2DKW7wphl1QuaV7C 1fror8AvpwbGa/o0yuxovaVuZzAR0TF31vn+gAemF4U/hnM25xqxEHXYZEVv8OWw mbz4/z+jbVk3SiS5AiZPIZgL4W6RZnG5QYfiTVGPlBHuBznW2ITlNlClBOmBL45o uhb3bjTzi70AZ7Gh6i9sHgJoHg6D9u/ZxLaLcWnM79BzyTMHTf2t0wnrQmh66lEE hp7Rn9wXv9bk/e3iH7CVUb97P4IWhhkmfqcoturqAg9+C/M26b0VmvQp9Sy8S6Pd FVQ+SUIZllj5ZDKe9mOcs37czlxTr0keEFqzWeMh/7y4iuI3RaRp/qb+7mX5sIE= =WGZ1 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- --

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2015