[B.A.T.M.A.N.] [PATCH next] Revert "batman-adv: export compatibility version via debugfs"

[B.A.T.M.A.N.] [PATCH next] Revert "batman-adv: export compatibility version via debugfs"

[Antonio Quartulli]

This reverts commit 0679ec75758588e185ceec11e5823de65b427a6f.

Conflicts:
	main.c
	main.h

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
---
 debugfs.c | 12 ------------
 main.c    | 12 ------------
 main.h    |  1 -
 3 files changed, 25 deletions(-)

diff --git a/debugfs.c b/debugfs.c
index ae79b19..6f58ddd 100644
--- a/debugfs.c
+++ b/debugfs.c
@@ -245,16 +245,6 @@ static int batadv_algorithms_open(struct inode *inode, struct file *file)
 	return single_open(file, batadv_algo_seq_print_text, NULL);
 }
 
-/**
- * batadv_compat_open - Prepare file handler for printing of the compat version
- * @inode: inode which was opened
- * @file: file handle to be initialized
- */
-static int batadv_compat_open(struct inode *inode, struct file *file)
-{
-	return single_open(file, batadv_compat_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;
@@ -337,11 +327,9 @@ struct batadv_debuginfo batadv_debuginfo_##_name = {	\
  * placed in the BATADV_DEBUGFS_SUBDIR subdirectory of debugfs
  */
 static BATADV_DEBUGINFO(routing_algos, S_IRUGO, batadv_algorithms_open);
-static BATADV_DEBUGINFO(compat_version, S_IRUGO, batadv_compat_open);
 
 static struct batadv_debuginfo *batadv_general_debuginfos[] = {
 	&batadv_debuginfo_routing_algos,
-	&batadv_debuginfo_compat_version,
 	NULL,
 };
 
diff --git a/main.c b/main.c
index 253e240..f65a222 100644
--- a/main.c
+++ b/main.c
@@ -423,18 +423,6 @@ int batadv_algo_seq_print_text(struct seq_file *seq, void *offset)
 }
 
 /**
- * batadv_compat_seq_print_text - print the compatibility version
- * @seq: debugfs table seq_file struct
- * @offset: not used
- */
-int batadv_compat_seq_print_text(struct seq_file *seq, void *offset)
-{
-	seq_printf(seq, "%d\n", BATADV_COMPAT_VERSION);
-
-	return 0;
-}
-
-/**
  * batadv_skb_crc32 - calculate CRC32 of the whole packet and skip bytes in
  *  the header
  * @skb: skb pointing to fragmented socket buffers
diff --git a/main.h b/main.h
index ec9c5ad..94de8ee 100644
--- a/main.h
+++ b/main.h
@@ -176,7 +176,6 @@ void batadv_recv_handler_unregister(uint8_t packet_type);
 int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops);
 int batadv_algo_select(struct batadv_priv *bat_priv, char *name);
 int batadv_algo_seq_print_text(struct seq_file *seq, void *offset);
-int batadv_compat_seq_print_text(struct seq_file *seq, void *offset);
 __be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr);
 
 /**
-- 
1.8.0

Re: [B.A.T.M.A.N.] [PATCH next] Revert "batman-adv: export compatibility version via debugfs"

[Sven Eckelmann]

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

On Tuesday 20 November 2012 20:44:15 Antonio Quartulli wrote:
> This reverts commit 0679ec75758588e185ceec11e5823de65b427a6f.
> 
> Conflicts:
> 	main.c
> 	main.h
> 
> Signed-off-by: Antonio Quartulli <ordex@autistici.org>

Please also revert a88e6b7b938ae201deba074e819b299ebb1c165f in batctl.

Kind regards,
	Sven

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [B.A.T.M.A.N.] [PATCH next] Revert "batman-adv: export compatibility version via debugfs"

[Marek Lindner]

On Wednesday, November 21, 2012 03:44:15 Antonio Quartulli wrote:
> This reverts commit 0679ec75758588e185ceec11e5823de65b427a6f.
> 
> Conflicts:
>         main.c
>         main.h
> 
> Signed-off-by: Antonio Quartulli <ordex@autistici.org>
> ---
>  debugfs.c | 12 ------------
>  main.c    | 12 ------------
>  main.h    |  1 -
>  3 files changed, 25 deletions(-)

Applied in revision eba8ed0.

Thanks,
Marek