neigh: use NEIGH_VAR_INIT in ndo_neigh_setup functions.

[deliverable/linux.git] / net / 802 / hippi.c

diff --git a/net/802/hippi.c b/net/802/hippi.c
index 056794e6637536c043f1de97a331d090e5f9c7a6..5ff2a718ddcac1624809f563f5dfc12d5cad46f9 100644 (file)
--- a/net/802/hippi.c
+++ b/net/802/hippi.c
@@ -45,7 +45,7 @@
 
 static int hippi_header(struct sk_buff *skb, struct net_device *dev,
                        unsigned short type,
-                       const void *daddr, const void *saddr, unsigned len)
+                       const void *daddr, const void *saddr, unsigned int len)
 {
        struct hippi_hdr *hip = (struct hippi_hdr *)skb_push(skb, HIPPI_HLEN);
        struct hippi_cb *hcb = (struct hippi_cb *) skb->cb;
@@ -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 */
-       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)
-               p->ucast_probes = 0;
+               NEIGH_VAR_INIT(p, UCAST_PROBES, 0);
        return 0;
 }
 EXPORT_SYMBOL(hippi_neigh_setup_dev);