commits May 2014

commits@lists.open-mesh.org

1 participants
88 discussions

[batman-adv] master's head updated: Merge branch 'next' (d1af3f2)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: f8d343a batman-adv: break line longer than 80chars 9d48399 Merge branch 'maint' into next d1af3f2 Merge branch 'next'

8 years, 10 months

[batman-adv] master: Merge branch 'next' (d1af3f2)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit d1af3f2196fa598b0a71211a7dc7e071d6a20c0b Merge: 869a0e5 9d48399 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Wed May 14 19:49:15 2014 +0800 Merge branch 'next' >--------------------------------------------------------------- d1af3f2196fa598b0a71211a7dc7e071d6a20c0b originator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

8 years, 10 months

[batman-adv] next: Merge branch 'maint' into next (9d48399)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 9d48399862a6d818edee737073d26cac15500996 Merge: 9fb6f30 f8d343a Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Wed May 14 19:47:54 2014 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 9d48399862a6d818edee737073d26cac15500996 originator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

8 years, 10 months

[batman-adv] next's head updated: Merge branch 'maint' into next (9d48399)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: f8d343a batman-adv: break line longer than 80chars 9d48399 Merge branch 'maint' into next

8 years, 10 months

[batman-adv] maint: batman-adv: break line longer than 80chars (f8d343a)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit f8d343af6f81dfdef17d8341fca5cf4b1cb44db9 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Sat May 10 17:58:03 2014 +0200 batman-adv: break line longer than 80chars Introduced by 9b9cdbe28e2b9c8bdf9c761f22ba9655963d13d4 ("batman-adv: fix removing neigh_ifinfo") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- f8d343af6f81dfdef17d8341fca5cf4b1cb44db9 originator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/originator.c b/originator.c index 35b42f8..9ebc40e 100644 --- a/originator.c +++ b/originator.c @@ -842,8 +842,8 @@ batadv_purge_orig_neighbors(struct batadv_priv *bat_priv, hlist_del_rcu(&neigh_node->list); batadv_neigh_node_free_ref(neigh_node); } else { - /* only neccesary if not the whole neighbor is to be deleted, - * but some interface has been removed. + /* only neccesary if not the whole neighbor is to be + * deleted, but some interface has been removed. */ batadv_purge_neigh_ifinfo(bat_priv, neigh_node); }

8 years, 10 months

