Merge tag 'ttm-fixes-3.14-2014-02-05' of git://people.freedesktop.org/~thomash/linux...

[cascardo/linux.git] / net / batman-adv / debugfs.c

diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c
index 049a7a2..b758881 100644 (file)
--- a/net/batman-adv/debugfs.c
+++ b/net/batman-adv/debugfs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010-2013 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2010-2014 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -12,9 +12,7 @@
  * 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
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "main.h"
@@ -250,6 +248,19 @@ static int batadv_originators_open(struct inode *inode, struct file *file)
        return single_open(file, batadv_orig_seq_print_text, net_dev);
 }
 
+/**
+ * batadv_originators_hardif_open - handles debugfs output for the
+ *  originator table of an hard interface
+ * @inode: inode pointer to debugfs file
+ * @file: pointer to the seq_file
+ */
+static int batadv_originators_hardif_open(struct inode *inode,
+                                         struct file *file)
+{
+       struct net_device *net_dev = (struct net_device *)inode->i_private;
+       return single_open(file, batadv_orig_hardif_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;
@@ -371,6 +382,28 @@ static struct batadv_debuginfo *batadv_mesh_debuginfos[] = {
        NULL,
 };
 
+#define BATADV_HARDIF_DEBUGINFO(_name, _mode, _open)           \
+struct batadv_debuginfo batadv_hardif_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_HARDIF_DEBUGINFO(originators, S_IRUGO,
+                              batadv_originators_hardif_open);
+
+static struct batadv_debuginfo *batadv_hardif_debuginfos[] = {
+       &batadv_hardif_debuginfo_originators,
+       NULL,
+};
+
 void batadv_debugfs_init(void)
 {
        struct batadv_debuginfo **bat_debug;
@@ -398,6 +431,7 @@ void batadv_debugfs_init(void)
        return;
 err:
        debugfs_remove_recursive(batadv_debugfs);
+       batadv_debugfs = NULL;
 }
 
 void batadv_debugfs_destroy(void)
@@ -406,6 +440,59 @@ void batadv_debugfs_destroy(void)
        batadv_debugfs = NULL;
 }
 
+/**
+ * batadv_debugfs_add_hardif - creates the base directory for a hard interface
+ *  in debugfs.
+ * @hard_iface: hard interface which should be added.
+ */
+int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface)
+{
+       struct batadv_debuginfo **bat_debug;
+       struct dentry *file;
+
+       if (!batadv_debugfs)
+               goto out;
+
+       hard_iface->debug_dir = debugfs_create_dir(hard_iface->net_dev->name,
+                                                  batadv_debugfs);
+       if (!hard_iface->debug_dir)
+               goto out;
+
+       for (bat_debug = batadv_hardif_debuginfos; *bat_debug; ++bat_debug) {
+               file = debugfs_create_file(((*bat_debug)->attr).name,
+                                          S_IFREG | ((*bat_debug)->attr).mode,
+                                          hard_iface->debug_dir,
+                                          hard_iface->net_dev,
+                                          &(*bat_debug)->fops);
+               if (!file)
+                       goto rem_attr;
+       }
+
+       return 0;
+rem_attr:
+       debugfs_remove_recursive(hard_iface->debug_dir);
+       hard_iface->debug_dir = NULL;
+out:
+#ifdef CONFIG_DEBUG_FS
+       return -ENOMEM;
+#else
+       return 0;
+#endif /* CONFIG_DEBUG_FS */
+}
+
+/**
+ * batadv_debugfs_del_hardif - delete the base directory for a hard interface
+ *  in debugfs.
+ * @hard_iface: hard interface which is deleted.
+ */
+void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface)
+{
+       if (batadv_debugfs) {
+               debugfs_remove_recursive(hard_iface->debug_dir);
+               hard_iface->debug_dir = NULL;
+       }
+}
+
 int batadv_debugfs_add_meshif(struct net_device *dev)
 {
        struct batadv_priv *bat_priv = netdev_priv(dev);