Merge branch 'signal-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / net / batman-adv / types.h

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index 965336a3b89d554364d40b45bbee8d25e6e3a714..2f96e96a5ca4ddb800f9bac66a118a6f97d86d89 100644 (file)
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -21,7 +21,6 @@
 #include <linux/netdevice.h>
 #include <linux/netlink.h>
 #include <linux/sched.h> /* for linux/wait.h */
-#include <linux/seq_file.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/timer.h>
@@ -187,9 +186,6 @@ struct batadv_hard_iface {
        /** @net_dev: pointer to the net_device */
        struct net_device *net_dev;
 
-       /** @hardif_obj: kobject of the per interface sysfs "mesh" directory */
-       struct kobject *hardif_obj;
-
        /** @refcount: number of contexts the object is used */
        struct kref refcount;
 
@@ -222,13 +218,6 @@ struct batadv_hard_iface {
        struct batadv_hard_iface_bat_v bat_v;
 #endif
 
-#ifdef CONFIG_BATMAN_ADV_DEBUGFS
-       /**
-        * @debug_dir: dentry for nc subdir in batman-adv directory in debugfs
-        */
-       struct dentry *debug_dir;
-#endif
-
        /**
         * @neigh_list: list of unique single hop neighbors via this interface
         */
@@ -1306,13 +1295,6 @@ struct batadv_priv_nc {
        /** @work: work queue callback item for cleanup */
        struct delayed_work work;
 
-#ifdef CONFIG_BATMAN_ADV_DEBUGFS
-       /**
-        * @debug_dir: dentry for nc subdir in batman-adv directory in debugfs
-        */
-       struct dentry *debug_dir;
-#endif
-
        /**
         * @min_tq: only consider neighbors for encoding if neigh_tq > min_tq
         */
@@ -1512,9 +1494,6 @@ struct batadv_softif_vlan {
        /** @vid: VLAN identifier */
        unsigned short vid;
 
-       /** @kobj: kobject for sysfs vlan subdirectory */
-       struct kobject *kobj;
-
        /** @ap_isolation: AP isolation state */
        atomic_t ap_isolation;          /* boolean */
 
@@ -1667,14 +1646,6 @@ struct batadv_priv {
        /** @batman_queue_left: number of remaining OGM packet slots */
        atomic_t batman_queue_left;
 
-       /** @mesh_obj: kobject for sysfs mesh subdirectory */
-       struct kobject *mesh_obj;
-
-#ifdef CONFIG_BATMAN_ADV_DEBUGFS
-       /** @debug_dir: dentry for debugfs batman-adv subdirectory */
-       struct dentry *debug_dir;
-#endif
-
        /** @forw_bat_list: list of aggregated OGMs that will be forwarded */
        struct hlist_head forw_bat_list;
 
@@ -2234,11 +2205,6 @@ struct batadv_algo_neigh_ops {
                                     struct batadv_neigh_node *neigh2,
                                     struct batadv_hard_iface *if_outgoing2);
 
-#ifdef CONFIG_BATMAN_ADV_DEBUGFS
-       /** @print: print the single hop neighbor list (optional) */
-       void (*print)(struct batadv_priv *priv, struct seq_file *seq);
-#endif
-
        /** @dump: dump neighbors to a netlink socket (optional) */
        void (*dump)(struct sk_buff *msg, struct netlink_callback *cb,
                     struct batadv_priv *priv,
@@ -2249,12 +2215,6 @@ struct batadv_algo_neigh_ops {
  * struct batadv_algo_orig_ops - mesh algorithm callbacks (originator specific)
  */
 struct batadv_algo_orig_ops {
-#ifdef CONFIG_BATMAN_ADV_DEBUGFS
-       /** @print: print the originator table (optional) */
-       void (*print)(struct batadv_priv *priv, struct seq_file *seq,
-                     struct batadv_hard_iface *hard_iface);
-#endif
-
        /** @dump: dump originators to a netlink socket (optional) */
        void (*dump)(struct sk_buff *msg, struct netlink_callback *cb,
                     struct batadv_priv *priv,
@@ -2274,10 +2234,6 @@ struct batadv_algo_gw_ops {
         */
        ssize_t (*store_sel_class)(struct batadv_priv *bat_priv, char *buff,
                                   size_t count);
-
-       /** @show_sel_class: prints the current GW selection class (optional) */
-       ssize_t (*show_sel_class)(struct batadv_priv *bat_priv, char *buff);
-
        /**
         * @get_best_gw_node: select the best GW from the list of available
         *  nodes (optional)
@@ -2293,11 +2249,6 @@ struct batadv_algo_gw_ops {
                            struct batadv_orig_node *curr_gw_orig,
                            struct batadv_orig_node *orig_node);
 
-#ifdef CONFIG_BATMAN_ADV_DEBUGFS
-       /** @print: print the gateway table (optional) */
-       void (*print)(struct batadv_priv *bat_priv, struct seq_file *seq);
-#endif
-
        /** @dump: dump gateways to a netlink socket (optional) */
        void (*dump)(struct sk_buff *msg, struct netlink_callback *cb,
                     struct batadv_priv *priv);
@@ -2456,21 +2407,4 @@ enum batadv_tvlv_handler_flags {
        BATADV_TVLV_HANDLER_OGM_CALLED = BIT(2),
 };
 
-/**
- * struct batadv_store_mesh_work - Work queue item to detach add/del interface
- *  from sysfs locks
- */
-struct batadv_store_mesh_work {
-       /**
-        * @net_dev: netdevice to add/remove to/from batman-adv soft-interface
-        */
-       struct net_device *net_dev;
-
-       /** @soft_iface_name: name of soft-interface to modify */
-       char soft_iface_name[IFNAMSIZ];
-
-       /** @work: work queue item */
-       struct work_struct work;
-};
-
 #endif /* _NET_BATMAN_ADV_TYPES_H_ */