commits March 2014

commits@lists.open-mesh.org

1 participants
69 discussions

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem
by postmaster＠open-mesh.org 22 Mar '14

22 Mar '14

The annotated tag, batman-adv-for-davem has been updated to 05c065eaeeda34b7f26ce587aac8c2c37e3468dc (tag) from ebb9dba9febd77483e89d7727e9eac7108a2a7a7 (which is now obsolete) tagging 3f2532fcde67faf496fa21c5c04c5e8cf73c9e01 (commit) replaces v3.14-rc6 tagged by Antonio Quartulli on Sat Mar 22 09:19:09 2014 +0100 - Shortlog ------------------------------------------------------------ Included changes: - use ether_addr_copy instead of memcpy when possible - implement new multicast packet optimisation - improve several kerneldoc sections - minor code cleanups -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJTLUeCAAoJEEKTMo6mOh1Vah8P/jX6/GIN90XNpoiqP2xbLtss pIrmVJuS+CPFjk3qixBxsvd3hP0/rXYg1n1UFz6HKgZ7Iz3qIROlAvuL3G0ByFnK K2ec4qkOPxh7UW1Z2Vm/4dwhith0xUVfaFZZR7OiDQBkrMNhJY9hhN4efJERsIYA UiaYwcQejIsyqrUD+5UFjYatooCVq1CxT0vqYhb/kGXOLYrmO5SRxyQTZFIJyQt8 3OgBl4YkOo80gyz1MaeY8AAqrMHUlf4+KQWpwAtwnzdH0guKL7+pYDbQ+g5c/lVC oihUghwLe4R69RbC7YKGBRRBla9xmZwiQaCLDZJDOXdntVidZ6Elmvke2P9RwVMR PQlYaIgWzx6u5vGYxpn2XNL6gCIIER3RFLuDX5k3aZDtoVQZ/roKf0+A6qcWr8oB tNxHV34pJg8rRB3NWnEkaLRSlOaDNYxLgvXsZkCoA15t24TuOfWvpyr5+Pp44q4r vjptxSyBcWsKbtTwq7iErhsVvJc4zMllCHstYiU8bwf0f9kCPDh2ymPr+xOBE052 U7GM6mzRg1XGeJ/xNVuVfcNITlQ1Y1vHcRegeiGcjR3Yn5EiEugEl0LdSrBPz47f 7LKlNY87sMQi+1Wj+wvdvUsdL/QZBvagHXDWEEbjWs9IPExzqA22YL0cHtzVw27o baFLdgiwS7PCvw6gP+qT =1hhh -----END PGP SIGNATURE----- Antonio Quartulli (4): batman-adv: prefer ether_addr_copy to memcpy batman-adv: add kerneldoc for dst_hint argument batman-adv: improve the TT flags documentation batman-adv: improve DAT documentation David S. Miller (1): Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Fengguang Wu (1): batman-adv: fix coccinelle warnings Linus Lüssing (8): batman-adv: use vlan_/eth_hdr() instead of skb->data in interface_tx path batman-adv: remove obsolete skb_reset_mac_header() in batadv_bla_tx() batman-adv: Multicast Listener Announcements via Translation Table batman-adv: introduce capability initialization bitfield batman-adv: Announce new capability via multicast TVLV batman-adv: Modified forwarding behaviour for multicast packets batman-adv: Add IPv4 link-local/IPv6-ll-all-nodes multicast support batman-adv: Send multicast packets to nodes with a WANT_ALL flag Marek Lindner (1): batman-adv: call unregister_netdev() to have it handle the locking for us Simon Wunderlich (2): batman-adv: fix a few kerneldoc inconsistencies batman-adv: Start new development cycle stephen hemminger (1): net: remove unnecessary return's ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; branch, merge/master, updated. v3.14-rc1-2114-ge01abef
by postmaster＠open-mesh.org 22 Mar '14

22 Mar '14

The following commit has been merged in the merge/master branch: commit e01abefce143a2d3f99695e5e66d6155d9799ed3 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Sat Mar 22 09:17:22 2014 +0100 batman-adv: fix MCAST Kconfig option Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index d8ee74c..11660a3 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -52,6 +52,7 @@ config BATMAN_ADV_NC config BATMAN_ADV_MCAST bool "Multicast optimisation" + depends on BATMAN_ADV default n help This option enables the multicast optimisation which aims to -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem
by postmaster＠open-mesh.org 22 Mar '14

22 Mar '14

