diff options
-rw-r--r-- | include/net/neighbour.h | 3 | ||||
-rw-r--r-- | net/core/neighbour.c | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index aa4b708654a4..365b5e260239 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h | |||
@@ -180,9 +180,6 @@ struct neigh_table | |||
180 | __u32 hash_rnd; | 180 | __u32 hash_rnd; |
181 | unsigned int hash_chain_gc; | 181 | unsigned int hash_chain_gc; |
182 | struct pneigh_entry **phash_buckets; | 182 | struct pneigh_entry **phash_buckets; |
183 | #ifdef CONFIG_PROC_FS | ||
184 | struct proc_dir_entry *pde; | ||
185 | #endif | ||
186 | }; | 183 | }; |
187 | 184 | ||
188 | /* flags for neigh_update() */ | 185 | /* flags for neigh_update() */ |
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index d9bbe010e0ee..500c2430007c 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c | |||
@@ -1424,9 +1424,8 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl) | |||
1424 | panic("cannot create neighbour cache statistics"); | 1424 | panic("cannot create neighbour cache statistics"); |
1425 | 1425 | ||
1426 | #ifdef CONFIG_PROC_FS | 1426 | #ifdef CONFIG_PROC_FS |
1427 | tbl->pde = proc_create_data(tbl->id, 0, init_net.proc_net_stat, | 1427 | if (!proc_create_data(tbl->id, 0, init_net.proc_net_stat, |
1428 | &neigh_stat_seq_fops, tbl); | 1428 | &neigh_stat_seq_fops, tbl)) |
1429 | if (!tbl->pde) | ||
1430 | panic("cannot create neighbour proc dir entry"); | 1429 | panic("cannot create neighbour proc dir entry"); |
1431 | #endif | 1430 | #endif |
1432 | 1431 | ||