2 files changed, 7 insertions, 2 deletions

diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 4c09bd23b832..7277caf3743d 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -92,6 +92,11 @@ static inline void neigh_var_set(struct neigh_parms *p, int index, int val)
 }
 
 #define NEIGH_VAR(p, attr) ((p)->data[NEIGH_VAR_ ## attr])
+
+/* In ndo_neigh_setup, NEIGH_VAR_INIT should be used.
+ * In other cases, NEIGH_VAR_SET should be used.
+ */
+#define NEIGH_VAR_INIT(p, attr, val) (NEIGH_VAR(p, attr) = val)
 #define NEIGH_VAR_SET(p, attr, val) neigh_var_set(p, NEIGH_VAR_ ## attr, val)
 
 static inline void neigh_parms_data_state_setall(struct neigh_parms *p)
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);