batman-adv: Remove bat_ prefix from bat_{debugfs, sysfs}.{c, h}
authorSven Eckelmann <sven@narfation.org>
Sun, 10 Jun 2012 21:58:51 +0000 (23:58 +0200)
committerAntonio Quartulli <ordex@autistici.org>
Sun, 1 Jul 2012 20:47:22 +0000 (22:47 +0200)
The "bat_" prefix in the source files implementing the batman-adv sysfs and
debugfs interface doesn't have a special meaning and are only used by these
files and files that implement the actual B.A.T.M.A.N. path finding algorithm.

The prefix is better suited to mark files that are used to implement the main
part of the path finding. All other files should not use it and therefore gets
renamed.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
13 files changed:
net/batman-adv/Makefile
net/batman-adv/bat_debugfs.c [deleted file]
net/batman-adv/bat_debugfs.h [deleted file]
net/batman-adv/bat_sysfs.c [deleted file]
net/batman-adv/bat_sysfs.h [deleted file]
net/batman-adv/debugfs.c [new file with mode: 0644]
net/batman-adv/debugfs.h [new file with mode: 0644]
net/batman-adv/gateway_client.c
net/batman-adv/hard-interface.c
net/batman-adv/main.c
net/batman-adv/soft-interface.c
net/batman-adv/sysfs.c [new file with mode: 0644]
net/batman-adv/sysfs.h [new file with mode: 0644]

index 6d5c1940667dd84a4339b40c25b02df83570b946..8676d2b1d57438d94ba90cef20e63c345880cdd3 100644 (file)
 #
 
 obj-$(CONFIG_BATMAN_ADV) += batman-adv.o
-batman-adv-y += bat_debugfs.o
 batman-adv-y += bat_iv_ogm.o
-batman-adv-y += bat_sysfs.o
 batman-adv-y += bitarray.o
 batman-adv-$(CONFIG_BATMAN_ADV_BLA) += bridge_loop_avoidance.o
+batman-adv-y += debugfs.o
 batman-adv-y += gateway_client.o
 batman-adv-y += gateway_common.o
 batman-adv-y += hard-interface.o
@@ -35,6 +34,7 @@ batman-adv-y += ring_buffer.o
 batman-adv-y += routing.o
 batman-adv-y += send.o
 batman-adv-y += soft-interface.o
+batman-adv-y += sysfs.o
 batman-adv-y += translation-table.o
 batman-adv-y += unicast.o
 batman-adv-y += vis.o
