[linux-next] LinuxNextTracking branch, master, updated. next-20160815

batman at open-mesh.org batman at open-mesh.org
Tue Aug 16 00:15:42 CEST 2016


The following commit has been merged in the master branch:
commit e61cdfa3343b439590d6b9319fc973b7a1cb97ae
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue Jun 7 22:44:53 2016 +0200

    batman-adv: Document optional batadv_algo_ops
    
    Some operations in batadv_algo_ops are optional and marked as such in the
    kerneldoc. But some of them miss the "(optional)" in their kerneldoc. These
    have to also be marked to give an implementor of an algorithm the correct
    background information without looking in the code calling these function
    pointers.
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index a64522c..0ede27a 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -1396,6 +1396,7 @@ struct batadv_forw_packet {
 /**
  * struct batadv_algo_iface_ops - mesh algorithm callbacks (interface specific)
  * @activate: start routing mechanisms when hard-interface is brought up
+ *  (optional)
  * @enable: init routing info when hard-interface is enabled
  * @disable: de-init routing info when hard-interface is disabled
  * @update_mac: (re-)init mac addresses of the protocol information
@@ -1413,6 +1414,7 @@ struct batadv_algo_iface_ops {
 /**
  * struct batadv_algo_neigh_ops - mesh algorithm callbacks (neighbour specific)
  * @hardif_init: called on creation of single hop entry
+ *  (optional)
  * @cmp: compare the metrics of two neighbors for their respective outgoing
  *  interfaces
  * @is_similar_or_better: check if neigh1 is equally similar or better than
@@ -1435,11 +1437,11 @@ struct batadv_algo_neigh_ops {
 /**
  * struct batadv_algo_orig_ops - mesh algorithm callbacks (originator specific)
  * @free: free the resources allocated by the routing algorithm for an orig_node
- *  object
+ *  object (optional)
  * @add_if: ask the routing algorithm to apply the needed changes to the
- *  orig_node due to a new hard-interface being added into the mesh
+ *  orig_node due to a new hard-interface being added into the mesh (optional)
  * @del_if: ask the routing algorithm to apply the needed changes to the
- *  orig_node due to an hard-interface being removed from the mesh
+ *  orig_node due to an hard-interface being removed from the mesh (optional)
  * @print: print the originator table (optional)
  */
 struct batadv_algo_orig_ops {

-- 
LinuxNextTracking


More information about the linux-merge mailing list