The following commit has been merged in the master branch: commit a14c131d8c056397b34bfde63b398b712637d60f Author: Antonio Quartulli a@unstable.cc Date: Tue Nov 17 16:40:53 2015 +0800
batman-adv: add kernel doc for AP isolation attributes in bat_priv
Signed-off-by: Antonio Quartulli a@unstable.cc
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