The following commit has been merged in the master branch: commit 6020a86a4a208485640f7e17742835755c557676 Author: Linus Lüssing linus.luessing@c0d3.blue Date: Tue Aug 23 03:13:16 2016 +0200

batman-adv: fix batadv_forw_packet kerneldoc for list attribute

The forw_packet list node is wrongly attributed to the icmp socket code.

Signed-off-by: Linus Lüssing linus.luessing@c0d3.blue Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index b3dd1a3..97336ec 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1363,7 +1363,7 @@ struct batadv_skb_cb {

/** * struct batadv_forw_packet - structure for bcast packets to be sent/forwarded - * @list: list node for batadv_socket_client::queue_list + * @list: list node for batadv_priv::forw_{bat,bcast}_list * @send_time: execution time for delayed_work (packet sending) * @own: bool for locally generated packets (local OGMs are re-scheduled after * sending)