[batman-adv] master: batman-adv: add blank line between declarations and the rest of the code (869a0e5)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 869a0e57115d4fcf131e5f5a03e03637d2c60bb2 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Sat May 10 18:56:37 2014 +0200 batman-adv: add blank line between declarations and the rest of the code Reported by checkpatch with the following message: "WARNING: Missing a blank line after declarations" Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 869a0e57115d4fcf131e5f5a03e03637d2c60bb2 debugfs.c | 9 +++++++++ distributed-arp-table.c | 1 + network-coding.c | 1 + sysfs.c | 10 ++++++++++ 4 files changed, 21 insertions(+) diff --git a/debugfs.c b/debugfs.c index b758881..99f2ba0 100644 --- a/debugfs.c +++ b/debugfs.c @@ -245,6 +245,7 @@ static int batadv_algorithms_open(struct inode *inode, struct file *file) static int batadv_originators_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_orig_seq_print_text, net_dev); } @@ -258,18 +259,21 @@ static int batadv_originators_hardif_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_orig_hardif_seq_print_text, net_dev); } static int batadv_gateways_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_gw_client_seq_print_text, net_dev); } static int batadv_transtable_global_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_tt_global_seq_print_text, net_dev); } @@ -277,6 +281,7 @@ static int batadv_transtable_global_open(struct inode *inode, struct file *file) static int batadv_bla_claim_table_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_bla_claim_table_seq_print_text, net_dev); } @@ -285,6 +290,7 @@ static int batadv_bla_backbone_table_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_bla_backbone_table_seq_print_text, net_dev); } @@ -300,6 +306,7 @@ static int batadv_bla_backbone_table_open(struct inode *inode, static int batadv_dat_cache_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_dat_cache_seq_print_text, net_dev); } #endif @@ -307,6 +314,7 @@ static int batadv_dat_cache_open(struct inode *inode, struct file *file) static int batadv_transtable_local_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_tt_local_seq_print_text, net_dev); } @@ -319,6 +327,7 @@ struct batadv_debuginfo { static int batadv_nc_nodes_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_nc_nodes_seq_print_text, net_dev); } #endif diff --git a/distributed-arp-table.c b/distributed-arp-table.c index aa5d494..dcd99b2 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -662,6 +662,7 @@ static void batadv_dat_tvlv_container_update(struct batadv_priv *bat_priv) void batadv_dat_status_update(struct net_device *net_dev) { struct batadv_priv *bat_priv = netdev_priv(net_dev); + batadv_dat_tvlv_container_update(bat_priv); } diff --git a/network-coding.c b/network-coding.c index a9546fe..40a2fc4 100644 --- a/network-coding.c +++ b/network-coding.c @@ -86,6 +86,7 @@ static void batadv_nc_tvlv_container_update(struct batadv_priv *bat_priv) void batadv_nc_status_update(struct net_device *net_dev) { struct batadv_priv *bat_priv = netdev_priv(net_dev); + batadv_nc_tvlv_container_update(bat_priv); } diff --git a/sysfs.c b/sysfs.c index 1ebb0d9..f51b484 100644 --- a/sysfs.c +++ b/sysfs.c @@ -29,12 +29,14 @@ static struct net_device *batadv_kobj_to_netdev(struct kobject *obj) { struct device *dev = container_of(obj->parent, struct device, kobj); + return to_net_dev(dev); } static struct batadv_priv *batadv_kobj_to_batpriv(struct kobject *obj) { struct net_device *net_dev = batadv_kobj_to_netdev(obj); + return netdev_priv(net_dev); } @@ -124,6 +126,7 @@ ssize_t batadv_store_##_name(struct kobject *kobj, \ { \ struct net_device *net_dev = batadv_kobj_to_netdev(kobj); \ struct batadv_priv *bat_priv = netdev_priv(net_dev); \ + \ return __batadv_store_bool_attr(buff, count, _post_func, attr, \ &bat_priv->_name, net_dev); \ } @@ -133,6 +136,7 @@ ssize_t batadv_show_##_name(struct kobject *kobj, \ struct attribute *attr, char *buff) \ { \ struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj); \ + \ return sprintf(buff, "%s\n", \ atomic_read(&bat_priv->_name) == 0 ? \ "disabled" : "enabled"); \ @@ -155,6 +159,7 @@ ssize_t batadv_store_##_name(struct kobject *kobj, \ { \ struct net_device *net_dev = batadv_kobj_to_netdev(kobj); \ struct batadv_priv *bat_priv = netdev_priv(net_dev); \ + \ return __batadv_store_uint_attr(buff, count, _min, _max, \ _post_func, attr, \ &bat_priv->_name, net_dev); \ @@ -165,6 +170,7 @@ ssize_t batadv_show_##_name(struct kobject *kobj, \ struct attribute *attr, char *buff) \ { \ struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj); \ + \ return sprintf(buff, "%i\n", atomic_read(&bat_priv->_name)); \ } \ @@ -188,6 +194,7 @@ ssize_t batadv_store_vlan_##_name(struct kobject *kobj, \ size_t res = __batadv_store_bool_attr(buff, count, _post_func, \ attr, &vlan->_name, \ bat_priv->soft_iface); \ + \ batadv_softif_vlan_free_ref(vlan); \ return res; \ } @@ -202,6 +209,7 @@ ssize_t batadv_show_vlan_##_name(struct kobject *kobj, \ size_t res = sprintf(buff, "%s\n", \ atomic_read(&vlan->_name) == 0 ? \ "disabled" : "enabled"); \ + \ batadv_softif_vlan_free_ref(vlan); \ return res; \ } @@ -324,12 +332,14 @@ static ssize_t batadv_show_bat_algo(struct kobject *kobj, struct attribute *attr, char *buff) { struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj); + return sprintf(buff, "%s\n", bat_priv->bat_algo_ops->name); } static void batadv_post_gw_reselect(struct net_device *net_dev) { struct batadv_priv *bat_priv = netdev_priv(net_dev); + batadv_gw_reselect(bat_priv); }

