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

batman at open-mesh.org batman at open-mesh.org
Wed Mar 26 00:28:01 CET 2014


The following commit has been merged in the master branch:
commit c5d3a652a3cf180e7a4b670d73517a0dfbbefebc
Author: Antonio Quartulli <antonio at meshcoding.com>
Date:   Sat Feb 15 11:58:01 2014 +0100

    batman-adv: add kerneldoc for dst_hint argument
    
    Some helper functions used along the TX path have now a new
    "dst_hint" argument but the kerneldoc was missing.
    
    Signed-off-by: Antonio Quartulli <antonio at meshcoding.com>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>

diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index 0e4831f..ce163d5 100644
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -311,6 +311,7 @@ out:
  * @packet_type: the batman unicast packet type to use
  * @packet_subtype: the unicast 4addr packet subtype (only relevant for unicast
  *  4addr packets)
+ * @dst_hint: can be used to override the destination contained in the skb
  * @vid: the vid to be used to search the translation table
  *
  * Look up the recipient node for the destination address in the ethernet
diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h
index aaddaa9..31e8781 100644
--- a/net/batman-adv/send.h
+++ b/net/batman-adv/send.h
@@ -47,6 +47,7 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb,
  * batadv_send_skb_via_tt - send an skb via TT lookup
  * @bat_priv: the bat priv with all the soft interface information
  * @skb: the payload to send
+ * @dst_hint: can be used to override the destination contained in the skb
  * @vid: the vid to be used to search the translation table
  *
  * Look up the recipient node for the destination address in the ethernet
@@ -68,6 +69,7 @@ static inline int batadv_send_skb_via_tt(struct batadv_priv *bat_priv,
  * @bat_priv: the bat priv with all the soft interface information
  * @skb: the payload to send
  * @packet_subtype: the unicast 4addr packet subtype to use
+ * @dst_hint: can be used to override the destination contained in the skb
  * @vid: the vid to be used to search the translation table
  *
  * Look up the recipient node for the destination address in the ethernet

-- 
LinuxNextTracking


More information about the linux-merge mailing list