diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-13 02:39:32 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-13 02:39:32 +0400 |
| commit | 18552b8f227bddf569dade5c69798a37839ea913 (patch) | |
| tree | 2538b43849d9ba6da32e1a309907c9ad488a939c /include | |
| parent | faa88df860fdfad13afc99fc7201432f9263b3b5 (diff) | |
| parent | bd89efc532fe41f867f848144cc8b42054ddf6f9 (diff) | |
| download | linux-18552b8f227bddf569dade5c69798a37839ea913.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NEIGH]: Fix IP-over-ATM and ARP interaction.
[TG3]: ethtool always report port is TP.
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/neighbour.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index b0666d66293f..4901ee446879 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h @@ -211,6 +211,7 @@ struct neigh_table #define NEIGH_UPDATE_F_ADMIN 0x80000000 extern void neigh_table_init(struct neigh_table *tbl); +extern void neigh_table_init_no_netlink(struct neigh_table *tbl); extern int neigh_table_clear(struct neigh_table *tbl); extern struct neighbour * neigh_lookup(struct neigh_table *tbl, const void *pkey, |