The annotated tag, batman-adv-for-davem has been updated to ebb9dba9febd77483e89d7727e9eac7108a2a7a7 (tag) from ac94690016099fa1fc984063c1d2e6e397c4eb93 (which is now obsolete) tagging ace3a2f4ed411ae12517e24e1057cfd621754f97 (commit) replaces v3.14-rc6 tagged by Antonio Quartulli on Sat Mar 22 09:03:16 2014 +0100 - Shortlog ------------------------------------------------------------ Included changes: - use ether_addr_copy instead of memcpy when possible - implement new multicast packet optimisation - improve several kerneldoc sections - minor code cleanups -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJTLUVZAAoJEEKTMo6mOh1VZa0P/2lSPJtB+SKdBrYu0idzExw5 jpU/73qeM4mKQ63CmtsIaNs3LX60ZN6HKf0ellhdoV09M/VW4EjySUAlDhGMEo3E L3Mnlwz+ffHPMz8p4J0jLm1izfpzIDKzp9L1ZlQ60CSCkyXrQGXZxvl9T3M+XczP H2Px6XvHyXshQU9/8+PN8mJLHn0Zu2pKuxGE64g6T6vnr8Za5VP+SMugJZMcHYAh DcDp2ugMCQeX8SD7UJ15potAW/3MHBtVUVs7w15HHdezw5mc+7ntTRInjW8M2B2y l9hyVrTshCnEmQijG3ODAfgclwLYc4LYuSvo1GDuOc0e1Dd9O7vS+jTOio7i7Jmx 99NKReZiTkFuLvJ7EgdnGV1xIJZUYKIgFNzjQKw23H7ydTV66LmYTvMF8MwzVFHl iqVQlNRcnQu8Q0yl0RTfWxF9p/PAwB6DEAyCYKgtXJ6z11JGWZSSPkHyv6Juy538 pNYZEtfC7s2bz0Hmovu55LVgdPWDYG6hpwTahUoucRpon5aOW3slZys9IW0aw0mg w9IrIZf5wx5u2N2YIRZqH0cxbkHzBCNxRYVjB4JgDXuMwtD7i3CqdIDAuxJl8aHA tbOUYax71TyFnjJp+obW84iC0ky4fBpzIPgo4iggta+hUwRZdPqr96CFivUtllN6 MZXjGJncEP9it8o8EChJ =DSXh -----END PGP SIGNATURE----- Antonio Quartulli (4): batman-adv: prefer ether_addr_copy to memcpy batman-adv: add kerneldoc for dst_hint argument batman-adv: improve the TT flags documentation batman-adv: improve DAT documentation David S. Miller (1): Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Fengguang Wu (1): batman-adv: fix coccinelle warnings Linus Lüssing (8): batman-adv: use vlan_/eth_hdr() instead of skb->data in interface_tx path batman-adv: remove obsolete skb_reset_mac_header() in batadv_bla_tx() batman-adv: Multicast Listener Announcements via Translation Table batman-adv: introduce capability initialization bitfield batman-adv: Announce new capability via multicast TVLV batman-adv: Modified forwarding behaviour for multicast packets batman-adv: Add IPv4 link-local/IPv6-ll-all-nodes multicast support batman-adv: Send multicast packets to nodes with a WANT_ALL flag Marek Lindner (1): batman-adv: call unregister_netdev() to have it handle the locking for us Simon Wunderlich (2): batman-adv: fix a few kerneldoc inconsistencies batman-adv: Start new development cycle stephen hemminger (1): net: remove unnecessary return's ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; branch, merge/master, updated. v3.14-rc1-2113-ge2ce130
by postmaster＠open-mesh.org 22 Mar '14

22 Mar '14

