commits June 2013

commits@lists.open-mesh.org

1 participants
36 discussions

[batman-adv] maint: batman-adv: wait for rtnl in batadv_store_mesh_iface instead of failing if it is taken (96cd772)
by postmaster＠open-mesh.org 04 Jun '13

04 Jun '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 96cd7725540f4dccdd6fbb4fde59243e1cc1ad80 Author: Matthias Schiffer <mschiffer(a)universe-factory.net> Date: Tue May 28 17:32:32 2013 +0200 batman-adv: wait for rtnl in batadv_store_mesh_iface instead of failing if it is taken The rtnl_lock in batadv_store_mesh_iface has been converted to a rtnl_trylock some time ago to avoid a possible deadlock between rtnl and s_active on removal of the sysfs nodes. The behaviour introduced by that was quite confusing as it could lead to the sysfs store to fail, making batman-adv setup scripts unreliable. As recently the sysfs removal was postponed to a worker not running with the rtnl taken, the deadlock can't occur any more and it is safe to change the trylock back to a lock to make the sysfs store reliable again. Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> Reviewed-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 96cd7725540f4dccdd6fbb4fde59243e1cc1ad80 sysfs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sysfs.c b/sysfs.c index 15a22ef..929e304 100644 --- a/sysfs.c +++ b/sysfs.c @@ -582,10 +582,7 @@ static ssize_t batadv_store_mesh_iface(struct kobject *kobj, (strncmp(hard_iface->soft_iface->name, buff, IFNAMSIZ) == 0)) goto out; - if (!rtnl_trylock()) { - ret = -ERESTARTSYS; - goto out; - } + rtnl_lock(); if (status_tmp == BATADV_IF_NOT_IN_USE) { batadv_hardif_disable_interface(hard_iface,

1 0

[batman-adv] master: batman-adv: remove obsolete variable (288a0ef)
by postmaster＠open-mesh.org 04 Jun '13

04 Jun '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 288a0ef623122b4746cc45c7927a846353c2f655 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu May 30 14:37:10 2013 +0800 batman-adv: remove obsolete variable Introduced by 1ab746a3f2441d3466592b86134fbc72a9fe0558 ("batman-adv: properly align tvlv infrastructure") Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 288a0ef623122b4746cc45c7927a846353c2f655 main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/main.c b/main.c index 1192e61..5d30fe0 100644 --- a/main.c +++ b/main.c @@ -1043,7 +1043,7 @@ void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, uint8_t *src, struct batadv_orig_node *orig_node; struct sk_buff *skb = NULL; unsigned char *tvlv_buff; - unsigned int tvlv_len, tvlv_long_hdr = 0; + unsigned int tvlv_len; ssize_t hdr_len = sizeof(*unicast_tvlv_packet); bool ret = false; @@ -1051,9 +1051,6 @@ void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, uint8_t *src, if (!orig_node) goto out; - if (tvlv_value_len > 255) - tvlv_long_hdr = 1; - tvlv_len = sizeof(*tvlv_hdr) + tvlv_value_len; skb = netdev_alloc_skb_ip_align(NULL, ETH_HLEN + hdr_len + tvlv_len);

1 0

[batman-adv] master's head updated: Merge branch 'next' (617980a)
by postmaster＠open-mesh.org 04 Jun '13

04 Jun '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 92bc8cd net: pass info struct via netdevice notifier 617980a Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (617980a)
by postmaster＠open-mesh.org 04 Jun '13

04 Jun '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 617980aeed96e335eba2dac565bb10ced6437a05 Merge: 422ec22 92bc8cd Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Jun 4 17:06:32 2013 +0800 Merge branch 'next' >--------------------------------------------------------------- 617980aeed96e335eba2dac565bb10ced6437a05 compat.h | 6 ++++++ hard-interface.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[batman-adv] next: net: pass info struct via netdevice notifier (92bc8cd)
by postmaster＠open-mesh.org 04 Jun '13

04 Jun '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 92bc8cd2f254d1064f46151f77169c9aeda2791f Author: Jiri Pirko <jiri(a)resnulli.us> Date: Mon Jun 3 11:48:50 2013 +0200 net: pass info struct via netdevice notifier So far, only net_device * could be passed along with netdevice notifier event. This patch provides a possibility to pass custom structure able to provide info that event listener needs to know. Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> v2->v3: fix typo on simeth shortened dev_getter shortened notifier_info struct name v1->v2: fix notifier_call parameter in call_netdevice_notifier() Signed-off-by: David S. Miller <davem(a)davemloft.net> [ordex(a)autistici.org: added compat code] Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 92bc8cd2f254d1064f46151f77169c9aeda2791f compat.h | 6 ++++++ hard-interface.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/compat.h b/compat.h index 08b7500..17ef089 100644 --- a/compat.h +++ b/compat.h @@ -302,4 +302,10 @@ static int __batadv_interface_set_mac_addr(x, y) #endif /* < KERNEL_VERSION(3, 10, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) + +#define netdev_notifier_info_to_dev(ptr) ptr + +#endif /* < KERNEL_VERSION(3, 11, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/hard-interface.c b/hard-interface.c index dc4ac29..c478e6b 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -645,7 +645,7 @@ void batadv_hardif_remove_interfaces(void) static int batadv_hard_if_event(struct notifier_block *this, unsigned long event, void *ptr) { - struct net_device *net_dev = ptr; + struct net_device *net_dev = netdev_notifier_info_to_dev(ptr); struct batadv_hard_iface *hard_iface; struct batadv_hard_iface *primary_if = NULL; struct batadv_priv *bat_priv;

1 0

[linux-merge]linux integration; annotated tag, v3.10-rc4, created. v3.10-rc4
by postmaster＠open-mesh.org 03 Jun '13

03 Jun '13

The annotated tag, v3.10-rc4 has been created at 846830e71929e8728b0209e04259ca3e2b2f99c9 (tag) tagging d683b96b072dc4680fc74964eca77e6a23d1fa6e (commit) replaces v3.10-rc3 tagged by Linus Torvalds on Sun Jun 2 17:11:45 2013 +0900 - Shortlog ------------------------------------------------------------ Linux 3.10-rc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (GNU/Linux) iQEcBAABAgAGBQJRqv5BAAoJEHm+PkMAQRiGXSYH/0m7JEzD/h21I8E4H78PuibV EQLruvOrqP9pLH2vakhyLsWnib+6De8rWPRv31iHk6UX23XsXcYnzKXtJ2NH7Pfw nX4suU2Vn0nmDuNQk+zdc7ZWmkTXqnV1GeHFu9dYQUDKuuS4p6jxWxzlYlRq/pMI ALFEnJiO9+lmKU+Mg9r3Ges4JjWrvaBo7AEh9AqOfFTkHdEI9pN3BDL82a0Sfq4u ENvlhwkl7gfu7b2nVNlZABnD5wpq0sczlr0yjnjVMVFR0OPPHfkv9BogyQAVY9Z6 xC/9R8UEzFA2zCkvcTyTuYbl3lHeuMjkK2HtLNbkU/TB+drRoHSD0Cb21wo9GvQ= =64B6 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits June 2013