1 files changed, 8 insertions, 10 deletions

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index f35377b643e4..d102f6d9abdc 100644
--- a/net/core/neighbour.c
+++ b/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;
 };
@@ -2559,9 +2556,11 @@ EXPORT_SYMBOL(neigh_app_ns);
 
 #ifdef CONFIG_SYSCTL
 
+#define NEIGH_VARS_MAX 19
+
 static struct neigh_sysctl_table {
         struct ctl_table_header *sysctl_header;
-        struct ctl_table neigh_vars[__NET_NEIGH_MAX];
+        struct ctl_table neigh_vars[NEIGH_VARS_MAX];
         char *dev_name;
 } neigh_sysctl_template __read_mostly = {
         .neigh_vars = {
@@ -2678,8 +2677,7 @@ static struct neigh_sysctl_table {
 };
 
 int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,
-                          int p_id, int pdev_id, char *p_name,
-                          proc_handler *handler)
+                          char *p_name, proc_handler *handler)
 {
         struct neigh_sysctl_table *t;
         const char *dev_name_source = NULL;