8 years, 10 months

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem

by postmaster＠open-mesh.org

The annotated tag, batman-adv-fix-for-davem has been updated to 2250ac0703771bc1d30ad673c8f83aac8b6b749e (tag) from 89396fd5282fb94fa67584b089204cf1fbc9191c (which is now obsolete) tagging 709de13f0c532fe9c468c094aff069a725ed57fe (commit) replaces v3.15-rc4 tagged by Antonio Quartulli on Sun May 11 09:14:39 2014 +0200 - Shortlog ------------------------------------------------------------ Included changes: - properly release neigh_ifinfo in batadv_iv_ogm_process_per_outif() - properly release orig_ifinfo->router when freeing orig_ifinfo - properly release neigh_node objects during periodic check - properly release neigh_info objects when the related hard_iface is free'd These changes are all very important because they fix some reference counting imbalances that lead to the impossibility of releasing the netdev object used by batman-adv on shutdown. The consequence is that such object cannot be destroyed by the networking stack (the refcounter does not reach zero) thus bringing the system in hanging state during a normal reboot operation or a network reconfiguration. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJTbyNlAAoJEEKTMo6mOh1VzeUQAJmcP73MMwdFDGfI+3DUD43Z ziaWzHK1/NAkERIJMYu/Nj9BPhFJ/JgYNoYGd4eZ+0IVzIidBKffpGvZYLKJaBBb kVzDt8sHgm7T+bmJdGK5zBCkCrQ66T1/7jF7evzWCtdmzAj9Ld+cJha6sZ6OLY4v WusFFHH2yQgzOGML52HdM99lIfZJu53sdQtYrMI7FpmObwmoBw1VQsmLsJbbFj0A XbFWYNOtQ0s8JvuHPnHB2gsczMXG6AdDuYdG1douOUryjsdg4AsKVWbPWaSuIyS9 ED6TiNsxtRt3A2YDgKrYmcGWHIc7CR4TE97DpdaB1xOEe/h0JPy8NEXaTiXifVi0 yWXaDZAl0J1gEKxda5foqIJZEScQyqWnAGFIIMVsxWxMpv9V3C+XaMgpgC5yQdoQ hgs6lv8U/w7Qevu4oaU2oq64C5ipyzheLuL+l9Ykwig9brJ9pqvBhEr34VDyyLnK l1VVQP5Y94gsPX2FuBaFgQ6oN3xjAkzFWDVKPtdYhMW7l93ER31KWgyJ53zK0Avk wl/h5Xvep7vgA1pvyiu7Lom47QX2SVY3Xt6vsJ42qrR9bp1sLZ+piZaSBPTSuNmo YySwgku6QlQfCFThh09zjuQ8+zwlq5Enjp+fvy/NtzEhTzK1gmknrQo0QF+Fj1Fj 5yz30/XWjUTn1dtBNeBw =GsPT -----END PGP SIGNATURE----- Simon Wunderlich (4): batman-adv: fix neigh_ifinfo imbalance batman-adv: fix neigh reference imbalance batman-adv: always run purge_orig_neighbors batman-adv: fix removing neigh_ifinfo ----------------------------------------------------------------------- -- linux integration

8 years, 10 months

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem

by postmaster＠open-mesh.org

