From 3cbac496c6d0331fda63ed11fc8f38cd0ac311bd Mon Sep 17 00:00:00 2001
From: Tom Goff <thomas.goff@boeing.com>
Date: Tue, 30 Mar 2010 19:44:56 -0700
Subject: [PATCH] --- yaml --- r: 193890 b: refs/heads/master c:
 7e5ab157813993356f021757d0b0dcbdca7c55a1 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/sched/sch_api.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 06864ba2b05a..9540ffbc18be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9badba2543d165154c540b80e59ff06c1b3e3f76
+refs/heads/master: 7e5ab157813993356f021757d0b0dcbdca7c55a1
diff --git a/trunk/net/sched/sch_api.c b/trunk/net/sched/sch_api.c
index 6d6fe16289f3..c65866da17bc 100644
--- a/trunk/net/sched/sch_api.c
+++ b/trunk/net/sched/sch_api.c
@@ -1683,7 +1683,7 @@ static int psched_show(struct seq_file *seq, void *v)
 
 static int psched_open(struct inode *inode, struct file *file)
 {
-	return single_open(file, psched_show, PDE(inode)->data);
+	return single_open(file, psched_show, NULL);
 }
 
 static const struct file_operations psched_fops = {
@@ -1708,8 +1708,6 @@ static int __net_init psched_net_init(struct net *net)
 static void __net_exit psched_net_exit(struct net *net)
 {
 	proc_net_remove(net, "psched");
-
-	return;
 }
 #else
 static int __net_init psched_net_init(struct net *net)