hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

batman-adv: Fix kernel-doc parsing of main structs 

kernel-doc is not able to skip an #ifdef between the kernel documentation
block and the start of the struct. Moving the #ifdef before the kernel doc
block avoids this problem

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
This commit is contained in:
Sven Eckelmann 2015-09-06 21:38:45 +02:00 committed by Antonio Quartulli
parent cc69d3dbbb
commit 426fc6c811
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/batman-adv/types.h
View File

@ -423,13 +423,14 @@ struct batadv_neigh_ifinfo {
struct rcu_head rcu; struct rcu_head rcu;
}; };
#ifdef CONFIG_BATMAN_ADV_BLA
/** /**
* struct batadv_bcast_duplist_entry - structure for LAN broadcast suppression * struct batadv_bcast_duplist_entry - structure for LAN broadcast suppression
* @orig[ETH_ALEN]: mac address of orig node orginating the broadcast * @orig[ETH_ALEN]: mac address of orig node orginating the broadcast
* @crc: crc32 checksum of broadcast payload * @crc: crc32 checksum of broadcast payload
* @entrytime: time when the broadcast packet was received * @entrytime: time when the broadcast packet was received
*/ */
#ifdef CONFIG_BATMAN_ADV_BLA
struct batadv_bcast_duplist_entry { struct batadv_bcast_duplist_entry {
u8 orig[ETH_ALEN]; u8 orig[ETH_ALEN];
__be32 crc; __be32 crc;
@ -571,6 +572,8 @@ struct batadv_priv_tt {
struct delayed_work work; struct delayed_work work;
}; };
#ifdef CONFIG_BATMAN_ADV_BLA
/** /**
* struct batadv_priv_bla - per mesh interface bridge loope avoidance data * struct batadv_priv_bla - per mesh interface bridge loope avoidance data
* @num_requests; number of bla requests in flight * @num_requests; number of bla requests in flight
@ -583,7 +586,6 @@ struct batadv_priv_tt {
* @claim_dest: local claim data (e.g. claim group) * @claim_dest: local claim data (e.g. claim group)
* @work: work queue callback item for cleanups & bla announcements * @work: work queue callback item for cleanups & bla announcements
*/ */
#ifdef CONFIG_BATMAN_ADV_BLA
struct batadv_priv_bla { struct batadv_priv_bla {
atomic_t num_requests; atomic_t num_requests;
struct batadv_hashtable *claim_hash; struct batadv_hashtable *claim_hash;
@ -597,6 +599,8 @@ struct batadv_priv_bla {
}; };
#endif #endif
#ifdef CONFIG_BATMAN_ADV_DEBUG
/** /**
* struct batadv_priv_debug_log - debug logging data * struct batadv_priv_debug_log - debug logging data
* @log_buff: buffer holding the logs (ring bufer) * @log_buff: buffer holding the logs (ring bufer)
@ -605,7 +609,6 @@ struct batadv_priv_bla {
* @lock: lock protecting log_buff, log_start & log_end * @lock: lock protecting log_buff, log_start & log_end
* @queue_wait: log reader's wait queue * @queue_wait: log reader's wait queue
*/ */
#ifdef CONFIG_BATMAN_ADV_DEBUG
struct batadv_priv_debug_log { struct batadv_priv_debug_log {
char log_buff[BATADV_LOG_BUF_LEN]; char log_buff[BATADV_LOG_BUF_LEN];
unsigned long log_start; unsigned long log_start;
@ -647,13 +650,14 @@ struct batadv_priv_tvlv {
spinlock_t handler_list_lock; /* protects handler_list */ spinlock_t handler_list_lock; /* protects handler_list */
}; };
#ifdef CONFIG_BATMAN_ADV_DAT
/** /**
* struct batadv_priv_dat - per mesh interface DAT private data * struct batadv_priv_dat - per mesh interface DAT private data
* @addr: node DAT address * @addr: node DAT address
* @hash: hashtable representing the local ARP cache * @hash: hashtable representing the local ARP cache
* @work: work queue callback item for cache purging * @work: work queue callback item for cache purging
*/ */
#ifdef CONFIG_BATMAN_ADV_DAT
struct batadv_priv_dat { struct batadv_priv_dat {
batadv_dat_addr_t addr; batadv_dat_addr_t addr;
struct batadv_hashtable *hash; struct batadv_hashtable *hash;
@ -893,6 +897,8 @@ struct batadv_socket_packet {
u8 icmp_packet[BATADV_ICMP_MAX_PACKET_SIZE]; u8 icmp_packet[BATADV_ICMP_MAX_PACKET_SIZE];
}; };
#ifdef CONFIG_BATMAN_ADV_BLA
/** /**
* struct batadv_bla_backbone_gw - batman-adv gateway bridged into the LAN * struct batadv_bla_backbone_gw - batman-adv gateway bridged into the LAN
* @orig: originator address of backbone node (mac address of primary iface) * @orig: originator address of backbone node (mac address of primary iface)
@ -910,7 +916,6 @@ struct batadv_socket_packet {
* @refcount: number of contexts the object is used * @refcount: number of contexts the object is used
* @rcu: struct used for freeing in an RCU-safe manner * @rcu: struct used for freeing in an RCU-safe manner
*/ */
#ifdef CONFIG_BATMAN_ADV_BLA
struct batadv_bla_backbone_gw { struct batadv_bla_backbone_gw {
u8 orig[ETH_ALEN]; u8 orig[ETH_ALEN];
unsigned short vid; unsigned short vid;