The following commit has been merged in the merge/master branch: commit e2ce130c5402f64c5be5962d74c04f6313dc17b7 Merge: 5409baf56e1c58c331ade23ab79f94cc66eaea6c b08dc3d9452d28944e7db09c2005c633b63f55e9 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Fri Mar 21 23:39:44 2014 +0100 Merge commit 'b08dc3d9452d28944e7db09c2005c633b63f55e9' into merge/master Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Conflicts: net/batman-adv/compat.h diff --combined net/batman-adv/multicast.c index 998b429,8c7ca81..8c7ca81 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@@ -10,6 -10,9 +10,9 @@@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" @@@ -27,7 -30,7 +30,7 @@@ * Collect multicast addresses of the local multicast listeners * on the given soft interface, dev, in the given mcast_list. * - * Return -ENOMEM on memory allocation error or the number of + * Returns -ENOMEM on memory allocation error or the number of * items added to the mcast_list otherwise. */ static int batadv_mcast_mla_softif_get(struct net_device *dev, @@@ -59,7 -62,7 +62,7 @@@ * @mcast_addr: the multicast address to check * @mcast_list: the list with multicast addresses to search in * - * Return true if the given address is already in the given list. + * Returns true if the given address is already in the given list. * Otherwise returns false. */ static bool batadv_mcast_mla_is_duplicate(uint8_t *mcast_addr, @@@ -78,7 -81,7 +81,7 @@@ * batadv_mcast_mla_list_free - free a list of multicast addresses * @mcast_list: the list to free * - * Remove and free all items in the given mcast_list. + * Removes and frees all items in the given mcast_list. */ static void batadv_mcast_mla_list_free(struct hlist_head *mcast_list) { @@@ -96,7 -99,7 +99,7 @@@ * @bat_priv: the bat priv with all the soft interface information * @mcast_list: a list of addresses which should _not_ be removed * - * Retract the announcement of any multicast listener from the + * Retracts the announcement of any multicast listener from the * translation table except the ones listed in the given mcast_list. * * If mcast_list is NULL then all are retracted. @@@ -128,7 -131,7 +131,7 @@@ static void batadv_mcast_mla_tt_retract * @bat_priv: the bat priv with all the soft interface information * @mcast_list: a list of addresses which are going to get added * - * Add multicast listener announcements from the given mcast_list to the + * Adds multicast listener announcements from the given mcast_list to the * translation table if they have not been added yet. */ static void batadv_mcast_mla_tt_add(struct batadv_priv *bat_priv, @@@ -156,61 -159,34 +159,34 @@@ } /** - * batadv_mcast_get_bridge - get the bridge interface on our soft interface + * batadv_mcast_has_bridge - check whether the soft-iface is bridged * @bat_priv: the bat priv with all the soft interface information * - * Return the next bridge interface on top of our soft interface and increase - * its refcount. If no such bridge interface exists, then return NULL. + * Checks whether there is a bridge on top of our soft interface. Returns + * true if so, false otherwise. */ - static struct net_device * - batadv_mcast_get_bridge(struct batadv_priv *bat_priv) + static bool batadv_mcast_has_bridge(struct batadv_priv *bat_priv) { struct net_device *upper = bat_priv->soft_iface; rcu_read_lock(); do { upper = netdev_master_upper_dev_get_rcu(upper); } while (upper && !(upper->priv_flags & IFF_EBRIDGE)); - - if (upper) - dev_hold(upper); - rcu_read_unlock(); return upper; } /** * batadv_mcast_mla_tvlv_update - update multicast tvlv * @bat_priv: the bat priv with all the soft interface information * - * Update the own multicast tvlv with our current multicast related settings, + * Updates the own multicast tvlv with our current multicast related settings, * capabilities and inabilities. * - * Return true if the tvlv container is registered afterwards. Otherwise return - * false. + * Returns true if the tvlv container is registered afterwards. Otherwise + * returns false. */ static bool batadv_mcast_mla_tvlv_update(struct batadv_priv *bat_priv) { @@@ -247,7 -223,7 +223,7 @@@ * batadv_mcast_mla_update - update the own MLAs * @bat_priv: the bat priv with all the soft interface information * - * Update the own multicast listener announcements in the translation + * Updates the own multicast listener announcements in the translation * table as well as the own, announced multicast tvlv container. */ void batadv_mcast_mla_update(struct batadv_priv *bat_priv) @@@ -277,11 -253,11 +253,11 @@@ out * @skb: the IPv4 packet to check * @is_unsnoopable: stores whether the destination is snoopable * - * Check whether the given IPv4 packet has the potential to - * be forwarded with a mode more optimal than classic flooding. + * Checks whether the given IPv4 packet has the potential to be forwarded with a + * mode more optimal than classic flooding. * - * If so then return 0. Otherwise -EINVAL is returned or -ENOMEM if we are - * out of memory. + * If so then returns 0. Otherwise -EINVAL is returned or -ENOMEM in case of + * memory allocation failure. */ static int batadv_mcast_forw_mode_check_ipv4(struct batadv_priv *bat_priv, struct sk_buff *skb, @@@ -315,11 -291,11 +291,11 @@@ * @skb: the IPv6 packet to check * @is_unsnoopable: stores whether the destination is snoopable * - * Check whether the given IPv6 packet has the potential to - * be forwarded with a mode more optimal than classic flooding. + * Checks whether the given IPv6 packet has the potential to be forwarded with a + * mode more optimal than classic flooding. * - * If so then return 0. Otherwise -EINVAL is returned or -ENOMEM if we are - * out of memory. + * If so then returns 0. Otherwise -EINVAL is returned or -ENOMEM if we are out + * of memory. */ static int batadv_mcast_forw_mode_check_ipv6(struct batadv_priv *bat_priv, struct sk_buff *skb, @@@ -336,8 -312,7 +312,7 @@@ /* TODO: Implement Multicast Router Discovery (RFC4286), * then allow scope > link local, too */ - if (IPV6_ADDR_MC_SCOPE(&ip6hdr->daddr) != - IPV6_ADDR_SCOPE_LINKLOCAL) + if (IPV6_ADDR_MC_SCOPE(&ip6hdr->daddr) != IPV6_ADDR_SCOPE_LINKLOCAL) return -EINVAL; /* link-local-all-nodes multicast listeners behind a bridge are @@@ -355,11 -330,11 +330,11 @@@ * @skb: the multicast frame to check * @is_unsnoopable: stores whether the destination is snoopable * - * Check whether the given multicast ethernet frame has the potential to - * be forwarded with a mode more optimal than classic flooding. + * Checks whether the given multicast ethernet frame has the potential to be + * forwarded with a mode more optimal than classic flooding. * - * If so then return 0. Otherwise -EINVAL is returned or -ENOMEM if we are - * out of memory. + * If so then returns 0. Otherwise -EINVAL is returned or -ENOMEM if we are out + * of memory. */ static int batadv_mcast_forw_mode_check(struct batadv_priv *bat_priv, struct sk_buff *skb, @@@ -390,9 -365,9 +365,9 @@@ * @bat_priv: the bat priv with all the soft interface information * @ethhdr: ethernet header of a packet * - * Return the number of nodes which want all IPv4 multicast traffic if - * the given ethhdr is from an IPv4 packet or the number of nodes which want - * all IPv6 traffic if it matches an IPv6 packet. + * Returns the number of nodes which want all IPv4 multicast traffic if the + * given ethhdr is from an IPv4 packet or the number of nodes which want all + * IPv6 traffic if it matches an IPv6 packet. */ static int batadv_mcast_forw_want_all_ip_count(struct batadv_priv *bat_priv, struct ethhdr *ethhdr) @@@ -413,7 -388,7 +388,7 @@@ * @bat_priv: the bat priv with all the soft interface information * @ethhdr: the ether header containing the multicast destination * - * Return an orig_node matching the multicast address provided by ethhdr + * Returns an orig_node matching the multicast address provided by ethhdr * via a translation table lookup. This increases the returned nodes refcount. */ static struct batadv_orig_node * @@@ -428,26 -403,26 +403,26 @@@ batadv_mcast_forw_tt_node_get(struct ba * batadv_mcast_want_forw_ipv4_node_get - get a node with an ipv4 flag * @bat_priv: the bat priv with all the soft interface information * - * Return an orig_node which has the BATADV_MCAST_WANT_ALL_IPV4 flag set - * and increase its refcount. + * Returns an orig_node which has the BATADV_MCAST_WANT_ALL_IPV4 flag set and + * increases its refcount. */ static struct batadv_orig_node * batadv_mcast_forw_ipv4_node_get(struct batadv_priv *bat_priv) { - struct batadv_orig_node *orig_node; + struct batadv_orig_node *tmp_orig_node, *orig_node = NULL; rcu_read_lock(); - hlist_for_each_entry_rcu(orig_node, + hlist_for_each_entry_rcu(tmp_orig_node, &bat_priv->mcast.want_all_ipv4_list, mcast_want_all_ipv4_node) { - if (atomic_inc_not_zero(&orig_node->refcount)) - goto unlock; - } - - orig_node = NULL; + if (!atomic_inc_not_zero(&orig_node->refcount)) + continue; - unlock: + orig_node = tmp_orig_node; + break; + } rcu_read_unlock(); + return orig_node; } @@@ -455,26 -430,26 +430,26 @@@ * batadv_mcast_want_forw_ipv6_node_get - get a node with an ipv6 flag * @bat_priv: the bat priv with all the soft interface information * - * Return an orig_node which has the BATADV_MCAST_WANT_ALL_IPV6 flag set - * and increase its refcount. + * Returns an orig_node which has the BATADV_MCAST_WANT_ALL_IPV6 flag set + * and increases its refcount. */ static struct batadv_orig_node * batadv_mcast_forw_ipv6_node_get(struct batadv_priv *bat_priv) { - struct batadv_orig_node *orig_node; + struct batadv_orig_node *tmp_orig_node, *orig_node = NULL; rcu_read_lock(); - hlist_for_each_entry_rcu(orig_node, + hlist_for_each_entry_rcu(tmp_orig_node, &bat_priv->mcast.want_all_ipv6_list, mcast_want_all_ipv6_node) { - if (atomic_inc_not_zero(&orig_node->refcount)) - goto unlock; - } - - orig_node = NULL; + if (!atomic_inc_not_zero(&orig_node->refcount)) + continue; - unlock: + orig_node = tmp_orig_node; + break; + } rcu_read_unlock(); + return orig_node; } @@@ -483,9 -458,9 +458,9 @@@ * @bat_priv: the bat priv with all the soft interface information * @ethhdr: an ethernet header to determine the protocol family from * - * Return an orig_node which has the BATADV_MCAST_WANT_ALL_IPV4 or - * BATADV_MCAST_WANT_ALL_IPV6 flag, depending on the provided ethhdr, set - * and increase its refcount. + * Returns an orig_node which has the BATADV_MCAST_WANT_ALL_IPV4 or + * BATADV_MCAST_WANT_ALL_IPV6 flag, depending on the provided ethhdr, set and + * increases its refcount. */ static struct batadv_orig_node * batadv_mcast_forw_ip_node_get(struct batadv_priv *bat_priv, @@@ -506,26 -481,26 +481,26 @@@ * batadv_mcast_want_forw_unsnoop_node_get - get a node with an unsnoopable flag * @bat_priv: the bat priv with all the soft interface information * - * Return an orig_node which has the BATADV_MCAST_WANT_ALL_UNSNOOPABLES flag set - * and increase its refcount. + * Returns an orig_node which has the BATADV_MCAST_WANT_ALL_UNSNOOPABLES flag + * set and increases its refcount. */ static struct batadv_orig_node * batadv_mcast_forw_unsnoop_node_get(struct batadv_priv *bat_priv) { - struct batadv_orig_node *orig_node; + struct batadv_orig_node *tmp_orig_node, *orig_node = NULL; rcu_read_lock(); - hlist_for_each_entry_rcu(orig_node, + hlist_for_each_entry_rcu(tmp_orig_node, &bat_priv->mcast.want_all_unsnoopables_list, mcast_want_all_unsnoopables_node) { - if (atomic_inc_not_zero(&orig_node->refcount)) - goto unlock; - } - - orig_node = NULL; + if (!atomic_inc_not_zero(&orig_node->refcount)) + continue; - unlock: + orig_node = tmp_orig_node; + break; + } rcu_read_unlock(); + return orig_node; } @@@ -535,7 -510,7 +510,7 @@@ * @skb: The multicast packet to check * @orig: an originator to be set to forward the skb to * - * Return the forwarding mode as enum batadv_forw_mode and in case of + * Returns the forwarding mode as enum batadv_forw_mode and in case of * BATADV_FORW_SINGLE set the orig to the single originator the skb * should be forwarded to. */ @@@ -543,9 -518,9 +518,9 @@@ enum batadv_forw_mod batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, struct batadv_orig_node **orig) { - struct ethhdr *ethhdr; - bool is_unsnoopable = false; int ret, tt_count, ip_count, unsnoop_count, total_count; + bool is_unsnoopable = false; + struct ethhdr *ethhdr; ret = batadv_mcast_forw_mode_check(bat_priv, skb, &is_unsnoopable); if (ret == -ENOMEM) diff --combined net/batman-adv/multicast.h index a76bc3a,73b5d45..73b5d45 --- a/net/batman-adv/multicast.h +++ b/net/batman-adv/multicast.h @@@ -10,6 -10,9 +10,9 @@@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_MULTICAST_H_ @@@ -17,10 -20,10 +20,10 @@@ /** * batadv_forw_mode - the way a packet should be forwarded as - * @BATADV_FORW_ALL: forward the packet to all nodes - * (currently via classic flooding) - * @BATADV_FORW_SINGLE: forward the packet to a single node - * (currently via the BATMAN unicast routing protocol) + * @BATADV_FORW_ALL: forward the packet to all nodes (currently via classic + * flooding) + * @BATADV_FORW_SINGLE: forward the packet to a single node (currently via the + * BATMAN unicast routing protocol) * @BATADV_FORW_NONE: don't forward, drop it */ enum batadv_forw_mode { diff --combined net/batman-adv/translation-table.c index dab5c39,d636bde..d636bde --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -206,16 -206,15 +206,15 @@@ int batadv_tt_global_hash_count(struct const uint8_t *addr, unsigned short vid) { struct batadv_tt_global_entry *tt_global_entry; - int count = 0; + int count; tt_global_entry = batadv_tt_global_hash_find(bat_priv, addr, vid); if (!tt_global_entry) - goto out; + return 0; count = atomic_read(&tt_global_entry->orig_list_count); batadv_tt_global_entry_free_ref(tt_global_entry); - out: return count; } -- linux integration

