The following commit has been merged in the master branch: commit f34ac9d4ec1fcb02fc70aad8d1ce0c0641a90b12 Author: Sven Eckelmann sven@narfation.org Date: Sun Sep 6 21:38:53 2015 +0200

batman-adv: Drop invalid kerneldoc for variable batadv_vlan_attrs

Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@neomailbox.ch Signed-off-by: Antonio Quartulli a@unstable.cc

diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index fe87777..33772d9 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -620,9 +620,7 @@ static struct batadv_attribute *batadv_mesh_attrs[] = {

BATADV_ATTR_VLAN_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL);

-/** - * batadv_vlan_attrs - array of vlan specific sysfs attributes - */ +/* array of vlan specific sysfs attributes */ static struct batadv_attribute *batadv_vlan_attrs[] = { &batadv_attr_vlan_ap_isolation, NULL,