summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2014-01-09 14:13:47 +0100
committerDavid S. Miller <davem@davemloft.net>2014-01-16 20:31:58 +0100
commit89740ca74f5bb45d3e0dcb4aa9eab0ba9864bff5 (patch)
tree378e227ef6c2bd2776afc4d6c29d89574fdee9c6 /net
parentMerge branch 'ixgbe' (diff)
downloadlinux-89740ca74f5bb45d3e0dcb4aa9eab0ba9864bff5.tar.xz
linux-89740ca74f5bb45d3e0dcb4aa9eab0ba9864bff5.zip
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')
-rw-r--r--net/802/hippi.c4
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);
int hippi_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p)
{
/* Never send broadcast/multicast ARP messages */
- NEIGH_VAR_SET(p, MCAST_PROBES, 0);
+ NEIGH_VAR_INIT(p, MCAST_PROBES, 0);
/* In IPv6 unicast probes are valid even on NBMA,
* because they are encapsulated in normal IPv6 protocol.
* Should be a generic flag.
*/
if (p->tbl->family != AF_INET6)
- NEIGH_VAR_SET(p, UCAST_PROBES, 0);
+ NEIGH_VAR_INIT(p, UCAST_PROBES, 0);
return 0;
}
EXPORT_SYMBOL(hippi_neigh_setup_dev);