The annotated tag, batman-adv-fix-for-davem has been updated to 89396fd5282fb94fa67584b089204cf1fbc9191c (tag) from 799128ed05691559b3ccb863b6f4de1a8305514e (which is now obsolete) tagging 34ea5d1f43f6afa22e10a5089e889520482577ba (commit) replaces v3.15-rc4 tagged by Antonio Quartulli on Sun May 11 09:06:44 2014 +0200 - Shortlog ------------------------------------------------------------ Included changes: - properly release neigh_ifinfo in batadv_iv_ogm_process_per_outif() - properly release orig_ifinfo->router when freeing orig_ifinfo - properly release neigh_node objects during periodic check - properly release neigh_info objects when the related hard_iface is free'd These changes are all very important because they fix some reference counting imbalances that lead to the impossibility of releasing the netdev object used by batman-adv on shutdown. The consequence is that such object cannot be destroyed by the networking stack (the refcounter does not reach zero) thus bringing the system in hanging state during a normal reboot operation or a network reconfiguration. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJTbyGMAAoJEEKTMo6mOh1V5cUP/juJaNong90G1bjIWMagRJgU PcHQiqTYm1PaWMYz5D7Bd3evvZEiKSCnOQE7LG3rb0S2pb7Vya1JoFm+uAMYrYpP VsppkP/evPRsr0TiboGxZVogUt3bKoibqvuDXv5t9O7KlZbt0FVsV2KK8wBm3f08 byWzOq/Bl6zIdTjYMthyFqc2tjy5uk2ZUMZM+uZfIe7Knn85WvKendEf/JOjc9wX P0Kf89gmHU3lTG8kfeRyhphxMixBTKi+sP+nwODtnsKBns4K2S+q1fpg9N7aIah6 TH5BVWGPy+B02DXNF0f6m+HPB0j0BJ7C57jTVdu1ZjWILjsI1Wma1cvsZYONThjm XL4PeKEqSh8eVwTLalOWui8iQxEWpKKf0SzvWvC04Q96he2EbjJeZ9MHGCK8MUC3 QGFnYggOAMyIPJbZCucfZWGXJy37gOHMoyVYF2deTBt42UGO/eUmRNVC89yrXNrz RQNqEnp45wMvcF3coURDks5PfvjLgAV5oMO1gS1582V7+K2fpdixNho0pvt5KZLf LFtZQI321kSL+650uBlXHch7nHEJfWHOuFNRWz8clrE4GgiEo5z0WYzFLxj36Ava MmQAdeJ2nAUQyuDv9n3D+dlesdYaBoSGT2Qitej9Umk7r0szXBGQJupYGooFZB0f l+pkXiJwEU7japLCv3n7 =/69E -----END PGP SIGNATURE----- Simon Wunderlich (4): batman-adv: fix neigh_ifinfo imbalance batman-adv: fix neigh reference imbalance batman-adv: always run purge_orig_neighbors batman-adv: fix removing neigh_ifinfo ----------------------------------------------------------------------- -- linux integration

8 years, 10 months

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem

by postmaster＠open-mesh.org

The annotated tag, batman-adv-fix-for-davem has been updated to 799128ed05691559b3ccb863b6f4de1a8305514e (tag) from 1516876446d1bea435d580c92f71e9d0efc9d8ba (which is now obsolete) tagging 05191f523653461ca6a4e4fb38012e0d8f3c5641 (commit) replaces v3.15-rc4 tagged by Antonio Quartulli on Sat May 10 17:38:03 2014 +0200 - Shortlog ------------------------------------------------------------ Included changes: - properly release neigh_ifinfo in batadv_iv_ogm_process_per_outif() - properly release orig_ifinfo->router when freeing orig_ifinfo - properly release neigh_node objects during periodic check - properly release neigh_info objects when the related hard_iface is free'd These changes are all very important because they fix some reference counting imbalances that lead to the impossibility of releasing the netdev object used by batman-adv on shutdown. The consequence is that such object cannot be destroyed by the networking stack (the refcounter does not reach zero) thus bringing the system in hanging state during a normal reboot operation or a network reconfiguration. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJTbkfgAAoJEEKTMo6mOh1VuCQP/irdeizexdYNCquHH9c+82J5 BMN1g+0qfSG1/3CIOx8mSlHBfqOGkpNyBtXOjaPBhWgtA70SgwOjOVfEKW9Fj5Gr WSpQdK9ZX5G4f5QaB465QOCbvo+ev1XxDrxOOlplNiB2iLz28sYfnLXWqzfizvBc jndXDeXLWPrsb79PsO8nSY4DsfzmBT8HKT6yBqNsBAmlBcv1lBv237PtAkmqDuAU ku8FcXausoBbnEug1DpafevW92tJdhh/v8TyJagWsDkYXyGEhmkXV1vejw96BNIA wQ+ohtpa3Kl3ozUyz5m+Eq/B9P2Yd3vYAmQs9e4KnXWLxXm0YgjR/fcUymVmQkNL cDIYt/irW9HJK16S45eLrKwcAyg3xW6bkeW9lxiupTlV834KBuXBmykD6QqN5UrN iQIxXNLO72aVfFJUbUAFhqde4bvxyrXDp4sr1fDsZ6mTJ56UgAm4NftxTL4W2FuZ B6+VOHqMEnfJRMR/m4lfUiFq9zibMa3zvpqyUhIkI7qmpPCQ7V2yUYBfrsOrLYV/ Vb+ersYlZMlCUZ24ggy/Dlyoc3beMwdMIuR0L+RGG2iJncHqbEvd7g/koQ0OVv/o RL3tmApFaM7jsalT6HumEosdIyh7y650b54sP+DrPZpdZOEzRXL9ND94ayZgKXOM uI1YOX0cEbD7S0HRuYDe =JXwp -----END PGP SIGNATURE----- Simon Wunderlich (4): batman-adv: fix neigh_ifinfo imbalance batman-adv: fix neigh reference imbalance batman-adv: always run purge_orig_neighbors batman-adv: fix removing neigh_ifinfo ----------------------------------------------------------------------- -- linux integration