1 0

[batman-adv] master's head updated: batman-adv: fix more code style (b08dc3d)
by postmaster＠open-mesh.org 21 Mar '14

21 Mar '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 6f54268 batman-adv: remove useless goto 9ef7aad batman-adv: don't mess up with the netdev refcounting if not needed a36b345 batman-adv: fix multicast kerneldoc da22087 batman-adv: fix multicast kerneldoc 3b44ced batman-adv: fix multicast kerneldoc 076d6a6 batman-adv: fix multicast kerneldoc 5690930 batman-adv: fix multicast kerneldoc 04ff3a0 batman-adv: adjust copyright disclaimer in multicast files bc45afd batman-adv: fix code style 45dab5f batman-adv: fix more code style b08dc3d batman-adv: fix more code style

1 0

[batman-adv] next: batman-adv: fix more code style (b08dc3d)
by postmaster＠open-mesh.org 21 Mar '14

21 Mar '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit b08dc3d9452d28944e7db09c2005c633b63f55e9 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Wed Mar 19 18:57:35 2014 +0100 batman-adv: fix more code style - use common iteration style pattern when looking up an object Introduced by f2ed1502191a37abb39e3e2c80cca07f0f3bb411 ("batman-adv: Send multicast packets to nodes with a WANT_ALL flag") Cc: Linux Lüssing <linus.luessing(a)web.de> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- b08dc3d9452d28944e7db09c2005c633b63f55e9 multicast.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/multicast.c b/multicast.c index dfe4cd6..8c7ca81 100644 --- a/multicast.c +++ b/multicast.c @@ -409,20 +409,20 @@ batadv_mcast_forw_tt_node_get(struct batadv_priv *bat_priv, static struct batadv_orig_node * batadv_mcast_forw_ipv4_node_get(struct batadv_priv *bat_priv) { - struct batadv_orig_node *orig_node; + struct batadv_orig_node *tmp_orig_node, *orig_node = NULL; rcu_read_lock(); - hlist_for_each_entry_rcu(orig_node, + hlist_for_each_entry_rcu(tmp_orig_node, &bat_priv->mcast.want_all_ipv4_list, mcast_want_all_ipv4_node) { - if (atomic_inc_not_zero(&orig_node->refcount)) - goto unlock; - } - - orig_node = NULL; + if (!atomic_inc_not_zero(&orig_node->refcount)) + continue; -unlock: + orig_node = tmp_orig_node; + break; + } rcu_read_unlock(); + return orig_node; } @@ -436,20 +436,20 @@ unlock: static struct batadv_orig_node * batadv_mcast_forw_ipv6_node_get(struct batadv_priv *bat_priv) { - struct batadv_orig_node *orig_node; + struct batadv_orig_node *tmp_orig_node, *orig_node = NULL; rcu_read_lock(); - hlist_for_each_entry_rcu(orig_node, + hlist_for_each_entry_rcu(tmp_orig_node, &bat_priv->mcast.want_all_ipv6_list, mcast_want_all_ipv6_node) { - if (atomic_inc_not_zero(&orig_node->refcount)) - goto unlock; - } - - orig_node = NULL; + if (!atomic_inc_not_zero(&orig_node->refcount)) + continue; -unlock: + orig_node = tmp_orig_node; + break; + } rcu_read_unlock(); + return orig_node; }

