[patch] Patch to fix error as it is done upstream in version 2.3

xtables-addons-2.1-pknock.patch (text/plain), 1.76 KB, created by Matti Nykyri on 2013-10-06 16:53:06 UTC

--- xtables-addons-2.1/extensions/pknock/xt_pknock.c	2012-12-27 09:01:00.000000000 +0200
+++ xtables-addons-2.1/extensions/pknock/xt_pknock.c	2013-06-18 09:09:18.000000000 +0300
@@ -190,8 +190,7 @@
 static void *
 pknock_seq_start(struct seq_file *s, loff_t *pos)
 {
-	const struct proc_dir_entry *pde = s->private;
-	const struct xt_pknock_rule *rule = pde->data;
+	const struct xt_pknock_rule *rule = s->private;
 
 	spin_lock_bh(&list_lock);
 
@@ -210,8 +209,7 @@
 static void *
 pknock_seq_next(struct seq_file *s, void *v, loff_t *pos)
 {
-	const struct proc_dir_entry *pde = s->private;
-	const struct xt_pknock_rule *rule = pde->data;
+	const struct xt_pknock_rule *rule = s->private;
 
 	++*pos;
 	if (*pos >= peer_hashsize)
@@ -243,8 +241,7 @@
 	unsigned long time;
 	const struct list_head *peer_head = v;
 
-	const struct proc_dir_entry *pde = s->private;
-	const struct xt_pknock_rule *rule = pde->data;
+	const struct xt_pknock_rule *rule = s->private;
 
 	list_for_each_safe(pos, n, peer_head) {
 		peer = list_entry(pos, struct peer, head);
@@ -295,7 +292,7 @@
 	int ret = seq_open(file, &pknock_seq_ops);
 	if (ret == 0) {
 		struct seq_file *sf = file->private_data;
-		sf->private = PDE(inode);
+		sf->private = PDE_DATA(inode);
 	}
 	return ret;
 }
@@ -478,13 +475,11 @@
 	rule->timer.function	= peer_gc;
 	rule->timer.data	= (unsigned long)rule;
 
-	rule->status_proc = create_proc_entry(info->rule_name, 0, pde);
+	rule->status_proc = proc_create_data(info->rule_name, 0, pde,
+	                    &pknock_proc_ops, rule);
 	if (rule->status_proc == NULL)
 		goto out;
 
-	rule->status_proc->proc_fops = &pknock_proc_ops;
-	rule->status_proc->data = rule;
-
 	list_add(&rule->head, &rule_hashtable[hash]);
 	pr_debug("(A) rule_name: %s - created.\n", rule->rule_name);
 	return true;