diff options
Diffstat (limited to 'net/decnet/dn_neigh.c')
-rw-r--r-- | net/decnet/dn_neigh.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c index 0363bb95cc7d..a085dbcf5c7f 100644 --- a/net/decnet/dn_neigh.c +++ b/net/decnet/dn_neigh.c | |||
@@ -48,7 +48,6 @@ | |||
48 | #include <net/dn_neigh.h> | 48 | #include <net/dn_neigh.h> |
49 | #include <net/dn_route.h> | 49 | #include <net/dn_route.h> |
50 | 50 | ||
51 | static u32 dn_neigh_hash(const void *pkey, const struct net_device *dev); | ||
52 | static int dn_neigh_construct(struct neighbour *); | 51 | static int dn_neigh_construct(struct neighbour *); |
53 | static void dn_long_error_report(struct neighbour *, struct sk_buff *); | 52 | static void dn_long_error_report(struct neighbour *, struct sk_buff *); |
54 | static void dn_short_error_report(struct neighbour *, struct sk_buff *); | 53 | static void dn_short_error_report(struct neighbour *, struct sk_buff *); |
@@ -93,6 +92,13 @@ static const struct neigh_ops dn_phase3_ops = { | |||
93 | .queue_xmit = dev_queue_xmit | 92 | .queue_xmit = dev_queue_xmit |
94 | }; | 93 | }; |
95 | 94 | ||
95 | static u32 dn_neigh_hash(const void *pkey, | ||
96 | const struct net_device *dev, | ||
97 | __u32 hash_rnd) | ||
98 | { | ||
99 | return jhash_2words(*(__u16 *)pkey, 0, hash_rnd); | ||
100 | } | ||
101 | |||
96 | struct neigh_table dn_neigh_table = { | 102 | struct neigh_table dn_neigh_table = { |
97 | .family = PF_DECnet, | 103 | .family = PF_DECnet, |
98 | .entry_size = sizeof(struct dn_neigh), | 104 | .entry_size = sizeof(struct dn_neigh), |
@@ -122,11 +128,6 @@ struct neigh_table dn_neigh_table = { | |||
122 | .gc_thresh3 = 1024, | 128 | .gc_thresh3 = 1024, |
123 | }; | 129 | }; |
124 | 130 | ||
125 | static u32 dn_neigh_hash(const void *pkey, const struct net_device *dev) | ||
126 | { | ||
127 | return jhash_2words(*(__u16 *)pkey, 0, dn_neigh_table.hash_rnd); | ||
128 | } | ||
129 | |||
130 | static int dn_neigh_construct(struct neighbour *neigh) | 131 | static int dn_neigh_construct(struct neighbour *neigh) |
131 | { | 132 | { |
132 | struct net_device *dev = neigh->dev; | 133 | struct net_device *dev = neigh->dev; |