diff --git a/net/batman-adv/bat_debugfs.c b/net/batman-adv/bat_debugfs.c
deleted file mode 100644 (file)
index acf33e2..0000000
+++ /dev/null
@@ -1,405 +0,0 @@
-/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- */
-
-#include "main.h"
-
-#include <linux/debugfs.h>
-
-#include "bat_debugfs.h"
-#include "translation-table.h"
-#include "originator.h"
-#include "hard-interface.h"
-#include "gateway_common.h"
-#include "gateway_client.h"
-#include "soft-interface.h"
-#include "vis.h"
-#include "icmp_socket.h"
-#include "bridge_loop_avoidance.h"
-
-static struct dentry *batadv_debugfs;
-
-#ifdef CONFIG_BATMAN_ADV_DEBUG
-#define BATADV_LOG_BUFF_MASK (batadv_log_buff_len - 1)
-
-static const int batadv_log_buff_len = BATADV_LOG_BUF_LEN;
-
-static char *batadv_log_char_addr(struct batadv_debug_log *debug_log,
-                                 size_t idx)
-{
-       return &debug_log->log_buff[idx & BATADV_LOG_BUFF_MASK];
-}
-
-static void batadv_emit_log_char(struct batadv_debug_log *debug_log, char c)
-{
-       char *char_addr;
-
-       char_addr = batadv_log_char_addr(debug_log, debug_log->log_end);
-       *char_addr = c;
-       debug_log->log_end++;
-
-       if (debug_log->log_end - debug_log->log_start > batadv_log_buff_len)
-               debug_log->log_start = debug_log->log_end - batadv_log_buff_len;
-}
-
-__printf(2, 3)
-static int batadv_fdebug_log(struct batadv_debug_log *debug_log,
-                            const char *fmt, ...)
-{
-       va_list args;
-       static char debug_log_buf[256];
-       char *p;
-
-       if (!debug_log)
-               return 0;
-
-       spin_lock_bh(&debug_log->lock);
-       va_start(args, fmt);
-       vscnprintf(debug_log_buf, sizeof(debug_log_buf), fmt, args);
-       va_end(args);
-
-       for (p = debug_log_buf; *p != 0; p++)
-               batadv_emit_log_char(debug_log, *p);
-
-       spin_unlock_bh(&debug_log->lock);
-
-       wake_up(&debug_log->queue_wait);
-
-       return 0;
-}
-
-int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...)
-{
-       va_list args;
-       char tmp_log_buf[256];
-
-       va_start(args, fmt);
-       vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args);
-       batadv_fdebug_log(bat_priv->debug_log, "[%10u] %s",
-                         jiffies_to_msecs(jiffies), tmp_log_buf);
-       va_end(args);
-
-       return 0;
-}
-
-static int batadv_log_open(struct inode *inode, struct file *file)
-{
-       nonseekable_open(inode, file);
-       file->private_data = inode->i_private;
-       batadv_inc_module_count();
-       return 0;
-}
-
-static int batadv_log_release(struct inode *inode, struct file *file)
-{
-       batadv_dec_module_count();
-       return 0;
-}
-
-static ssize_t batadv_log_read(struct file *file, char __user *buf,
-                              size_t count, loff_t *ppos)
-{
-       struct batadv_priv *bat_priv = file->private_data;
-       struct batadv_debug_log *debug_log = bat_priv->debug_log;
-       int error, i = 0;
-       char *char_addr;
-       char c;
-
-       if ((file->f_flags & O_NONBLOCK) &&
-           !(debug_log->log_end - debug_log->log_start))
-               return -EAGAIN;
-
-       if (!buf)
-               return -EINVAL;
-
-       if (count == 0)
-               return 0;
-
-       if (!access_ok(VERIFY_WRITE, buf, count))
-               return -EFAULT;
-
-       error = wait_event_interruptible(debug_log->queue_wait,
-                               (debug_log->log_start - debug_log->log_end));
-
-       if (error)
-               return error;
-
-       spin_lock_bh(&debug_log->lock);
-
-       while ((!error) && (i < count) &&
-              (debug_log->log_start != debug_log->log_end)) {
-               char_addr = batadv_log_char_addr(debug_log,
-                                                debug_log->log_start);
-               c = *char_addr;
-
-               debug_log->log_start++;
-
-               spin_unlock_bh(&debug_log->lock);
-
-               error = __put_user(c, buf);
-
-               spin_lock_bh(&debug_log->lock);
-
-               buf++;
-               i++;
-
-       }
-
-       spin_unlock_bh(&debug_log->lock);
-
-       if (!error)
-               return i;
-
-       return error;
-}
-
-static unsigned int batadv_log_poll(struct file *file, poll_table *wait)
-{
-       struct batadv_priv *bat_priv = file->private_data;
-       struct batadv_debug_log *debug_log = bat_priv->debug_log;
-
-       poll_wait(file, &debug_log->queue_wait, wait);
-
-       if (debug_log->log_end - debug_log->log_start)
-               return POLLIN | POLLRDNORM;
-
-       return 0;
-}
-
-static const struct file_operations batadv_log_fops = {
-       .open           = batadv_log_open,
-       .release        = batadv_log_release,
-       .read           = batadv_log_read,
-       .poll           = batadv_log_poll,
-       .llseek         = no_llseek,
-};
-
-static int batadv_debug_log_setup(struct batadv_priv *bat_priv)
-{
-       struct dentry *d;
-
-       if (!bat_priv->debug_dir)
-               goto err;
-
-       bat_priv->debug_log = kzalloc(sizeof(*bat_priv->debug_log), GFP_ATOMIC);
-       if (!bat_priv->debug_log)
-               goto err;
-
-       spin_lock_init(&bat_priv->debug_log->lock);
-       init_waitqueue_head(&bat_priv->debug_log->queue_wait);
-
-       d = debugfs_create_file("log", S_IFREG | S_IRUSR,
-                               bat_priv->debug_dir, bat_priv,
-                               &batadv_log_fops);
-       if (!d)
-               goto err;
-
-       return 0;
-
-err:
-       return -ENOMEM;
-}
-
-static void batadv_debug_log_cleanup(struct batadv_priv *bat_priv)
-{
-       kfree(bat_priv->debug_log);
-       bat_priv->debug_log = NULL;
-}
-#else /* CONFIG_BATMAN_ADV_DEBUG */
-static int batadv_debug_log_setup(struct batadv_priv *bat_priv)
-{
-       bat_priv->debug_log = NULL;
-       return 0;
-}
-
-static void batadv_debug_log_cleanup(struct batadv_priv *bat_priv)
-{
-       return;
-}
-#endif
-
-static int batadv_algorithms_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, batadv_algo_seq_print_text, NULL);
-}
-
-static int batadv_originators_open(struct inode *inode, struct file *file)
-{
-       struct net_device *net_dev = (struct net_device *)inode->i_private;
-       return single_open(file, batadv_orig_seq_print_text, net_dev);
-}
-
-static int batadv_gateways_open(struct inode *inode, struct file *file)
-{
-       struct net_device *net_dev = (struct net_device *)inode->i_private;
-       return single_open(file, batadv_gw_client_seq_print_text, net_dev);
-}
-
-static int batadv_transtable_global_open(struct inode *inode, struct file *file)
-{
-       struct net_device *net_dev = (struct net_device *)inode->i_private;
-       return single_open(file, batadv_tt_global_seq_print_text, net_dev);
-}
-
-#ifdef CONFIG_BATMAN_ADV_BLA
-static int batadv_bla_claim_table_open(struct inode *inode, struct file *file)
-{
-       struct net_device *net_dev = (struct net_device *)inode->i_private;
-       return single_open(file, batadv_bla_claim_table_seq_print_text,
-                          net_dev);
-}
-#endif
-
-static int batadv_transtable_local_open(struct inode *inode, struct file *file)
-{
-       struct net_device *net_dev = (struct net_device *)inode->i_private;
-       return single_open(file, batadv_tt_local_seq_print_text, net_dev);
-}
-
-static int batadv_vis_data_open(struct inode *inode, struct file *file)
-{
-       struct net_device *net_dev = (struct net_device *)inode->i_private;
-       return single_open(file, batadv_vis_seq_print_text, net_dev);
-}
-
-struct batadv_debuginfo {
-       struct attribute attr;
-       const struct file_operations fops;
-};
-
-#define BATADV_DEBUGINFO(_name, _mode, _open)          \
-struct batadv_debuginfo batadv_debuginfo_##_name = {   \
-       .attr = { .name = __stringify(_name),           \
-                 .mode = _mode, },                     \
-       .fops = { .owner = THIS_MODULE,                 \
-                 .open = _open,                        \
-                 .read = seq_read,                     \
-                 .llseek = seq_lseek,                  \
-                 .release = single_release,            \
-               }                                       \
-};
-
-static BATADV_DEBUGINFO(routing_algos, S_IRUGO, batadv_algorithms_open);
-static BATADV_DEBUGINFO(originators, S_IRUGO, batadv_originators_open);
-static BATADV_DEBUGINFO(gateways, S_IRUGO, batadv_gateways_open);
-static BATADV_DEBUGINFO(transtable_global, S_IRUGO,
-                       batadv_transtable_global_open);
-#ifdef CONFIG_BATMAN_ADV_BLA
-static BATADV_DEBUGINFO(bla_claim_table, S_IRUGO, batadv_bla_claim_table_open);
-#endif
-static BATADV_DEBUGINFO(transtable_local, S_IRUGO,
-                       batadv_transtable_local_open);
-static BATADV_DEBUGINFO(vis_data, S_IRUGO, batadv_vis_data_open);
-
-static struct batadv_debuginfo *batadv_mesh_debuginfos[] = {
-       &batadv_debuginfo_originators,
-       &batadv_debuginfo_gateways,
-       &batadv_debuginfo_transtable_global,
-#ifdef CONFIG_BATMAN_ADV_BLA
-       &batadv_debuginfo_bla_claim_table,
-#endif
-       &batadv_debuginfo_transtable_local,
-       &batadv_debuginfo_vis_data,
-       NULL,
-};
-
-void batadv_debugfs_init(void)
-{
-       struct batadv_debuginfo *bat_debug;
-       struct dentry *file;
-
-       batadv_debugfs = debugfs_create_dir(BATADV_DEBUGFS_SUBDIR, NULL);
-       if (batadv_debugfs == ERR_PTR(-ENODEV))
-               batadv_debugfs = NULL;
-
-       if (!batadv_debugfs)
-               goto out;
-
-       bat_debug = &batadv_debuginfo_routing_algos;
-       file = debugfs_create_file(bat_debug->attr.name,
-                                  S_IFREG | bat_debug->attr.mode,
-                                  batadv_debugfs, NULL, &bat_debug->fops);
-       if (!file)
-               pr_err("Can't add debugfs file: %s\n", bat_debug->attr.name);
-
-out:
-       return;
-}
-
-void batadv_debugfs_destroy(void)
-{
-       if (batadv_debugfs) {
-               debugfs_remove_recursive(batadv_debugfs);
-               batadv_debugfs = NULL;
-       }
-}
-
-int batadv_debugfs_add_meshif(struct net_device *dev)
-{
-       struct batadv_priv *bat_priv = netdev_priv(dev);
-       struct batadv_debuginfo **bat_debug;
-       struct dentry *file;
-
-       if (!batadv_debugfs)
-               goto out;
-
-       bat_priv->debug_dir = debugfs_create_dir(dev->name, batadv_debugfs);
-       if (!bat_priv->debug_dir)
-               goto out;
-
-       if (batadv_socket_setup(bat_priv) < 0)
-               goto rem_attr;
-
-       if (batadv_debug_log_setup(bat_priv) < 0)
-               goto rem_attr;
-
-       for (bat_debug = batadv_mesh_debuginfos; *bat_debug; ++bat_debug) {
-               file = debugfs_create_file(((*bat_debug)->attr).name,
-                                         S_IFREG | ((*bat_debug)->attr).mode,
-                                         bat_priv->debug_dir,
-                                         dev, &(*bat_debug)->fops);
-               if (!file) {
-                       batadv_err(dev, "Can't add debugfs file: %s/%s\n",
-                                  dev->name, ((*bat_debug)->attr).name);
-                       goto rem_attr;
-               }
-       }
-
-       return 0;
-rem_attr:
-       debugfs_remove_recursive(bat_priv->debug_dir);
-       bat_priv->debug_dir = NULL;
-out:
-#ifdef CONFIG_DEBUG_FS
-       return -ENOMEM;
-#else
-       return 0;
-#endif /* CONFIG_DEBUG_FS */
-}
-
-void batadv_debugfs_del_meshif(struct net_device *dev)
-{
-       struct batadv_priv *bat_priv = netdev_priv(dev);
-
-       batadv_debug_log_cleanup(bat_priv);
-
-       if (batadv_debugfs) {
-               debugfs_remove_recursive(bat_priv->debug_dir);
-               bat_priv->debug_dir = NULL;
-       }
-}
diff --git a/net/batman-adv/bat_debugfs.h b/net/batman-adv/bat_debugfs.h
deleted file mode 100644 (file)
index 3319e1f..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- */
-
-#ifndef _NET_BATMAN_ADV_DEBUGFS_H_
-#define _NET_BATMAN_ADV_DEBUGFS_H_
-
-#define BATADV_DEBUGFS_SUBDIR "batman_adv"
-
-void batadv_debugfs_init(void);
-void batadv_debugfs_destroy(void);
-int batadv_debugfs_add_meshif(struct net_device *dev);
-void batadv_debugfs_del_meshif(struct net_device *dev);
-
-#endif /* _NET_BATMAN_ADV_DEBUGFS_H_ */
diff --git a/net/batman-adv/bat_sysfs.c b/net/batman-adv/bat_sysfs.c
deleted file mode 100644 (file)
index a0a9ea4..0000000
+++ /dev/null
@@ -1,787 +0,0 @@
-/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- */
-
-#include "main.h"
-#include "bat_sysfs.h"
-#include "translation-table.h"
-#include "originator.h"
-#include "hard-interface.h"
-#include "gateway_common.h"
-#include "gateway_client.h"
-#include "vis.h"
-
-static struct net_device *batadv_kobj_to_netdev(struct kobject *obj)
-{
-       struct device *dev = container_of(obj->parent, struct device, kobj);
-       return to_net_dev(dev);
-}
-
-static struct batadv_priv *batadv_kobj_to_batpriv(struct kobject *obj)
-{
-       struct net_device *net_dev = batadv_kobj_to_netdev(obj);
-       return netdev_priv(net_dev);
-}
-
-#define BATADV_UEV_TYPE_VAR    "BATTYPE="
-#define BATADV_UEV_ACTION_VAR  "BATACTION="
-#define BATADV_UEV_DATA_VAR    "BATDATA="
-
-static char *batadv_uev_action_str[] = {
-       "add",
-       "del",
-       "change"
-};
-
-static char *batadv_uev_type_str[] = {
-       "gw"
-};
-
-/* Use this, if you have customized show and store functions */
-#define BATADV_ATTR(_name, _mode, _show, _store)       \
-struct batadv_attribute batadv_attr_##_name = {                \
-       .attr = {.name = __stringify(_name),            \
-                .mode = _mode },                       \
-       .show   = _show,                                \
-       .store  = _store,                               \
-};
-
-#define BATADV_ATTR_SIF_STORE_BOOL(_name, _post_func)                  \
-ssize_t batadv_store_##_name(struct kobject *kobj,                     \
-                            struct attribute *attr, char *buff,        \
-                            size_t count)                              \
-{                                                                      \
-       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);       \
-       struct batadv_priv *bat_priv = netdev_priv(net_dev);            \
-       return __batadv_store_bool_attr(buff, count, _post_func, attr,  \
-                                       &bat_priv->_name, net_dev);     \
-}
-
-#define BATADV_ATTR_SIF_SHOW_BOOL(_name)                               \
-ssize_t batadv_show_##_name(struct kobject *kobj,                      \
-                           struct attribute *attr, char *buff)         \
-{                                                                      \
-       struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);    \
-       return sprintf(buff, "%s\n",                                    \
-                      atomic_read(&bat_priv->_name) == 0 ?             \
-                      "disabled" : "enabled");                         \
-}                                                                      \
-
-/* Use this, if you are going to turn a [name] in the soft-interface
- * (bat_priv) on or off
- */
-#define BATADV_ATTR_SIF_BOOL(_name, _mode, _post_func)                 \
-       static BATADV_ATTR_SIF_STORE_BOOL(_name, _post_func)            \
-       static BATADV_ATTR_SIF_SHOW_BOOL(_name)                         \
-       static BATADV_ATTR(_name, _mode, batadv_show_##_name,           \
-                          batadv_store_##_name)
-
-
-#define BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func)      \
-ssize_t batadv_store_##_name(struct kobject *kobj,                     \
-                            struct attribute *attr, char *buff,        \
-                            size_t count)                              \
-{                                                                      \
-       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);       \
-       struct batadv_priv *bat_priv = netdev_priv(net_dev);            \
-       return __batadv_store_uint_attr(buff, count, _min, _max,        \
-                                       _post_func, attr,               \
-                                       &bat_priv->_name, net_dev);     \
-}
-
-#define BATADV_ATTR_SIF_SHOW_UINT(_name)                               \
-ssize_t batadv_show_##_name(struct kobject *kobj,                      \
-                           struct attribute *attr, char *buff)         \
-{                                                                      \
-       struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);    \
-       return sprintf(buff, "%i\n", atomic_read(&bat_priv->_name));    \
-}                                                                      \
-
-/* Use this, if you are going to set [name] in the soft-interface
- * (bat_priv) to an unsigned integer value
- */
-#define BATADV_ATTR_SIF_UINT(_name, _mode, _min, _max, _post_func)     \
-       static BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func)\
-       static BATADV_ATTR_SIF_SHOW_UINT(_name)                         \
-       static BATADV_ATTR(_name, _mode, batadv_show_##_name,           \
-                          batadv_store_##_name)
-
-
-#define BATADV_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func)      \
-ssize_t batadv_store_##_name(struct kobject *kobj,                     \
-                            struct attribute *attr, char *buff,        \
-                            size_t count)                              \
-{                                                                      \
-       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);       \
-       struct batadv_hard_iface *hard_iface;                           \
-       ssize_t length;                                                 \
-                                                                       \
-       hard_iface = batadv_hardif_get_by_netdev(net_dev);              \
-       if (!hard_iface)                                                \
-               return 0;                                               \
-                                                                       \
-       length = __batadv_store_uint_attr(buff, count, _min, _max,      \
-                                         _post_func, attr,             \
-                                         &hard_iface->_name, net_dev); \
-                                                                       \
-       batadv_hardif_free_ref(hard_iface);                             \
-       return length;                                                  \
-}
-
-#define BATADV_ATTR_HIF_SHOW_UINT(_name)                               \
-ssize_t batadv_show_##_name(struct kobject *kobj,                      \
-                           struct attribute *attr, char *buff)         \
-{                                                                      \
-       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);       \
-       struct batadv_hard_iface *hard_iface;                           \
-       ssize_t length;                                                 \
-                                                                       \
-       hard_iface = batadv_hardif_get_by_netdev(net_dev);              \
-       if (!hard_iface)                                                \
-               return 0;                                               \
-                                                                       \
-       length = sprintf(buff, "%i\n", atomic_read(&hard_iface->_name));\
-                                                                       \
-       batadv_hardif_free_ref(hard_iface);                             \
-       return length;                                                  \
-}
-
-/* Use this, if you are going to set [name] in hard_iface to an
- * unsigned integer value
- */
-#define BATADV_ATTR_HIF_UINT(_name, _mode, _min, _max, _post_func)     \
-       static BATADV_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func)\
-       static BATADV_ATTR_HIF_SHOW_UINT(_name)                         \
-       static BATADV_ATTR(_name, _mode, batadv_show_##_name,           \
-                          batadv_store_##_name)
-
-
-static int batadv_store_bool_attr(char *buff, size_t count,
-                                 struct net_device *net_dev,
-                                 const char *attr_name, atomic_t *attr)
-{
-       int enabled = -1;
-
-       if (buff[count - 1] == '\n')
-               buff[count - 1] = '\0';
-
-       if ((strncmp(buff, "1", 2) == 0) ||
-           (strncmp(buff, "enable", 7) == 0) ||
-           (strncmp(buff, "enabled", 8) == 0))
-               enabled = 1;
-
-       if ((strncmp(buff, "0", 2) == 0) ||
-           (strncmp(buff, "disable", 8) == 0) ||
-           (strncmp(buff, "disabled", 9) == 0))
-               enabled = 0;
-
-       if (enabled < 0) {
-               batadv_info(net_dev, "%s: Invalid parameter received: %s\n",
-                           attr_name, buff);
-               return -EINVAL;
-       }
-
-       if (atomic_read(attr) == enabled)
-               return count;
-
-       batadv_info(net_dev, "%s: Changing from: %s to: %s\n", attr_name,
-                   atomic_read(attr) == 1 ? "enabled" : "disabled",
-                   enabled == 1 ? "enabled" : "disabled");
-
-       atomic_set(attr, (unsigned int)enabled);
-       return count;
-}
-
-static inline ssize_t
-__batadv_store_bool_attr(char *buff, size_t count,
-                        void (*post_func)(struct net_device *),
-                        struct attribute *attr,
-                        atomic_t *attr_store, struct net_device *net_dev)
-{
-       int ret;
-
-       ret = batadv_store_bool_attr(buff, count, net_dev, attr->name,
-                                    attr_store);
-       if (post_func && ret)
-               post_func(net_dev);
-
-       return ret;
-}
-
-static int batadv_store_uint_attr(const char *buff, size_t count,
-                                 struct net_device *net_dev,
-                                 const char *attr_name,
-                                 unsigned int min, unsigned int max,
-                                 atomic_t *attr)
-{
-       unsigned long uint_val;
-       int ret;
-
-       ret = kstrtoul(buff, 10, &uint_val);
-       if (ret) {
-               batadv_info(net_dev, "%s: Invalid parameter received: %s\n",
-                           attr_name, buff);
-               return -EINVAL;
-       }
-
-       if (uint_val < min) {
-               batadv_info(net_dev, "%s: Value is too small: %lu min: %u\n",
-                           attr_name, uint_val, min);
-               return -EINVAL;
-       }
-
-       if (uint_val > max) {
-               batadv_info(net_dev, "%s: Value is too big: %lu max: %u\n",
-                           attr_name, uint_val, max);
-               return -EINVAL;
-       }
-
-       if (atomic_read(attr) == uint_val)
-               return count;
-
-       batadv_info(net_dev, "%s: Changing from: %i to: %lu\n",
-                   attr_name, atomic_read(attr), uint_val);
-
-       atomic_set(attr, uint_val);
-       return count;
-}
-
-static inline ssize_t
-__batadv_store_uint_attr(const char *buff, size_t count,
-                        int min, int max,
-                        void (*post_func)(struct net_device *),
-                        const struct attribute *attr,
-                        atomic_t *attr_store, struct net_device *net_dev)
-{
-       int ret;
-
-       ret = batadv_store_uint_attr(buff, count, net_dev, attr->name, min, max,
-                                    attr_store);
-       if (post_func && ret)
-               post_func(net_dev);
-
-       return ret;
-}
-
-static ssize_t batadv_show_vis_mode(struct kobject *kobj,
-                                   struct attribute *attr, char *buff)
-{
-       struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);
-       int vis_mode = atomic_read(&bat_priv->vis_mode);
-       const char *mode;
-
-       if (vis_mode == BATADV_VIS_TYPE_CLIENT_UPDATE)
-               mode = "client";
-       else
-               mode = "server";
-
-       return sprintf(buff, "%s\n", mode);
-}
-
-static ssize_t batadv_store_vis_mode(struct kobject *kobj,
-                                    struct attribute *attr, char *buff,
-                                    size_t count)
-{
-       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
-       struct batadv_priv *bat_priv = netdev_priv(net_dev);
-       unsigned long val;
-       int ret, vis_mode_tmp = -1;
-       const char *old_mode, *new_mode;
-
-       ret = kstrtoul(buff, 10, &val);
-
-       if (((count == 2) && (!ret) &&
-            (val == BATADV_VIS_TYPE_CLIENT_UPDATE)) ||
-           (strncmp(buff, "client", 6) == 0) ||
-           (strncmp(buff, "off", 3) == 0))
-               vis_mode_tmp = BATADV_VIS_TYPE_CLIENT_UPDATE;
-
-       if (((count == 2) && (!ret) &&
-            (val == BATADV_VIS_TYPE_SERVER_SYNC)) ||
-           (strncmp(buff, "server", 6) == 0))
-               vis_mode_tmp = BATADV_VIS_TYPE_SERVER_SYNC;
-
-       if (vis_mode_tmp < 0) {
-               if (buff[count - 1] == '\n')
-                       buff[count - 1] = '\0';
-
-               batadv_info(net_dev,
-                           "Invalid parameter for 'vis mode' setting received: %s\n",
-                           buff);
-               return -EINVAL;
-       }
-
-       if (atomic_read(&bat_priv->vis_mode) == vis_mode_tmp)
-               return count;
-
-       if (atomic_read(&bat_priv->vis_mode) == BATADV_VIS_TYPE_CLIENT_UPDATE)
-               old_mode =  "client";
-       else
-               old_mode = "server";
-
-       if (vis_mode_tmp == BATADV_VIS_TYPE_CLIENT_UPDATE)
-               new_mode =  "client";
-       else
-               new_mode = "server";
-
-       batadv_info(net_dev, "Changing vis mode from: %s to: %s\n", old_mode,
-                   new_mode);
-
-       atomic_set(&bat_priv->vis_mode, (unsigned int)vis_mode_tmp);
-       return count;
-}
-
-static ssize_t batadv_show_bat_algo(struct kobject *kobj,
-                                   struct attribute *attr, char *buff)
-{
-       struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);
-       return sprintf(buff, "%s\n", bat_priv->bat_algo_ops->name);
-}
-
-static void batadv_post_gw_deselect(struct net_device *net_dev)
-{
-       struct batadv_priv *bat_priv = netdev_priv(net_dev);
-       batadv_gw_deselect(bat_priv);
-}
-
-static ssize_t batadv_show_gw_mode(struct kobject *kobj, struct attribute *attr,
-                                  char *buff)
-{
-       struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);
-       int bytes_written;
-
-       switch (atomic_read(&bat_priv->gw_mode)) {
-       case BATADV_GW_MODE_CLIENT:
-               bytes_written = sprintf(buff, "%s\n",
-                                       BATADV_GW_MODE_CLIENT_NAME);
-               break;
-       case BATADV_GW_MODE_SERVER:
-               bytes_written = sprintf(buff, "%s\n",
-                                       BATADV_GW_MODE_SERVER_NAME);
-               break;
-       default:
-               bytes_written = sprintf(buff, "%s\n",
-                                       BATADV_GW_MODE_OFF_NAME);
-               break;
-       }
-
-       return bytes_written;
-}
-
-static ssize_t batadv_store_gw_mode(struct kobject *kobj,
-                                   struct attribute *attr, char *buff,
-                                   size_t count)
-{
-       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
-       struct batadv_priv *bat_priv = netdev_priv(net_dev);
-       char *curr_gw_mode_str;
-       int gw_mode_tmp = -1;
-
-       if (buff[count - 1] == '\n')
-               buff[count - 1] = '\0';
-
-       if (strncmp(buff, BATADV_GW_MODE_OFF_NAME,
-                   strlen(BATADV_GW_MODE_OFF_NAME)) == 0)
-               gw_mode_tmp = BATADV_GW_MODE_OFF;
-
-       if (strncmp(buff, BATADV_GW_MODE_CLIENT_NAME,
-                   strlen(BATADV_GW_MODE_CLIENT_NAME)) == 0)
-               gw_mode_tmp = BATADV_GW_MODE_CLIENT;
-
-       if (strncmp(buff, BATADV_GW_MODE_SERVER_NAME,
-                   strlen(BATADV_GW_MODE_SERVER_NAME)) == 0)
-               gw_mode_tmp = BATADV_GW_MODE_SERVER;
-
-       if (gw_mode_tmp < 0) {
-               batadv_info(net_dev,
-                           "Invalid parameter for 'gw mode' setting received: %s\n",
-                           buff);
-               return -EINVAL;
-       }
-
-       if (atomic_read(&bat_priv->gw_mode) == gw_mode_tmp)
-               return count;
-
-       switch (atomic_read(&bat_priv->gw_mode)) {
-       case BATADV_GW_MODE_CLIENT:
-               curr_gw_mode_str = BATADV_GW_MODE_CLIENT_NAME;
-               break;
-       case BATADV_GW_MODE_SERVER:
-               curr_gw_mode_str = BATADV_GW_MODE_SERVER_NAME;
-               break;
-       default:
-               curr_gw_mode_str = BATADV_GW_MODE_OFF_NAME;
-               break;
-       }
-
-       batadv_info(net_dev, "Changing gw mode from: %s to: %s\n",
-                   curr_gw_mode_str, buff);
-
-       batadv_gw_deselect(bat_priv);
-       atomic_set(&bat_priv->gw_mode, (unsigned int)gw_mode_tmp);
-       return count;
-}
-
-static ssize_t batadv_show_gw_bwidth(struct kobject *kobj,
-                                    struct attribute *attr, char *buff)
-{
-       struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);
-       int down, up;
-       int gw_bandwidth = atomic_read(&bat_priv->gw_bandwidth);
-
-       batadv_gw_bandwidth_to_kbit(gw_bandwidth, &down, &up);
-       return sprintf(buff, "%i%s/%i%s\n",
-                      (down > 2048 ? down / 1024 : down),
-                      (down > 2048 ? "MBit" : "KBit"),
-                      (up > 2048 ? up / 1024 : up),
-                      (up > 2048 ? "MBit" : "KBit"));
-}
-
-static ssize_t batadv_store_gw_bwidth(struct kobject *kobj,
-                                     struct attribute *attr, char *buff,
-                                     size_t count)
-{
-       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
-
-       if (buff[count - 1] == '\n')
-               buff[count - 1] = '\0';
-
-       return batadv_gw_bandwidth_set(net_dev, buff, count);
-}
-
-BATADV_ATTR_SIF_BOOL(aggregated_ogms, S_IRUGO | S_IWUSR, NULL);
-BATADV_ATTR_SIF_BOOL(bonding, S_IRUGO | S_IWUSR, NULL);
-#ifdef CONFIG_BATMAN_ADV_BLA
-BATADV_ATTR_SIF_BOOL(bridge_loop_avoidance, S_IRUGO | S_IWUSR, NULL);
-#endif
-BATADV_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, batadv_update_min_mtu);
-BATADV_ATTR_SIF_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL);
-static BATADV_ATTR(vis_mode, S_IRUGO | S_IWUSR, batadv_show_vis_mode,
-                  batadv_store_vis_mode);
-static BATADV_ATTR(routing_algo, S_IRUGO, batadv_show_bat_algo, NULL);
-static BATADV_ATTR(gw_mode, S_IRUGO | S_IWUSR, batadv_show_gw_mode,
-                  batadv_store_gw_mode);
-BATADV_ATTR_SIF_UINT(orig_interval, S_IRUGO | S_IWUSR, 2 * BATADV_JITTER,
-                    INT_MAX, NULL);
-BATADV_ATTR_SIF_UINT(hop_penalty, S_IRUGO | S_IWUSR, 0, BATADV_TQ_MAX_VALUE,
-                    NULL);
-BATADV_ATTR_SIF_UINT(gw_sel_class, S_IRUGO | S_IWUSR, 1, BATADV_TQ_MAX_VALUE,
-                    batadv_post_gw_deselect);
-static BATADV_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, batadv_show_gw_bwidth,
-                  batadv_store_gw_bwidth);
-#ifdef CONFIG_BATMAN_ADV_DEBUG
-BATADV_ATTR_SIF_UINT(log_level, S_IRUGO | S_IWUSR, 0, BATADV_DBG_ALL, NULL);
-#endif
-
-static struct batadv_attribute *batadv_mesh_attrs[] = {
-       &batadv_attr_aggregated_ogms,
-       &batadv_attr_bonding,
-#ifdef CONFIG_BATMAN_ADV_BLA
-       &batadv_attr_bridge_loop_avoidance,
-#endif
-       &batadv_attr_fragmentation,
-       &batadv_attr_ap_isolation,
-       &batadv_attr_vis_mode,
-       &batadv_attr_routing_algo,
-       &batadv_attr_gw_mode,
-       &batadv_attr_orig_interval,
-       &batadv_attr_hop_penalty,
-       &batadv_attr_gw_sel_class,
-       &batadv_attr_gw_bandwidth,
-#ifdef CONFIG_BATMAN_ADV_DEBUG
-       &batadv_attr_log_level,
-#endif
-       NULL,
-};
-
-int batadv_sysfs_add_meshif(struct net_device *dev)
-{
-       struct kobject *batif_kobject = &dev->dev.kobj;
-       struct batadv_priv *bat_priv = netdev_priv(dev);
-       struct batadv_attribute **bat_attr;
-       int err;
-
-       bat_priv->mesh_obj = kobject_create_and_add(BATADV_SYSFS_IF_MESH_SUBDIR,
-                                                   batif_kobject);
-       if (!bat_priv->mesh_obj) {
-               batadv_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,
-                          BATADV_SYSFS_IF_MESH_SUBDIR);
-               goto out;
-       }
-
-       for (bat_attr = batadv_mesh_attrs; *bat_attr; ++bat_attr) {
-               err = sysfs_create_file(bat_priv->mesh_obj,
-                                       &((*bat_attr)->attr));
-               if (err) {
-                       batadv_err(dev, "Can't add sysfs file: %s/%s/%s\n",
-                                  dev->name, BATADV_SYSFS_IF_MESH_SUBDIR,
-                                  ((*bat_attr)->attr).name);
-                       goto rem_attr;
-               }
-       }
-
-       return 0;
-
-rem_attr:
-       for (bat_attr = batadv_mesh_attrs; *bat_attr; ++bat_attr)
-               sysfs_remove_file(bat_priv->mesh_obj, &((*bat_attr)->attr));
-
-       kobject_put(bat_priv->mesh_obj);
-       bat_priv->mesh_obj = NULL;
-out:
-       return -ENOMEM;
-}
-
-void batadv_sysfs_del_meshif(struct net_device *dev)
-{
-       struct batadv_priv *bat_priv = netdev_priv(dev);
-       struct batadv_attribute **bat_attr;
-
-       for (bat_attr = batadv_mesh_attrs; *bat_attr; ++bat_attr)
-               sysfs_remove_file(bat_priv->mesh_obj, &((*bat_attr)->attr));
-
-       kobject_put(bat_priv->mesh_obj);
-       bat_priv->mesh_obj = NULL;
-}
-
-static ssize_t batadv_show_mesh_iface(struct kobject *kobj,
-                                     struct attribute *attr, char *buff)
-{
-       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
-       struct batadv_hard_iface *hard_iface;
-       ssize_t length;
-       const char *ifname;
-
-       hard_iface = batadv_hardif_get_by_netdev(net_dev);
-       if (!hard_iface)
-               return 0;
-
-       if (hard_iface->if_status == BATADV_IF_NOT_IN_USE)
-               ifname =  "none";
-       else
-               ifname = hard_iface->soft_iface->name;
-
-       length = sprintf(buff, "%s\n", ifname);
-
-       batadv_hardif_free_ref(hard_iface);
-
-       return length;
-}
-
-static ssize_t batadv_store_mesh_iface(struct kobject *kobj,
-                                      struct attribute *attr, char *buff,
-                                      size_t count)
-{
-       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
-       struct batadv_hard_iface *hard_iface;
-       int status_tmp = -1;
-       int ret = count;
-
-       hard_iface = batadv_hardif_get_by_netdev(net_dev);
-       if (!hard_iface)
-               return count;
-
-       if (buff[count - 1] == '\n')
-               buff[count - 1] = '\0';
-
-       if (strlen(buff) >= IFNAMSIZ) {
-               pr_err("Invalid parameter for 'mesh_iface' setting received: interface name too long '%s'\n",
-                      buff);
-               batadv_hardif_free_ref(hard_iface);
-               return -EINVAL;
-       }
-
-       if (strncmp(buff, "none", 4) == 0)
-               status_tmp = BATADV_IF_NOT_IN_USE;
-       else
-               status_tmp = BATADV_IF_I_WANT_YOU;
-
-       if (hard_iface->if_status == status_tmp)
-               goto out;
-
-       if ((hard_iface->soft_iface) &&
-           (strncmp(hard_iface->soft_iface->name, buff, IFNAMSIZ) == 0))
-               goto out;
-
-       if (!rtnl_trylock()) {
-               ret = -ERESTARTSYS;
-               goto out;
-       }
-
-       if (status_tmp == BATADV_IF_NOT_IN_USE) {
-               batadv_hardif_disable_interface(hard_iface);
-               goto unlock;
-       }
-
-       /* if the interface already is in use */
-       if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)
-               batadv_hardif_disable_interface(hard_iface);
-
-       ret = batadv_hardif_enable_interface(hard_iface, buff);
-
-unlock:
-       rtnl_unlock();
-out:
-       batadv_hardif_free_ref(hard_iface);
-       return ret;
-}
-
-static ssize_t batadv_show_iface_status(struct kobject *kobj,
-                                       struct attribute *attr, char *buff)
-{
-       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
-       struct batadv_hard_iface *hard_iface;
-       ssize_t length;
-
-       hard_iface = batadv_hardif_get_by_netdev(net_dev);
-       if (!hard_iface)
-               return 0;
-
-       switch (hard_iface->if_status) {
-       case BATADV_IF_TO_BE_REMOVED:
-               length = sprintf(buff, "disabling\n");
-               break;
-       case BATADV_IF_INACTIVE:
-               length = sprintf(buff, "inactive\n");
-               break;
-       case BATADV_IF_ACTIVE:
-               length = sprintf(buff, "active\n");
-               break;
-       case BATADV_IF_TO_BE_ACTIVATED:
-               length = sprintf(buff, "enabling\n");
-               break;
-       case BATADV_IF_NOT_IN_USE:
-       default:
-               length = sprintf(buff, "not in use\n");
-               break;
-       }
-
-       batadv_hardif_free_ref(hard_iface);
-
-       return length;
-}
-
-static BATADV_ATTR(mesh_iface, S_IRUGO | S_IWUSR, batadv_show_mesh_iface,
-                  batadv_store_mesh_iface);
-static BATADV_ATTR(iface_status, S_IRUGO, batadv_show_iface_status, NULL);
-
-static struct batadv_attribute *batadv_batman_attrs[] = {
-       &batadv_attr_mesh_iface,
-       &batadv_attr_iface_status,
-       NULL,
-};
-
-int batadv_sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev)
-{
-       struct kobject *hardif_kobject = &dev->dev.kobj;
-       struct batadv_attribute **bat_attr;
-       int err;
-
-       *hardif_obj = kobject_create_and_add(BATADV_SYSFS_IF_BAT_SUBDIR,
-                                            hardif_kobject);
-
-       if (!*hardif_obj) {
-               batadv_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,
-                          BATADV_SYSFS_IF_BAT_SUBDIR);
-               goto out;
-       }
-
-       for (bat_attr = batadv_batman_attrs; *bat_attr; ++bat_attr) {
-               err = sysfs_create_file(*hardif_obj, &((*bat_attr)->attr));
-               if (err) {
-                       batadv_err(dev, "Can't add sysfs file: %s/%s/%s\n",
-                                  dev->name, BATADV_SYSFS_IF_BAT_SUBDIR,
-                                  ((*bat_attr)->attr).name);
-                       goto rem_attr;
-               }
-       }
-
-       return 0;
-
-rem_attr:
-       for (bat_attr = batadv_batman_attrs; *bat_attr; ++bat_attr)
-               sysfs_remove_file(*hardif_obj, &((*bat_attr)->attr));
-out:
-       return -ENOMEM;
-}
-
-void batadv_sysfs_del_hardif(struct kobject **hardif_obj)
-{
-       kobject_put(*hardif_obj);
-       *hardif_obj = NULL;
-}
-
-int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,
-                       enum batadv_uev_action action, const char *data)
-{
-       int ret = -ENOMEM;
-       struct batadv_hard_iface *primary_if = NULL;
-       struct kobject *bat_kobj;
-       char *uevent_env[4] = { NULL, NULL, NULL, NULL };
-
-       primary_if = batadv_primary_if_get_selected(bat_priv);
-       if (!primary_if)
-               goto out;
-
-       bat_kobj = &primary_if->soft_iface->dev.kobj;
-
-       uevent_env[0] = kmalloc(strlen(BATADV_UEV_TYPE_VAR) +
-                               strlen(batadv_uev_type_str[type]) + 1,
-                               GFP_ATOMIC);
-       if (!uevent_env[0])
-               goto out;
-
-       sprintf(uevent_env[0], "%s%s", BATADV_UEV_TYPE_VAR,
-               batadv_uev_type_str[type]);
-
-       uevent_env[1] = kmalloc(strlen(BATADV_UEV_ACTION_VAR) +
-                               strlen(batadv_uev_action_str[action]) + 1,
-                               GFP_ATOMIC);
-       if (!uevent_env[1])
-               goto out;
-
-       sprintf(uevent_env[1], "%s%s", BATADV_UEV_ACTION_VAR,
-               batadv_uev_action_str[action]);
-
-       /* If the event is DEL, ignore the data field */
-       if (action != BATADV_UEV_DEL) {
-               uevent_env[2] = kmalloc(strlen(BATADV_UEV_DATA_VAR) +
-                                       strlen(data) + 1, GFP_ATOMIC);
-               if (!uevent_env[2])
-                       goto out;
-
-               sprintf(uevent_env[2], "%s%s", BATADV_UEV_DATA_VAR, data);
-       }
-
-       ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env);
-out:
-       kfree(uevent_env[0]);
-       kfree(uevent_env[1]);
-       kfree(uevent_env[2]);
-
-       if (primary_if)
-               batadv_hardif_free_ref(primary_if);
-
-       if (ret)
-               batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
-                          "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n",
-                          batadv_uev_type_str[type],
-                          batadv_uev_action_str[action],
-                          (action == BATADV_UEV_DEL ? "NULL" : data), ret);
-       return ret;
-}
diff --git a/net/batman-adv/bat_sysfs.h b/net/batman-adv/bat_sysfs.h
deleted file mode 100644 (file)
index 3fd1412..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- */
-
-#ifndef _NET_BATMAN_ADV_SYSFS_H_
-#define _NET_BATMAN_ADV_SYSFS_H_
-
-#define BATADV_SYSFS_IF_MESH_SUBDIR "mesh"
-#define BATADV_SYSFS_IF_BAT_SUBDIR "batman_adv"
-
-struct batadv_attribute {
-       struct attribute attr;
-       ssize_t (*show)(struct kobject *kobj, struct attribute *attr,
-                       char *buf);
-       ssize_t (*store)(struct kobject *kobj, struct attribute *attr,
-                        char *buf, size_t count);
-};
-
-int batadv_sysfs_add_meshif(struct net_device *dev);
-void batadv_sysfs_del_meshif(struct net_device *dev);
-int batadv_sysfs_add_hardif(struct kobject **hardif_obj,
-                           struct net_device *dev);
-void batadv_sysfs_del_hardif(struct kobject **hardif_obj);
-int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,
-                       enum batadv_uev_action action, const char *data);
-
-#endif /* _NET_BATMAN_ADV_SYSFS_H_ */
diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c
new file mode 100644 (file)
index 0000000..e45cf0e
--- /dev/null
@@ -0,0 +1,405 @@
+/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
+ */
+
+#include "main.h"
+
+#include <linux/debugfs.h>
+
+#include "debugfs.h"
+#include "translation-table.h"
+#include "originator.h"
+#include "hard-interface.h"
+#include "gateway_common.h"
+#include "gateway_client.h"
+#include "soft-interface.h"
+#include "vis.h"
+#include "icmp_socket.h"
+#include "bridge_loop_avoidance.h"
+
+static struct dentry *batadv_debugfs;
+
+#ifdef CONFIG_BATMAN_ADV_DEBUG
+#define BATADV_LOG_BUFF_MASK (batadv_log_buff_len - 1)
+
+static const int batadv_log_buff_len = BATADV_LOG_BUF_LEN;
+
+static char *batadv_log_char_addr(struct batadv_debug_log *debug_log,
+                                 size_t idx)
+{
+       return &debug_log->log_buff[idx & BATADV_LOG_BUFF_MASK];
+}
+
+static void batadv_emit_log_char(struct batadv_debug_log *debug_log, char c)
+{
+       char *char_addr;
+
+       char_addr = batadv_log_char_addr(debug_log, debug_log->log_end);
+       *char_addr = c;
+       debug_log->log_end++;
+
+       if (debug_log->log_end - debug_log->log_start > batadv_log_buff_len)
+               debug_log->log_start = debug_log->log_end - batadv_log_buff_len;
+}
+
+__printf(2, 3)
+static int batadv_fdebug_log(struct batadv_debug_log *debug_log,
+                            const char *fmt, ...)
+{
+       va_list args;
+       static char debug_log_buf[256];
+       char *p;
+
+       if (!debug_log)
+               return 0;
+
+       spin_lock_bh(&debug_log->lock);
+       va_start(args, fmt);
+       vscnprintf(debug_log_buf, sizeof(debug_log_buf), fmt, args);
+       va_end(args);
+
+       for (p = debug_log_buf; *p != 0; p++)
+               batadv_emit_log_char(debug_log, *p);
+
+       spin_unlock_bh(&debug_log->lock);
+
+       wake_up(&debug_log->queue_wait);
+
+       return 0;
+}
+
+int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...)
+{
+       va_list args;
+       char tmp_log_buf[256];
+
+       va_start(args, fmt);
+       vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args);
+       batadv_fdebug_log(bat_priv->debug_log, "[%10u] %s",
+                         jiffies_to_msecs(jiffies), tmp_log_buf);
+       va_end(args);
+
+       return 0;
+}
+
+static int batadv_log_open(struct inode *inode, struct file *file)
+{
+       nonseekable_open(inode, file);
+       file->private_data = inode->i_private;
+       batadv_inc_module_count();
+       return 0;
+}
+
+static int batadv_log_release(struct inode *inode, struct file *file)
+{
+       batadv_dec_module_count();
+       return 0;
+}
+
+static ssize_t batadv_log_read(struct file *file, char __user *buf,
+                              size_t count, loff_t *ppos)
+{
+       struct batadv_priv *bat_priv = file->private_data;
+       struct batadv_debug_log *debug_log = bat_priv->debug_log;
+       int error, i = 0;
+       char *char_addr;
+       char c;
+
+       if ((file->f_flags & O_NONBLOCK) &&
+           !(debug_log->log_end - debug_log->log_start))
+               return -EAGAIN;
+
+       if (!buf)
+               return -EINVAL;
+
+       if (count == 0)
+               return 0;
+
+       if (!access_ok(VERIFY_WRITE, buf, count))
+               return -EFAULT;
+
+       error = wait_event_interruptible(debug_log->queue_wait,
+                               (debug_log->log_start - debug_log->log_end));
+
+       if (error)
+               return error;
+
+       spin_lock_bh(&debug_log->lock);
+
+       while ((!error) && (i < count) &&
+              (debug_log->log_start != debug_log->log_end)) {
+               char_addr = batadv_log_char_addr(debug_log,
+                                                debug_log->log_start);
+               c = *char_addr;
+
+               debug_log->log_start++;
+
+               spin_unlock_bh(&debug_log->lock);
+
+               error = __put_user(c, buf);
+
+               spin_lock_bh(&debug_log->lock);
+
+               buf++;
+               i++;
+
+       }
+
+       spin_unlock_bh(&debug_log->lock);
+
+       if (!error)
+               return i;
+
+       return error;
+}
+
+static unsigned int batadv_log_poll(struct file *file, poll_table *wait)
+{
+       struct batadv_priv *bat_priv = file->private_data;
+       struct batadv_debug_log *debug_log = bat_priv->debug_log;
+
+       poll_wait(file, &debug_log->queue_wait, wait);
+
+       if (debug_log->log_end - debug_log->log_start)
+               return POLLIN | POLLRDNORM;
+
+       return 0;
+}
+
+static const struct file_operations batadv_log_fops = {
+       .open           = batadv_log_open,
+       .release        = batadv_log_release,
+       .read           = batadv_log_read,
+       .poll           = batadv_log_poll,
+       .llseek         = no_llseek,
+};
+
+static int batadv_debug_log_setup(struct batadv_priv *bat_priv)
+{
+       struct dentry *d;
+
+       if (!bat_priv->debug_dir)
+               goto err;
+
+       bat_priv->debug_log = kzalloc(sizeof(*bat_priv->debug_log), GFP_ATOMIC);
+       if (!bat_priv->debug_log)
+               goto err;
+
+       spin_lock_init(&bat_priv->debug_log->lock);
+       init_waitqueue_head(&bat_priv->debug_log->queue_wait);
+
+       d = debugfs_create_file("log", S_IFREG | S_IRUSR,
+                               bat_priv->debug_dir, bat_priv,
+                               &batadv_log_fops);
+       if (!d)
+               goto err;
+
+       return 0;
+
+err:
+       return -ENOMEM;
+}
+
+static void batadv_debug_log_cleanup(struct batadv_priv *bat_priv)
+{
+       kfree(bat_priv->debug_log);
+       bat_priv->debug_log = NULL;
+}
+#else /* CONFIG_BATMAN_ADV_DEBUG */
+static int batadv_debug_log_setup(struct batadv_priv *bat_priv)
+{
+       bat_priv->debug_log = NULL;
+       return 0;
+}
+
+static void batadv_debug_log_cleanup(struct batadv_priv *bat_priv)
+{
+       return;
+}
+#endif
+
+static int batadv_algorithms_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, batadv_algo_seq_print_text, NULL);
+}
+
+static int batadv_originators_open(struct inode *inode, struct file *file)
+{
+       struct net_device *net_dev = (struct net_device *)inode->i_private;
+       return single_open(file, batadv_orig_seq_print_text, net_dev);
+}
+
+static int batadv_gateways_open(struct inode *inode, struct file *file)
+{
+       struct net_device *net_dev = (struct net_device *)inode->i_private;
+       return single_open(file, batadv_gw_client_seq_print_text, net_dev);
+}
+
+static int batadv_transtable_global_open(struct inode *inode, struct file *file)
+{
+       struct net_device *net_dev = (struct net_device *)inode->i_private;
+       return single_open(file, batadv_tt_global_seq_print_text, net_dev);
+}
+
+#ifdef CONFIG_BATMAN_ADV_BLA
+static int batadv_bla_claim_table_open(struct inode *inode, struct file *file)
+{
+       struct net_device *net_dev = (struct net_device *)inode->i_private;
+       return single_open(file, batadv_bla_claim_table_seq_print_text,
+                          net_dev);
+}
+#endif
+
+static int batadv_transtable_local_open(struct inode *inode, struct file *file)
+{
+       struct net_device *net_dev = (struct net_device *)inode->i_private;
+       return single_open(file, batadv_tt_local_seq_print_text, net_dev);
+}
+
+static int batadv_vis_data_open(struct inode *inode, struct file *file)
+{
+       struct net_device *net_dev = (struct net_device *)inode->i_private;
+       return single_open(file, batadv_vis_seq_print_text, net_dev);
+}
+
+struct batadv_debuginfo {
+       struct attribute attr;
+       const struct file_operations fops;
+};
+
+#define BATADV_DEBUGINFO(_name, _mode, _open)          \
+struct batadv_debuginfo batadv_debuginfo_##_name = {   \
+       .attr = { .name = __stringify(_name),           \
+                 .mode = _mode, },                     \
+       .fops = { .owner = THIS_MODULE,                 \
+                 .open = _open,                        \
+                 .read = seq_read,                     \
+                 .llseek = seq_lseek,                  \
+                 .release = single_release,            \
+               }                                       \
+};
+
+static BATADV_DEBUGINFO(routing_algos, S_IRUGO, batadv_algorithms_open);
+static BATADV_DEBUGINFO(originators, S_IRUGO, batadv_originators_open);
+static BATADV_DEBUGINFO(gateways, S_IRUGO, batadv_gateways_open);
+static BATADV_DEBUGINFO(transtable_global, S_IRUGO,
+                       batadv_transtable_global_open);
+#ifdef CONFIG_BATMAN_ADV_BLA
+static BATADV_DEBUGINFO(bla_claim_table, S_IRUGO, batadv_bla_claim_table_open);
+#endif
+static BATADV_DEBUGINFO(transtable_local, S_IRUGO,
+                       batadv_transtable_local_open);
+static BATADV_DEBUGINFO(vis_data, S_IRUGO, batadv_vis_data_open);
+
+static struct batadv_debuginfo *batadv_mesh_debuginfos[] = {
+       &batadv_debuginfo_originators,
+       &batadv_debuginfo_gateways,
+       &batadv_debuginfo_transtable_global,
+#ifdef CONFIG_BATMAN_ADV_BLA
+       &batadv_debuginfo_bla_claim_table,
+#endif
+       &batadv_debuginfo_transtable_local,
+       &batadv_debuginfo_vis_data,
+       NULL,
+};
+
+void batadv_debugfs_init(void)
+{
+       struct batadv_debuginfo *bat_debug;
+       struct dentry *file;
+
+       batadv_debugfs = debugfs_create_dir(BATADV_DEBUGFS_SUBDIR, NULL);
+       if (batadv_debugfs == ERR_PTR(-ENODEV))
+               batadv_debugfs = NULL;
+
+       if (!batadv_debugfs)
+               goto out;
+
+       bat_debug = &batadv_debuginfo_routing_algos;
+       file = debugfs_create_file(bat_debug->attr.name,
+                                  S_IFREG | bat_debug->attr.mode,
+                                  batadv_debugfs, NULL, &bat_debug->fops);
+       if (!file)
+               pr_err("Can't add debugfs file: %s\n", bat_debug->attr.name);
+
+out:
+       return;
+}
+
+void batadv_debugfs_destroy(void)
+{
+       if (batadv_debugfs) {
+               debugfs_remove_recursive(batadv_debugfs);
+               batadv_debugfs = NULL;
+       }
+}
+
+int batadv_debugfs_add_meshif(struct net_device *dev)
+{
+       struct batadv_priv *bat_priv = netdev_priv(dev);
+       struct batadv_debuginfo **bat_debug;
+       struct dentry *file;
+
+       if (!batadv_debugfs)
+               goto out;
+
+       bat_priv->debug_dir = debugfs_create_dir(dev->name, batadv_debugfs);
+       if (!bat_priv->debug_dir)
+               goto out;
+
+       if (batadv_socket_setup(bat_priv) < 0)
+               goto rem_attr;
+
+       if (batadv_debug_log_setup(bat_priv) < 0)
+               goto rem_attr;
+
+       for (bat_debug = batadv_mesh_debuginfos; *bat_debug; ++bat_debug) {
+               file = debugfs_create_file(((*bat_debug)->attr).name,
+                                         S_IFREG | ((*bat_debug)->attr).mode,
+                                         bat_priv->debug_dir,
+                                         dev, &(*bat_debug)->fops);
+               if (!file) {
+                       batadv_err(dev, "Can't add debugfs file: %s/%s\n",
+                                  dev->name, ((*bat_debug)->attr).name);
+                       goto rem_attr;
+               }
+       }
+
+       return 0;
+rem_attr:
+       debugfs_remove_recursive(bat_priv->debug_dir);
+       bat_priv->debug_dir = NULL;
+out:
+#ifdef CONFIG_DEBUG_FS
+       return -ENOMEM;
+#else
+       return 0;
+#endif /* CONFIG_DEBUG_FS */
+}
+
+void batadv_debugfs_del_meshif(struct net_device *dev)
+{
+       struct batadv_priv *bat_priv = netdev_priv(dev);
+
+       batadv_debug_log_cleanup(bat_priv);
+
+       if (batadv_debugfs) {
+               debugfs_remove_recursive(bat_priv->debug_dir);
+               bat_priv->debug_dir = NULL;
+       }
+}
diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h
new file mode 100644 (file)
index 0000000..3319e1f
--- /dev/null
@@ -0,0 +1,30 @@
+/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
+ */
+
+#ifndef _NET_BATMAN_ADV_DEBUGFS_H_
+#define _NET_BATMAN_ADV_DEBUGFS_H_
+
+#define BATADV_DEBUGFS_SUBDIR "batman_adv"
+
+void batadv_debugfs_init(void);
+void batadv_debugfs_destroy(void);
+int batadv_debugfs_add_meshif(struct net_device *dev);
+void batadv_debugfs_del_meshif(struct net_device *dev);
+
+#endif /* _NET_BATMAN_ADV_DEBUGFS_H_ */
index 43b9c1763ffffacfe6fe59628604a6dae0f391df..b421cc49d2cd1f83a88b905047df40e2853c4b0b 100644 (file)
@@ -18,7 +18,7 @@
  */
 
 #include "main.h"