1 0

[batman-adv] next: batman-adv: fix more code style (45dab5f)
by postmaster＠open-mesh.org 21 Mar '14

21 Mar '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 45dab5f5509023946793fc9d1d0566c12ca8bb52 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Wed Mar 19 18:57:34 2014 +0100 batman-adv: fix more code style - keep variable declarations in descending line length order - use common iteration style pattern when looking up an object Introduced by 86cb16e5ec1e2d75821006e8f4abbec66fb741ac ("batman-adv: Add IPv4 link-local/IPv6-ll-all-nodes multicast support") Cc: Linux Lüssing <linus.luessing(a)web.de> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 45dab5f5509023946793fc9d1d0566c12ca8bb52 multicast.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/multicast.c b/multicast.c index d67d75d..dfe4cd6 100644 --- a/multicast.c +++ b/multicast.c @@ -487,20 +487,20 @@ batadv_mcast_forw_ip_node_get(struct batadv_priv *bat_priv, static struct batadv_orig_node * batadv_mcast_forw_unsnoop_node_get(struct batadv_priv *bat_priv) { - struct batadv_orig_node *orig_node; + struct batadv_orig_node *tmp_orig_node, *orig_node = NULL; rcu_read_lock(); - hlist_for_each_entry_rcu(orig_node, + hlist_for_each_entry_rcu(tmp_orig_node, &bat_priv->mcast.want_all_unsnoopables_list, mcast_want_all_unsnoopables_node) { - if (atomic_inc_not_zero(&orig_node->refcount)) - goto unlock; - } - - orig_node = NULL; + if (!atomic_inc_not_zero(&orig_node->refcount)) + continue; -unlock: + orig_node = tmp_orig_node; + break; + } rcu_read_unlock(); + return orig_node; } @@ -518,9 +518,9 @@ enum batadv_forw_mode batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, struct batadv_orig_node **orig) { - struct ethhdr *ethhdr; - bool is_unsnoopable = false; int ret, tt_count, ip_count, unsnoop_count, total_count; + bool is_unsnoopable = false; + struct ethhdr *ethhdr; ret = batadv_mcast_forw_mode_check(bat_priv, skb, &is_unsnoopable); if (ret == -ENOMEM)