8 years, 10 months

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, created. batman-adv-fix-for-davem

by postmaster＠open-mesh.org

The annotated tag, batman-adv-fix-for-davem has been created at 1516876446d1bea435d580c92f71e9d0efc9d8ba (tag) tagging 29bcc8064fc0b82bc708c09577d550923b954e5a (commit) replaces v3.15-rc4 tagged by Antonio Quartulli on Sat May 10 16:54:42 2014 +0200 - Shortlog ------------------------------------------------------------ Included changes: - properly release neigh_ifinfo in batadv_iv_ogm_process_per_outif() - properly release orig_ifinfo->router when freeing orig_ifinfo - properly release neigh_node objects during periodic check - properly release neigh_info objects when the related hard_iface is free'd These changes are all very important because they fix some reference counting imbalances that lead to the impossibility of releasing the netdev object used by batman-adv on shutdown. The consequence is that such object cannot be destroyed by the networking stack (the refcounter does not reach zero) thus bringing the system in hanging state during a normal reboot operation or a network reconfiguration. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJTbkFIAAoJEEKTMo6mOh1VsIoQAKD6Uf7HV3+AZJzQO+62/dkh 7LTAQQT2P4S0wHlIQ9/9aEo2ymT7hYa8pQ9H9HBhkpkZFT/xdvW6Nw77+uSbBHbc qCNmlAy6Nifdn3uqDbfkLKoaRkPJEWUyRehW/5L0JqtjiCv4n5HWOSgYsfkZvo5Q 8p59ps0mhTN/TNKLmG0Y6EHMe72opgh2TvEm1cmeLRFmKprIKPtOqEi1Y/ZDwt/j 3Mqj7KLc9xZf6k1q1LUNOZSYR7XWOL76Iopu8ZG+1cx3SRvRP6M5s5uWe4kTPnrY otEvIJE506y2anu26NBZk2OGBPNmHYN3tL05ME7PJLA7qneiB3+E+k9SeuZ5bVP4 VBT6mB4+DaxKYDW1nr7lD2ITZiqYSw2mLddlSQ5yTgcHAAnmWMGEVcoG1o7wXRfp xU91dlVQl5MeQi/7or3j3Ji7x0FjmDhkgf9XEA4k+nt8FxyEpcTDOjbtC2vWc8vE 2Ln96MzVMevrJInB2JyPM3uGGyq0aG5swOvzOT/7/HfZtDsiJoRKdaeyY0LFmL4d +kX5uHyN7yw12qY/C1+cc/SpxSPe7OC0gJNOBEyRNMyt6U0ZxqO9l5ZCMFZf2C6T 6EqciU6e5AxMcaW6V6ksjSUmX0uWQ+28Fj2+ZY6Br7PN+Trwj4orFfWYkuU2OM/W j4/Y7ymvwQgrzT7b/1h9 =O/OT -----END PGP SIGNATURE----- Simon Wunderlich (4): batman-adv: fix neigh_ifinfo imbalance batman-adv: fix neigh reference imbalance batman-adv: always run purge_orig_neighbors batman-adv: fix removing neigh_ifinfo ----------------------------------------------------------------------- -- linux integration

8 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2014