The following commit has been merged in the master branch: commit ba97abb86302d7380bc6738aa9313a1c460c4f3c Author: Martin Hundebøll martin@hundeboll.net Date: Tue Jul 15 09:41:07 2014 +0200

batman-adv: kernel doc fix for distributed-arp-table.h

Signed-off-by: Martin Hundebøll martin@hundeboll.net Acked-by: Antonio Quartulli antonio@meshcoding.com Signed-off-by: Marek Lindner mareklindner@neomailbox.ch Signed-off-by: Antonio Quartulli antonio@meshcoding.com

diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h index d76e1d0..2fe0764 100644 --- a/net/batman-adv/distributed-arp-table.h +++ b/net/batman-adv/distributed-arp-table.h @@ -25,9 +25,7 @@

#include <linux/if_arp.h>

-/** - * BATADV_DAT_ADDR_MAX - maximum address value in the DHT space - */ +/* BATADV_DAT_ADDR_MAX - maximum address value in the DHT space */ #define BATADV_DAT_ADDR_MAX ((batadv_dat_addr_t)~(batadv_dat_addr_t)0)

void batadv_dat_status_update(struct net_device *net_dev);