-#include "bat_sysfs.h"
+#include "sysfs.h"
 #include "gateway_client.h"
 #include "gateway_common.h"
 #include "hard-interface.h"
index eb765a778ba0813c5e2fe6d03ecf73cca190788d..60f50c5426a891b6612b5d21173d290f605627cc 100644 (file)
@@ -23,7 +23,7 @@
 #include "send.h"
 #include "translation-table.h"
 #include "routing.h"
-#include "bat_sysfs.h"
+#include "sysfs.h"
 #include "originator.h"
 #include "hash.h"
 #include "bridge_loop_avoidance.h"
index 17dcdd90cb744587768f6c0edbab2ad4f4abea41..13c88b25ab319a15260e77d12c65957180c46b9c 100644 (file)
@@ -18,8 +18,8 @@
  */
 
 #include "main.h"
-#include "bat_sysfs.h"
-#include "bat_debugfs.h"
+#include "sysfs.h"
+#include "debugfs.h"
 #include "routing.h"
 #include "send.h"
 #include "originator.h"
index 7a7d8218539300e62616322d0c449117a6d29864..b7c655cf626aa980561b922a86dd3cb23d18fc56 100644 (file)
 #include "hard-interface.h"
 #include "routing.h"
 #include "send.h"
-#include "bat_debugfs.h"
+#include "debugfs.h"
 #include "translation-table.h"
 #include "hash.h"
 #include "gateway_common.h"
 #include "gateway_client.h"
