The following commit has been merged in the merge/master branch: commit 6b9ec9fe6ac57becc63add4d140119dcf051b274 Author: Antonio Quartulli antonio@meshcoding.com Date: Tue Nov 17 16:40:53 2015 +0800

batman-adv: add kernel doc for AP isolation attributes in bat_priv

Cc: Sven Eckelmann sven@narfation.org Signed-off-by: Antonio Quartulli antonio@meshcoding.com Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 7f7a0f1..5e8c8df 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -772,6 +772,9 @@ struct batadv_softif_vlan { * @orig_interval: OGM broadcast interval in milliseconds * @hop_penalty: penalty which will be applied to an OGM's tq-field on every hop * @log_level: configured log level (see batadv_dbg_level) + * @isolation_mark: the skb->mark value used to match packets for AP isolation + * @isolation_mark_mask: bitmask identifying the bits in skb->mark to be used + * for the isolation mark * @bcast_seqno: last sent broadcast packet sequence number * @bcast_queue_left: number of remaining buffered broadcast packet slots * @batman_queue_left: number of remaining OGM packet slots