diff options
author | Jiri Pirko <jiri@resnulli.us> | 2014-01-09 08:13:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-16 14:31:58 -0500 |
commit | 89740ca74f5bb45d3e0dcb4aa9eab0ba9864bff5 (patch) | |
tree | 378e227ef6c2bd2776afc4d6c29d89574fdee9c6 /net/802 | |
parent | d6e26404732ac5d82ee34e197c35241d581d1c4c (diff) |
neigh: use NEIGH_VAR_INIT in ndo_neigh_setup functions.
When ndo_neigh_setup is called, the bitfield used by NEIGH_VAR_SET is
not initialized yet. This might cause confusion for the people who use
NEIGH_VAR_SET in ndo_neigh_setup. So rather introduce NEIGH_VAR_INIT for
usage in ndo_neigh_setup.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/802')
-rw-r--r-- | net/802/hippi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/802/hippi.c b/net/802/hippi.c index a97a3bde77bb..5ff2a718ddca 100644 --- a/net/802/hippi.c +++ b/net/802/hippi.c | |||
@@ -172,14 +172,14 @@ EXPORT_SYMBOL(hippi_mac_addr); | |||
172 | int hippi_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p) | 172 | int hippi_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p) |
173 | { | 173 | { |
174 | /* Never send broadcast/multicast ARP messages */ | 174 | /* Never send broadcast/multicast ARP messages */ |
175 | NEIGH_VAR_SET(p, MCAST_PROBES, 0); | 175 | NEIGH_VAR_INIT(p, MCAST_PROBES, 0); |
176 | 176 | ||
177 | /* In IPv6 unicast probes are valid even on NBMA, | 177 | /* In IPv6 unicast probes are valid even on NBMA, |
178 | * because they are encapsulated in normal IPv6 protocol. | 178 | * because they are encapsulated in normal IPv6 protocol. |
179 | * Should be a generic flag. | 179 | * Should be a generic flag. |
180 | */ | 180 | */ |
181 | if (p->tbl->family != AF_INET6) | 181 | if (p->tbl->family != AF_INET6) |
182 | NEIGH_VAR_SET(p, UCAST_PROBES, 0); | 182 | NEIGH_VAR_INIT(p, UCAST_PROBES, 0); |
183 | return 0; | 183 | return 0; |
184 | } | 184 | } |
185 | EXPORT_SYMBOL(hippi_neigh_setup_dev); | 185 | EXPORT_SYMBOL(hippi_neigh_setup_dev); |