1 0

[batman-adv] next: batman-adv: fix code style (bc45afd)
by postmaster＠open-mesh.org 21 Mar '14

21 Mar '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit bc45afd7e885c362703573808dc73c72e67df395 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Wed Mar 19 18:57:33 2014 +0100 batman-adv: fix code style - don't split lines if shorter than 80 chars - don't use goto if there is no cleanup to perform Introduced by 90ad6a40c80323805be1e86504385de2bd861f0a ("batman-adv: Modified forwarding behaviour for multicast packets") Cc: Linux Lüssing <linus.luessing(a)web.de> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- bc45afd7e885c362703573808dc73c72e67df395 multicast.c | 3 +-- multicast.h | 8 ++++---- translation-table.c | 5 ++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/multicast.c b/multicast.c index 9a9e7f4..d67d75d 100644 --- a/multicast.c +++ b/multicast.c @@ -312,8 +312,7 @@ static int batadv_mcast_forw_mode_check_ipv6(struct batadv_priv *bat_priv, /* TODO: Implement Multicast Router Discovery (RFC4286), * then allow scope > link local, too */ - if (IPV6_ADDR_MC_SCOPE(&ip6hdr->daddr) != - IPV6_ADDR_SCOPE_LINKLOCAL) + if (IPV6_ADDR_MC_SCOPE(&ip6hdr->daddr) != IPV6_ADDR_SCOPE_LINKLOCAL) return -EINVAL; /* link-local-all-nodes multicast listeners behind a bridge are diff --git a/multicast.h b/multicast.h index 2861899..73b5d45 100644 --- a/multicast.h +++ b/multicast.h @@ -20,10 +20,10 @@ /** * batadv_forw_mode - the way a packet should be forwarded as - * @BATADV_FORW_ALL: forward the packet to all nodes - * (currently via classic flooding) - * @BATADV_FORW_SINGLE: forward the packet to a single node - * (currently via the BATMAN unicast routing protocol) + * @BATADV_FORW_ALL: forward the packet to all nodes (currently via classic + * flooding) + * @BATADV_FORW_SINGLE: forward the packet to a single node (currently via the + * BATMAN unicast routing protocol) * @BATADV_FORW_NONE: don't forward, drop it */ enum batadv_forw_mode { diff --git a/translation-table.c b/translation-table.c index dab5c39..d636bde 100644 --- a/translation-table.c +++ b/translation-table.c @@ -206,16 +206,15 @@ int batadv_tt_global_hash_count(struct batadv_priv *bat_priv, const uint8_t *addr, unsigned short vid) { struct batadv_tt_global_entry *tt_global_entry; - int count = 0; + int count; tt_global_entry = batadv_tt_global_hash_find(bat_priv, addr, vid); if (!tt_global_entry) - goto out; + return 0; count = atomic_read(&tt_global_entry->orig_list_count); batadv_tt_global_entry_free_ref(tt_global_entry); -out: return count; }

1 0

[batman-adv] next: batman-adv: adjust copyright disclaimer in multicast files (04ff3a0)
by postmaster＠open-mesh.org 21 Mar '14

21 Mar '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 04ff3a04f6fb58671e9ed180609019f5b4273526 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Wed Mar 19 18:57:32 2014 +0100 batman-adv: adjust copyright disclaimer in multicast files The URL to the FSF address has to be always reported in the copyright disclaimer. This is the accepted style in the networking branch. Introduced by e368857f66620b8483166e8e6556d9c87f9b3e71 ("batman-adv: Multicast Listener Announcements via Translation Table") Cc: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 04ff3a04f6fb58671e9ed180609019f5b4273526 multicast.c | 3 +++ multicast.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/multicast.c b/multicast.c index 53d82e2..9a9e7f4 100644 --- a/multicast.c +++ b/multicast.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" diff --git a/multicast.h b/multicast.h index a76bc3a..2861899 100644 --- a/multicast.h +++ b/multicast.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_MULTICAST_H_

1 0

[batman-adv] next: batman-adv: fix multicast kerneldoc (5690930)
by postmaster＠open-mesh.org 21 Mar '14

21 Mar '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 5690930ceb5997c8e5cf93ec5da39e4d9fa065aa Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Wed Mar 19 18:57:31 2014 +0100 batman-adv: fix multicast kerneldoc The kerneldoc should always use the third person singular in the long function description. Moreover it should always try use up to 80 chars per line. Introduced by f2ed1502191a37abb39e3e2c80cca07f0f3bb411 ("batman-adv: Send multicast packets to nodes with a WANT_ALL flag") Cc: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 5690930ceb5997c8e5cf93ec5da39e4d9fa065aa multicast.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/multicast.c b/multicast.c index 25b2632..53d82e2 100644 --- a/multicast.c +++ b/multicast.c @@ -363,9 +363,9 @@ static int batadv_mcast_forw_mode_check(struct batadv_priv *bat_priv, * @bat_priv: the bat priv with all the soft interface information * @ethhdr: ethernet header of a packet * - * Return the number of nodes which want all IPv4 multicast traffic if - * the given ethhdr is from an IPv4 packet or the number of nodes which want - * all IPv6 traffic if it matches an IPv6 packet. + * Returns the number of nodes which want all IPv4 multicast traffic if the + * given ethhdr is from an IPv4 packet or the number of nodes which want all + * IPv6 traffic if it matches an IPv6 packet. */ static int batadv_mcast_forw_want_all_ip_count(struct batadv_priv *bat_priv, struct ethhdr *ethhdr) @@ -401,8 +401,8 @@ batadv_mcast_forw_tt_node_get(struct batadv_priv *bat_priv, * batadv_mcast_want_forw_ipv4_node_get - get a node with an ipv4 flag * @bat_priv: the bat priv with all the soft interface information * - * Return an orig_node which has the BATADV_MCAST_WANT_ALL_IPV4 flag set - * and increase its refcount. + * Returns an orig_node which has the BATADV_MCAST_WANT_ALL_IPV4 flag set and + * increases its refcount. */ static struct batadv_orig_node * batadv_mcast_forw_ipv4_node_get(struct batadv_priv *bat_priv) @@ -428,8 +428,8 @@ unlock: * batadv_mcast_want_forw_ipv6_node_get - get a node with an ipv6 flag * @bat_priv: the bat priv with all the soft interface information * - * Return an orig_node which has the BATADV_MCAST_WANT_ALL_IPV6 flag set - * and increase its refcount. + * Returns an orig_node which has the BATADV_MCAST_WANT_ALL_IPV6 flag set + * and increases its refcount. */ static struct batadv_orig_node * batadv_mcast_forw_ipv6_node_get(struct batadv_priv *bat_priv) @@ -456,9 +456,9 @@ unlock: * @bat_priv: the bat priv with all the soft interface information * @ethhdr: an ethernet header to determine the protocol family from * - * Return an orig_node which has the BATADV_MCAST_WANT_ALL_IPV4 or - * BATADV_MCAST_WANT_ALL_IPV6 flag, depending on the provided ethhdr, set - * and increase its refcount. + * Returns an orig_node which has the BATADV_MCAST_WANT_ALL_IPV4 or + * BATADV_MCAST_WANT_ALL_IPV6 flag, depending on the provided ethhdr, set and + * increases its refcount. */ static struct batadv_orig_node * batadv_mcast_forw_ip_node_get(struct batadv_priv *bat_priv,

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2014