From 970002181c9392a72b0e2fe47ffecea20b4f9dd7 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Thu, 7 Feb 2008 18:13:00 -0800
Subject: [PATCH] --- yaml --- r: 84857 b: refs/heads/master c:
 04f217aca4d803fe72c2c54fe460d68f5233ce52 h: refs/heads/master i:   84855:
 1c2ae7e1c7f4aa3ab815c5eca776bd92ba622947 v: v3

---
 [refs]                    |  2 +-
 trunk/net/sched/em_meta.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 62a5d57aed43..2f71c2ab4720 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e881a217bd1403960eb8f32297ba9d226c6d5ae
+refs/heads/master: 04f217aca4d803fe72c2c54fe460d68f5233ce52
diff --git a/trunk/net/sched/em_meta.c b/trunk/net/sched/em_meta.c
index 2a7e648fbcf4..d417ec8e3ca3 100644
--- a/trunk/net/sched/em_meta.c
+++ b/trunk/net/sched/em_meta.c
@@ -735,11 +735,13 @@ static int em_meta_match(struct sk_buff *skb, struct tcf_ematch *m,
 
 static inline void meta_delete(struct meta_match *meta)
 {
-	struct meta_type_ops *ops = meta_type_ops(&meta->lvalue);
+	if (meta) {
+		struct meta_type_ops *ops = meta_type_ops(&meta->lvalue);
 
-	if (ops && ops->destroy) {
-		ops->destroy(&meta->lvalue);
-		ops->destroy(&meta->rvalue);
+		if (ops && ops->destroy) {
+			ops->destroy(&meta->lvalue);
+			ops->destroy(&meta->rvalue);
+		}
 	}
 
 	kfree(meta);