-#include "bat_sysfs.h"
+#include "sysfs.h"
 #include "originator.h"
 #include <linux/slab.h>
 #include <linux/ethtool.h>
diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
new file mode 100644 (file)
index 0000000..66518c7
--- /dev/null
@@ -0,0 +1,787 @@
+/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
+ */
+
+#include "main.h"
+#include "sysfs.h"
+#include "translation-table.h"
+#include "originator.h"
+#include "hard-interface.h"
+#include "gateway_common.h"
+#include "gateway_client.h"
+#include "vis.h"
+
+static struct net_device *batadv_kobj_to_netdev(struct kobject *obj)
+{
+       struct device *dev = container_of(obj->parent, struct device, kobj);
+       return to_net_dev(dev);
+}
+
+static struct batadv_priv *batadv_kobj_to_batpriv(struct kobject *obj)
+{
+       struct net_device *net_dev = batadv_kobj_to_netdev(obj);
+       return netdev_priv(net_dev);
+}
+
+#define BATADV_UEV_TYPE_VAR    "BATTYPE="
+#define BATADV_UEV_ACTION_VAR  "BATACTION="
+#define BATADV_UEV_DATA_VAR    "BATDATA="
+
+static char *batadv_uev_action_str[] = {
+       "add",
+       "del",
+       "change"
+};
+
+static char *batadv_uev_type_str[] = {
+       "gw"
+};
+
+/* Use this, if you have customized show and store functions */
+#define BATADV_ATTR(_name, _mode, _show, _store)       \
+struct batadv_attribute batadv_attr_##_name = {                \
+       .attr = {.name = __stringify(_name),            \
+                .mode = _mode },                       \
+       .show   = _show,                                \
+       .store  = _store,                               \
+};
+
+#define BATADV_ATTR_SIF_STORE_BOOL(_name, _post_func)                  \
+ssize_t batadv_store_##_name(struct kobject *kobj,                     \
+                            struct attribute *attr, char *buff,        \
+                            size_t count)                              \
+{                                                                      \
+       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);       \
+       struct batadv_priv *bat_priv = netdev_priv(net_dev);            \
+       return __batadv_store_bool_attr(buff, count, _post_func, attr,  \
+                                       &bat_priv->_name, net_dev);     \
+}
+
+#define BATADV_ATTR_SIF_SHOW_BOOL(_name)                               \
+ssize_t batadv_show_##_name(struct kobject *kobj,                      \
+                           struct attribute *attr, char *buff)         \
+{                                                                      \
+       struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);    \
+       return sprintf(buff, "%s\n",                                    \
+                      atomic_read(&bat_priv->_name) == 0 ?             \
+                      "disabled" : "enabled");                         \
+}                                                                      \
+
+/* Use this, if you are going to turn a [name] in the soft-interface
+ * (bat_priv) on or off
+ */
+#define BATADV_ATTR_SIF_BOOL(_name, _mode, _post_func)                 \
+       static BATADV_ATTR_SIF_STORE_BOOL(_name, _post_func)            \
+       static BATADV_ATTR_SIF_SHOW_BOOL(_name)                         \
+       static BATADV_ATTR(_name, _mode, batadv_show_##_name,           \
+                          batadv_store_##_name)
+
+
+#define BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func)      \
+ssize_t batadv_store_##_name(struct kobject *kobj,                     \
+                            struct attribute *attr, char *buff,        \
+                            size_t count)                              \
+{                                                                      \
+       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);       \
+       struct batadv_priv *bat_priv = netdev_priv(net_dev);            \
+       return __batadv_store_uint_attr(buff, count, _min, _max,        \
+                                       _post_func, attr,               \
+                                       &bat_priv->_name, net_dev);     \
+}
+
+#define BATADV_ATTR_SIF_SHOW_UINT(_name)                               \
+ssize_t batadv_show_##_name(struct kobject *kobj,                      \
+                           struct attribute *attr, char *buff)         \
+{                                                                      \
+       struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);    \
+       return sprintf(buff, "%i\n", atomic_read(&bat_priv->_name));    \
+}                                                                      \
+
+/* Use this, if you are going to set [name] in the soft-interface
+ * (bat_priv) to an unsigned integer value
+ */
+#define BATADV_ATTR_SIF_UINT(_name, _mode, _min, _max, _post_func)     \
+       static BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func)\
+       static BATADV_ATTR_SIF_SHOW_UINT(_name)                         \
+       static BATADV_ATTR(_name, _mode, batadv_show_##_name,           \
+                          batadv_store_##_name)
+
+
+#define BATADV_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func)      \
+ssize_t batadv_store_##_name(struct kobject *kobj,                     \
+                            struct attribute *attr, char *buff,        \
+                            size_t count)                              \
+{                                                                      \
+       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);       \
+       struct batadv_hard_iface *hard_iface;                           \
+       ssize_t length;                                                 \
+                                                                       \
+       hard_iface = batadv_hardif_get_by_netdev(net_dev);              \
+       if (!hard_iface)                                                \
+               return 0;                                               \
+                                                                       \
+       length = __batadv_store_uint_attr(buff, count, _min, _max,      \
+                                         _post_func, attr,             \
+                                         &hard_iface->_name, net_dev); \
+                                                                       \
+       batadv_hardif_free_ref(hard_iface);                             \
+       return length;                                                  \
+}
+
+#define BATADV_ATTR_HIF_SHOW_UINT(_name)                               \
+ssize_t batadv_show_##_name(struct kobject *kobj,                      \
+                           struct attribute *attr, char *buff)         \
+{                                                                      \
+       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);       \
+       struct batadv_hard_iface *hard_iface;                           \
+       ssize_t length;                                                 \
+                                                                       \
+       hard_iface = batadv_hardif_get_by_netdev(net_dev);              \
+       if (!hard_iface)                                                \
+               return 0;                                               \
+                                                                       \
+       length = sprintf(buff, "%i\n", atomic_read(&hard_iface->_name));\
+                                                                       \
+       batadv_hardif_free_ref(hard_iface);                             \
+       return length;                                                  \
+}
+
+/* Use this, if you are going to set [name] in hard_iface to an
+ * unsigned integer value
+ */
+#define BATADV_ATTR_HIF_UINT(_name, _mode, _min, _max, _post_func)     \
+       static BATADV_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func)\
+       static BATADV_ATTR_HIF_SHOW_UINT(_name)                         \
+       static BATADV_ATTR(_name, _mode, batadv_show_##_name,           \
+                          batadv_store_##_name)
+
+
+static int batadv_store_bool_attr(char *buff, size_t count,
+                                 struct net_device *net_dev,
+                                 const char *attr_name, atomic_t *attr)
+{
+       int enabled = -1;
+
+       if (buff[count - 1] == '\n')
+               buff[count - 1] = '\0';
+
+       if ((strncmp(buff, "1", 2) == 0) ||
+           (strncmp(buff, "enable", 7) == 0) ||
+           (strncmp(buff, "enabled", 8) == 0))
+               enabled = 1;
+
+       if ((strncmp(buff, "0", 2) == 0) ||
+           (strncmp(buff, "disable", 8) == 0) ||
+           (strncmp(buff, "disabled", 9) == 0))
+               enabled = 0;
+
+       if (enabled < 0) {
+               batadv_info(net_dev, "%s: Invalid parameter received: %s\n",
+                           attr_name, buff);
+               return -EINVAL;
+       }
+
+       if (atomic_read(attr) == enabled)
+               return count;
+
+       batadv_info(net_dev, "%s: Changing from: %s to: %s\n", attr_name,
+                   atomic_read(attr) == 1 ? "enabled" : "disabled",
+                   enabled == 1 ? "enabled" : "disabled");
+
+       atomic_set(attr, (unsigned int)enabled);
+       return count;
+}
+
+static inline ssize_t
+__batadv_store_bool_attr(char *buff, size_t count,
+                        void (*post_func)(struct net_device *),
+                        struct attribute *attr,
+                        atomic_t *attr_store, struct net_device *net_dev)
+{
+       int ret;
+
+       ret = batadv_store_bool_attr(buff, count, net_dev, attr->name,
+                                    attr_store);
+       if (post_func && ret)
+               post_func(net_dev);
+
+       return ret;
+}
+
+static int batadv_store_uint_attr(const char *buff, size_t count,
+                                 struct net_device *net_dev,
+                                 const char *attr_name,
+                                 unsigned int min, unsigned int max,
+                                 atomic_t *attr)
+{
+       unsigned long uint_val;
+       int ret;
+
+       ret = kstrtoul(buff, 10, &uint_val);
+       if (ret) {
+               batadv_info(net_dev, "%s: Invalid parameter received: %s\n",
+                           attr_name, buff);
+               return -EINVAL;
+       }
+
+       if (uint_val < min) {
+               batadv_info(net_dev, "%s: Value is too small: %lu min: %u\n",
+                           attr_name, uint_val, min);
+               return -EINVAL;
+       }
+
+       if (uint_val > max) {
+               batadv_info(net_dev, "%s: Value is too big: %lu max: %u\n",
+                           attr_name, uint_val, max);
+               return -EINVAL;
+       }
+
+       if (atomic_read(attr) == uint_val)
+               return count;
+
+       batadv_info(net_dev, "%s: Changing from: %i to: %lu\n",
+                   attr_name, atomic_read(attr), uint_val);
+
+       atomic_set(attr, uint_val);
+       return count;
+}
+
+static inline ssize_t
+__batadv_store_uint_attr(const char *buff, size_t count,
+                        int min, int max,
+                        void (*post_func)(struct net_device *),
+                        const struct attribute *attr,
+                        atomic_t *attr_store, struct net_device *net_dev)
+{
+       int ret;
+
+       ret = batadv_store_uint_attr(buff, count, net_dev, attr->name, min, max,
+                                    attr_store);
+       if (post_func && ret)
+               post_func(net_dev);
+
+       return ret;
+}
+
+static ssize_t batadv_show_vis_mode(struct kobject *kobj,
+                                   struct attribute *attr, char *buff)
+{
+       struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);
+       int vis_mode = atomic_read(&bat_priv->vis_mode);
+       const char *mode;
+
+       if (vis_mode == BATADV_VIS_TYPE_CLIENT_UPDATE)
+               mode = "client";
+       else
+               mode = "server";
+
+       return sprintf(buff, "%s\n", mode);
+}
+
+static ssize_t batadv_store_vis_mode(struct kobject *kobj,
+                                    struct attribute *attr, char *buff,
+                                    size_t count)
+{
+       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
+       struct batadv_priv *bat_priv = netdev_priv(net_dev);
+       unsigned long val;
+       int ret, vis_mode_tmp = -1;
+       const char *old_mode, *new_mode;
+
+       ret = kstrtoul(buff, 10, &val);
+
+       if (((count == 2) && (!ret) &&
+            (val == BATADV_VIS_TYPE_CLIENT_UPDATE)) ||
+           (strncmp(buff, "client", 6) == 0) ||
+           (strncmp(buff, "off", 3) == 0))
+               vis_mode_tmp = BATADV_VIS_TYPE_CLIENT_UPDATE;
+
+       if (((count == 2) && (!ret) &&
+            (val == BATADV_VIS_TYPE_SERVER_SYNC)) ||
+           (strncmp(buff, "server", 6) == 0))
+               vis_mode_tmp = BATADV_VIS_TYPE_SERVER_SYNC;
+
+       if (vis_mode_tmp < 0) {
+               if (buff[count - 1] == '\n')
+                       buff[count - 1] = '\0';
+
+               batadv_info(net_dev,
+                           "Invalid parameter for 'vis mode' setting received: %s\n",
+                           buff);
+               return -EINVAL;
+       }
+
+       if (atomic_read(&bat_priv->vis_mode) == vis_mode_tmp)
+               return count;
+
+       if (atomic_read(&bat_priv->vis_mode) == BATADV_VIS_TYPE_CLIENT_UPDATE)
+               old_mode =  "client";
+       else
+               old_mode = "server";
+
+       if (vis_mode_tmp == BATADV_VIS_TYPE_CLIENT_UPDATE)
+               new_mode =  "client";
+       else
+               new_mode = "server";
+
+       batadv_info(net_dev, "Changing vis mode from: %s to: %s\n", old_mode,
+                   new_mode);
+
+       atomic_set(&bat_priv->vis_mode, (unsigned int)vis_mode_tmp);
+       return count;
+}
+
+static ssize_t batadv_show_bat_algo(struct kobject *kobj,
+                                   struct attribute *attr, char *buff)
+{
+       struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);
+       return sprintf(buff, "%s\n", bat_priv->bat_algo_ops->name);
+}
+
+static void batadv_post_gw_deselect(struct net_device *net_dev)
+{
+       struct batadv_priv *bat_priv = netdev_priv(net_dev);
+       batadv_gw_deselect(bat_priv);
+}
+
+static ssize_t batadv_show_gw_mode(struct kobject *kobj, struct attribute *attr,
+                                  char *buff)
+{
+       struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);
+       int bytes_written;
+
+       switch (atomic_read(&bat_priv->gw_mode)) {
+       case BATADV_GW_MODE_CLIENT:
+               bytes_written = sprintf(buff, "%s\n",
+                                       BATADV_GW_MODE_CLIENT_NAME);
+               break;
+       case BATADV_GW_MODE_SERVER:
+               bytes_written = sprintf(buff, "%s\n",
+                                       BATADV_GW_MODE_SERVER_NAME);
+               break;
+       default:
+               bytes_written = sprintf(buff, "%s\n",
+                                       BATADV_GW_MODE_OFF_NAME);
+               break;
+       }
+
+       return bytes_written;
+}
+
+static ssize_t batadv_store_gw_mode(struct kobject *kobj,
+                                   struct attribute *attr, char *buff,
+                                   size_t count)
+{
+       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
+       struct batadv_priv *bat_priv = netdev_priv(net_dev);
+       char *curr_gw_mode_str;
+       int gw_mode_tmp = -1;
+
+       if (buff[count - 1] == '\n')
+               buff[count - 1] = '\0';
+
+       if (strncmp(buff, BATADV_GW_MODE_OFF_NAME,
+                   strlen(BATADV_GW_MODE_OFF_NAME)) == 0)
+               gw_mode_tmp = BATADV_GW_MODE_OFF;
+
+       if (strncmp(buff, BATADV_GW_MODE_CLIENT_NAME,
+                   strlen(BATADV_GW_MODE_CLIENT_NAME)) == 0)
+               gw_mode_tmp = BATADV_GW_MODE_CLIENT;
+
+       if (strncmp(buff, BATADV_GW_MODE_SERVER_NAME,
+                   strlen(BATADV_GW_MODE_SERVER_NAME)) == 0)
+               gw_mode_tmp = BATADV_GW_MODE_SERVER;
+
+       if (gw_mode_tmp < 0) {
+               batadv_info(net_dev,
+                           "Invalid parameter for 'gw mode' setting received: %s\n",
+                           buff);
+               return -EINVAL;
+       }
+
+       if (atomic_read(&bat_priv->gw_mode) == gw_mode_tmp)
+               return count;
+
+       switch (atomic_read(&bat_priv->gw_mode)) {
+       case BATADV_GW_MODE_CLIENT:
+               curr_gw_mode_str = BATADV_GW_MODE_CLIENT_NAME;
+               break;
+       case BATADV_GW_MODE_SERVER:
+               curr_gw_mode_str = BATADV_GW_MODE_SERVER_NAME;
+               break;
+       default:
+               curr_gw_mode_str = BATADV_GW_MODE_OFF_NAME;
+               break;
+       }
+
+       batadv_info(net_dev, "Changing gw mode from: %s to: %s\n",
+                   curr_gw_mode_str, buff);
+
+       batadv_gw_deselect(bat_priv);
+       atomic_set(&bat_priv->gw_mode, (unsigned int)gw_mode_tmp);
+       return count;
+}
+
+static ssize_t batadv_show_gw_bwidth(struct kobject *kobj,
+                                    struct attribute *attr, char *buff)
+{
+       struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);
+       int down, up;
+       int gw_bandwidth = atomic_read(&bat_priv->gw_bandwidth);
+
+       batadv_gw_bandwidth_to_kbit(gw_bandwidth, &down, &up);
+       return sprintf(buff, "%i%s/%i%s\n",
+                      (down > 2048 ? down / 1024 : down),
+                      (down > 2048 ? "MBit" : "KBit"),
+                      (up > 2048 ? up / 1024 : up),
+                      (up > 2048 ? "MBit" : "KBit"));
+}
+
+static ssize_t batadv_store_gw_bwidth(struct kobject *kobj,
+                                     struct attribute *attr, char *buff,
+                                     size_t count)
+{
+       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
+
+       if (buff[count - 1] == '\n')
+               buff[count - 1] = '\0';
+
+       return batadv_gw_bandwidth_set(net_dev, buff, count);
+}
+
+BATADV_ATTR_SIF_BOOL(aggregated_ogms, S_IRUGO | S_IWUSR, NULL);
+BATADV_ATTR_SIF_BOOL(bonding, S_IRUGO | S_IWUSR, NULL);
+#ifdef CONFIG_BATMAN_ADV_BLA
+BATADV_ATTR_SIF_BOOL(bridge_loop_avoidance, S_IRUGO | S_IWUSR, NULL);
+#endif
+BATADV_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, batadv_update_min_mtu);
+BATADV_ATTR_SIF_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL);
+static BATADV_ATTR(vis_mode, S_IRUGO | S_IWUSR, batadv_show_vis_mode,
+                  batadv_store_vis_mode);
+static BATADV_ATTR(routing_algo, S_IRUGO, batadv_show_bat_algo, NULL);
+static BATADV_ATTR(gw_mode, S_IRUGO | S_IWUSR, batadv_show_gw_mode,
+                  batadv_store_gw_mode);
+BATADV_ATTR_SIF_UINT(orig_interval, S_IRUGO | S_IWUSR, 2 * BATADV_JITTER,
+                    INT_MAX, NULL);
+BATADV_ATTR_SIF_UINT(hop_penalty, S_IRUGO | S_IWUSR, 0, BATADV_TQ_MAX_VALUE,
+                    NULL);
+BATADV_ATTR_SIF_UINT(gw_sel_class, S_IRUGO | S_IWUSR, 1, BATADV_TQ_MAX_VALUE,
+                    batadv_post_gw_deselect);
+static BATADV_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, batadv_show_gw_bwidth,
+                  batadv_store_gw_bwidth);
+#ifdef CONFIG_BATMAN_ADV_DEBUG
+BATADV_ATTR_SIF_UINT(log_level, S_IRUGO | S_IWUSR, 0, BATADV_DBG_ALL, NULL);
+#endif
+
+static struct batadv_attribute *batadv_mesh_attrs[] = {
+       &batadv_attr_aggregated_ogms,
+       &batadv_attr_bonding,
+#ifdef CONFIG_BATMAN_ADV_BLA
+       &batadv_attr_bridge_loop_avoidance,
+#endif
+       &batadv_attr_fragmentation,
+       &batadv_attr_ap_isolation,
+       &batadv_attr_vis_mode,
+       &batadv_attr_routing_algo,
+       &batadv_attr_gw_mode,
+       &batadv_attr_orig_interval,
+       &batadv_attr_hop_penalty,
+       &batadv_attr_gw_sel_class,
+       &batadv_attr_gw_bandwidth,
+#ifdef CONFIG_BATMAN_ADV_DEBUG
+       &batadv_attr_log_level,
+#endif
+       NULL,
+};
+
+int batadv_sysfs_add_meshif(struct net_device *dev)
+{
+       struct kobject *batif_kobject = &dev->dev.kobj;
+       struct batadv_priv *bat_priv = netdev_priv(dev);
+       struct batadv_attribute **bat_attr;
+       int err;
+
+       bat_priv->mesh_obj = kobject_create_and_add(BATADV_SYSFS_IF_MESH_SUBDIR,
+                                                   batif_kobject);
+       if (!bat_priv->mesh_obj) {
+               batadv_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,
+                          BATADV_SYSFS_IF_MESH_SUBDIR);
+               goto out;
+       }
+
+       for (bat_attr = batadv_mesh_attrs; *bat_attr; ++bat_attr) {
+               err = sysfs_create_file(bat_priv->mesh_obj,
+                                       &((*bat_attr)->attr));
+               if (err) {
+                       batadv_err(dev, "Can't add sysfs file: %s/%s/%s\n",
+                                  dev->name, BATADV_SYSFS_IF_MESH_SUBDIR,
+                                  ((*bat_attr)->attr).name);
+                       goto rem_attr;
+               }
+       }
+
+       return 0;
+
+rem_attr:
+       for (bat_attr = batadv_mesh_attrs; *bat_attr; ++bat_attr)
+               sysfs_remove_file(bat_priv->mesh_obj, &((*bat_attr)->attr));
+
+       kobject_put(bat_priv->mesh_obj);
+       bat_priv->mesh_obj = NULL;
+out:
+       return -ENOMEM;
+}
+
+void batadv_sysfs_del_meshif(struct net_device *dev)
+{
+       struct batadv_priv *bat_priv = netdev_priv(dev);
+       struct batadv_attribute **bat_attr;
+
+       for (bat_attr = batadv_mesh_attrs; *bat_attr; ++bat_attr)
+               sysfs_remove_file(bat_priv->mesh_obj, &((*bat_attr)->attr));
+
+       kobject_put(bat_priv->mesh_obj);
+       bat_priv->mesh_obj = NULL;
+}
+
+static ssize_t batadv_show_mesh_iface(struct kobject *kobj,
+                                     struct attribute *attr, char *buff)
+{
+       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
+       struct batadv_hard_iface *hard_iface;
+       ssize_t length;
+       const char *ifname;
+
+       hard_iface = batadv_hardif_get_by_netdev(net_dev);
+       if (!hard_iface)
+               return 0;
+
+       if (hard_iface->if_status == BATADV_IF_NOT_IN_USE)
+               ifname =  "none";
+       else
+               ifname = hard_iface->soft_iface->name;
+
+       length = sprintf(buff, "%s\n", ifname);
+
+       batadv_hardif_free_ref(hard_iface);
+
+       return length;
+}
+
+static ssize_t batadv_store_mesh_iface(struct kobject *kobj,
+                                      struct attribute *attr, char *buff,
+                                      size_t count)
+{
+       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
+       struct batadv_hard_iface *hard_iface;
+       int status_tmp = -1;
+       int ret = count;
+
+       hard_iface = batadv_hardif_get_by_netdev(net_dev);
+       if (!hard_iface)
+               return count;
+
+       if (buff[count - 1] == '\n')
+               buff[count - 1] = '\0';
+
+       if (strlen(buff) >= IFNAMSIZ) {
+               pr_err("Invalid parameter for 'mesh_iface' setting received: interface name too long '%s'\n",
+                      buff);
+               batadv_hardif_free_ref(hard_iface);
+               return -EINVAL;
+       }
+
+       if (strncmp(buff, "none", 4) == 0)
+               status_tmp = BATADV_IF_NOT_IN_USE;
+       else
+               status_tmp = BATADV_IF_I_WANT_YOU;
+
+       if (hard_iface->if_status == status_tmp)
+               goto out;
+
+       if ((hard_iface->soft_iface) &&
+           (strncmp(hard_iface->soft_iface->name, buff, IFNAMSIZ) == 0))
+               goto out;
+
+       if (!rtnl_trylock()) {
+               ret = -ERESTARTSYS;
+               goto out;
+       }
+
+       if (status_tmp == BATADV_IF_NOT_IN_USE) {
+               batadv_hardif_disable_interface(hard_iface);
+               goto unlock;
+       }
+
+       /* if the interface already is in use */
+       if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)
+               batadv_hardif_disable_interface(hard_iface);
+
+       ret = batadv_hardif_enable_interface(hard_iface, buff);
+
+unlock:
+       rtnl_unlock();
+out:
+       batadv_hardif_free_ref(hard_iface);
+       return ret;
+}
+
+static ssize_t batadv_show_iface_status(struct kobject *kobj,
+                                       struct attribute *attr, char *buff)
+{
+       struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
+       struct batadv_hard_iface *hard_iface;
+       ssize_t length;
+
+       hard_iface = batadv_hardif_get_by_netdev(net_dev);
+       if (!hard_iface)
+               return 0;
+
+       switch (hard_iface->if_status) {
+       case BATADV_IF_TO_BE_REMOVED:
+               length = sprintf(buff, "disabling\n");
+               break;
+       case BATADV_IF_INACTIVE:
+               length = sprintf(buff, "inactive\n");
+               break;
+       case BATADV_IF_ACTIVE:
+               length = sprintf(buff, "active\n");
+               break;
+       case BATADV_IF_TO_BE_ACTIVATED:
+               length = sprintf(buff, "enabling\n");
+               break;
+       case BATADV_IF_NOT_IN_USE:
+       default:
+               length = sprintf(buff, "not in use\n");
+               break;
+       }
+
+       batadv_hardif_free_ref(hard_iface);
+
+       return length;
+}
+
+static BATADV_ATTR(mesh_iface, S_IRUGO | S_IWUSR, batadv_show_mesh_iface,
+                  batadv_store_mesh_iface);
+static BATADV_ATTR(iface_status, S_IRUGO, batadv_show_iface_status, NULL);
+
+static struct batadv_attribute *batadv_batman_attrs[] = {
+       &batadv_attr_mesh_iface,
+       &batadv_attr_iface_status,
+       NULL,
+};
+
+int batadv_sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev)
+{
+       struct kobject *hardif_kobject = &dev->dev.kobj;
+       struct batadv_attribute **bat_attr;
+       int err;
+
+       *hardif_obj = kobject_create_and_add(BATADV_SYSFS_IF_BAT_SUBDIR,
+                                            hardif_kobject);
+
+       if (!*hardif_obj) {
+               batadv_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,
+                          BATADV_SYSFS_IF_BAT_SUBDIR);
+               goto out;
+       }
+
+       for (bat_attr = batadv_batman_attrs; *bat_attr; ++bat_attr) {
+               err = sysfs_create_file(*hardif_obj, &((*bat_attr)->attr));
+               if (err) {
+                       batadv_err(dev, "Can't add sysfs file: %s/%s/%s\n",
+                                  dev->name, BATADV_SYSFS_IF_BAT_SUBDIR,
+                                  ((*bat_attr)->attr).name);
+                       goto rem_attr;
+               }
+       }
+
+       return 0;
+
+rem_attr:
+       for (bat_attr = batadv_batman_attrs; *bat_attr; ++bat_attr)
+               sysfs_remove_file(*hardif_obj, &((*bat_attr)->attr));
+out:
+       return -ENOMEM;
+}
+
+void batadv_sysfs_del_hardif(struct kobject **hardif_obj)
+{
+       kobject_put(*hardif_obj);
+       *hardif_obj = NULL;
+}
+
+int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,
+                       enum batadv_uev_action action, const char *data)
+{
+       int ret = -ENOMEM;
+       struct batadv_hard_iface *primary_if = NULL;
+       struct kobject *bat_kobj;
+       char *uevent_env[4] = { NULL, NULL, NULL, NULL };
+
+       primary_if = batadv_primary_if_get_selected(bat_priv);
+       if (!primary_if)
+               goto out;
+
+       bat_kobj = &primary_if->soft_iface->dev.kobj;
+
+       uevent_env[0] = kmalloc(strlen(BATADV_UEV_TYPE_VAR) +
+                               strlen(batadv_uev_type_str[type]) + 1,
+                               GFP_ATOMIC);
+       if (!uevent_env[0])
+               goto out;
+
+       sprintf(uevent_env[0], "%s%s", BATADV_UEV_TYPE_VAR,
+               batadv_uev_type_str[type]);
+
+       uevent_env[1] = kmalloc(strlen(BATADV_UEV_ACTION_VAR) +
+                               strlen(batadv_uev_action_str[action]) + 1,
+                               GFP_ATOMIC);
+       if (!uevent_env[1])
+               goto out;
+
+       sprintf(uevent_env[1], "%s%s", BATADV_UEV_ACTION_VAR,
+               batadv_uev_action_str[action]);
+
+       /* If the event is DEL, ignore the data field */
+       if (action != BATADV_UEV_DEL) {
+               uevent_env[2] = kmalloc(strlen(BATADV_UEV_DATA_VAR) +
+                                       strlen(data) + 1, GFP_ATOMIC);
+               if (!uevent_env[2])
+                       goto out;
+
+               sprintf(uevent_env[2], "%s%s", BATADV_UEV_DATA_VAR, data);
+       }
+
+       ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env);
+out:
+       kfree(uevent_env[0]);
+       kfree(uevent_env[1]);
+       kfree(uevent_env[2]);
+
+       if (primary_if)
+               batadv_hardif_free_ref(primary_if);
+
+       if (ret)
+               batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                          "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n",
+                          batadv_uev_type_str[type],
+                          batadv_uev_action_str[action],
+                          (action == BATADV_UEV_DEL ? "NULL" : data), ret);
+       return ret;
+}
diff --git a/net/batman-adv/sysfs.h b/net/batman-adv/sysfs.h
new file mode 100644 (file)
index 0000000..3fd1412
--- /dev/null
@@ -0,0 +1,42 @@
+/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
+ */
+
+#ifndef _NET_BATMAN_ADV_SYSFS_H_
+#define _NET_BATMAN_ADV_SYSFS_H_
+
+#define BATADV_SYSFS_IF_MESH_SUBDIR "mesh"
+#define BATADV_SYSFS_IF_BAT_SUBDIR "batman_adv"
+
+struct batadv_attribute {
+       struct attribute attr;
+       ssize_t (*show)(struct kobject *kobj, struct attribute *attr,
+                       char *buf);
+       ssize_t (*store)(struct kobject *kobj, struct attribute *attr,
+                        char *buf, size_t count);
+};
+
+int batadv_sysfs_add_meshif(struct net_device *dev);
+void batadv_sysfs_del_meshif(struct net_device *dev);
+int batadv_sysfs_add_hardif(struct kobject **hardif_obj,
+                           struct net_device *dev);
+void batadv_sysfs_del_hardif(struct kobject **hardif_obj);
+int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,
+                       enum batadv_uev_action action, const char *data);
+
+#endif /* _NET_BATMAN_ADV_SYSFS_H_ */