---

yaml --- r: 121832 b: refs/heads/master c: 9b739ba h: refs/heads/master v: v3
git-mirror · Nov 12, 2008 · 138a624 · 138a624
1 parent bb8bb86
commit 138a624
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e452baf6b96b5aeba097afd91501d33d390cc97
+refs/heads/master: 9b739ba5e66c96938fbc07a4dbd9da5b81eac56f
diff --git a/trunk/include/net/neighbour.h b/trunk/include/net/neighbour.h
@@ -180,9 +180,6 @@ struct neigh_table
 	__u32			hash_rnd;
 	unsigned int		hash_chain_gc;
 	struct pneigh_entry	**phash_buckets;
-#ifdef CONFIG_PROC_FS
-	struct proc_dir_entry	*pde;
-#endif
 };
 
 /* flags for neigh_update() */

diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c
@@ -1424,9 +1424,8 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl)
 		panic("cannot create neighbour cache statistics");
 
 #ifdef CONFIG_PROC_FS
-	tbl->pde = proc_create_data(tbl->id, 0, init_net.proc_net_stat,
-				    &neigh_stat_seq_fops, tbl);
-	if (!tbl->pde)
+	if (!proc_create_data(tbl->id, 0, init_net.proc_net_stat,
+			      &neigh_stat_seq_fops, tbl))
 		panic("cannot create neighbour proc dir entry");
 #endif