From 45b8d6329b27d8965b5e44e5b3fd49cd54377d86 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Fri, 22 Jan 2010 10:16:05 +0000
Subject: [PATCH] --- yaml --- r: 183727 b: refs/heads/master c:
 81c1ebfc4379f529b001e23164dd5c2282bdc0ec h: refs/heads/master i:   183725:
 4e7c193b94182e0d188755b1a5e967a11eae674c   183723:
 15b1f49048f147d3476ec1ab0fbb1c54613f11a5   183719:
 3b5be045368b09a7bbd62fe03113c701a13df992   183711:
 ea0c6936abc0e9c65070e8fa9e030eb92106e076 v: v3

---
 [refs]                     |  2 +-
 trunk/net/core/neighbour.c | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index af8799afb255..1990fff11548 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a271623f871dda970319ca15dfad3a8c8c36249f
+refs/heads/master: 81c1ebfc4379f529b001e23164dd5c2282bdc0ec
diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c
index f35377b643e4..f2efd72da799 100644
--- a/trunk/net/core/neighbour.c
+++ b/trunk/net/core/neighbour.c
@@ -2417,8 +2417,7 @@ EXPORT_SYMBOL(neigh_seq_stop);
 
 static void *neigh_stat_seq_start(struct seq_file *seq, loff_t *pos)
 {
-	struct proc_dir_entry *pde = seq->private;
-	struct neigh_table *tbl = pde->data;
+	struct neigh_table *tbl = seq->private;
 	int cpu;
 
 	if (*pos == 0)
@@ -2435,8 +2434,7 @@ static void *neigh_stat_seq_start(struct seq_file *seq, loff_t *pos)
 
 static void *neigh_stat_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-	struct proc_dir_entry *pde = seq->private;
-	struct neigh_table *tbl = pde->data;
+	struct neigh_table *tbl = seq->private;
 	int cpu;
 
 	for (cpu = *pos; cpu < nr_cpu_ids; ++cpu) {
@@ -2455,8 +2453,7 @@ static void neigh_stat_seq_stop(struct seq_file *seq, void *v)
 
 static int neigh_stat_seq_show(struct seq_file *seq, void *v)
 {
-	struct proc_dir_entry *pde = seq->private;
-	struct neigh_table *tbl = pde->data;
+	struct neigh_table *tbl = seq->private;
 	struct neigh_statistics *st = v;
 
 	if (v == SEQ_START_TOKEN) {
@@ -2501,7 +2498,7 @@ static int neigh_stat_seq_open(struct inode *inode, struct file *file)
 
 	if (!ret) {
 		struct seq_file *sf = file->private_data;
-		sf->private = PDE(inode);
+		sf->private = PDE(inode)->data;
 	}
 	return ret;
 };