From d9fd2fc5181805da54646c660f6291a35993da0b Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Sun, 16 Nov 2008 23:01:49 -0800
Subject: [PATCH] --- yaml --- r: 121879 b: refs/heads/master c:
 4d24b52ac5085ef8a264d044f1b302b7c029887a h: refs/heads/master i:   121877:
 efc498c8476dbf1dbd7304ae2a0cb8e636f95d81   121875:
 41df58bf2a253eaf8de53da237d3cd0b7c362816   121871:
 b21422b9372ce5b6355fc8960af97fe508c26743 v: v3

---
 [refs]                      |  2 +-
 trunk/include/net/pkt_cls.h |  2 +-
 trunk/net/sched/ematch.c    | 18 +++---------------
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 098c9b8a22aa..b7daf093c502 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6eba6a372b501aa3cdfb7df21a8364099125b9c4
+refs/heads/master: 4d24b52ac5085ef8a264d044f1b302b7c029887a
diff --git a/trunk/include/net/pkt_cls.h b/trunk/include/net/pkt_cls.h
index aa9e282db485..d1ca31444644 100644
--- a/trunk/include/net/pkt_cls.h
+++ b/trunk/include/net/pkt_cls.h
@@ -246,7 +246,7 @@ struct tcf_ematch_ops
 };
 
 extern int tcf_em_register(struct tcf_ematch_ops *);
-extern int tcf_em_unregister(struct tcf_ematch_ops *);
+extern void tcf_em_unregister(struct tcf_ematch_ops *);
 extern int tcf_em_tree_validate(struct tcf_proto *, struct nlattr *,
 				struct tcf_ematch_tree *);
 extern void tcf_em_tree_destroy(struct tcf_proto *, struct tcf_ematch_tree *);
diff --git a/trunk/net/sched/ematch.c b/trunk/net/sched/ematch.c
index e82519e548d7..aab59409728b 100644
--- a/trunk/net/sched/ematch.c
+++ b/trunk/net/sched/ematch.c
@@ -71,7 +71,7 @@
  *
  *      static void __exit exit_my_ematch(void)
  *      {
- *      	return tcf_em_unregister(&my_ops);
+ *      	tcf_em_unregister(&my_ops);
  *      }
  *
  *      module_init(init_my_ematch);
@@ -154,23 +154,11 @@ EXPORT_SYMBOL(tcf_em_register);
  *
  * Returns -ENOENT if no matching ematch was found.
  */
-int tcf_em_unregister(struct tcf_ematch_ops *ops)
+void tcf_em_unregister(struct tcf_ematch_ops *ops)
 {
-	int err = 0;
-	struct tcf_ematch_ops *e;
-
 	write_lock(&ematch_mod_lock);
-	list_for_each_entry(e, &ematch_ops, link) {
-		if (e == ops) {
-			list_del(&e->link);
-			goto out;
-		}
-	}
-
-	err = -ENOENT;
-out:
+	list_del(&ops->link);
 	write_unlock(&ematch_mod_lock);
-	return err;
 }
 EXPORT_SYMBOL(tcf_em_unregister);