fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git] / net / ipv4 / fib_semantics.c
index c1b6060..e63b8a9 100644 (file)
  *             2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/jiffies.h>
 #include <linux/errno.h>
 #include <linux/in.h>
 #include <linux/inet.h>
+#include <linux/inetdevice.h>
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
 #include <linux/proc_fs.h>
 #include <linux/skbuff.h>
-#include <linux/netlink.h>
 #include <linux/init.h>
 
+#include <net/arp.h>
 #include <net/ip.h>
 #include <net/protocol.h>
 #include <net/route.h>
 #include <net/tcp.h>
 #include <net/sock.h>
 #include <net/ip_fib.h>
+#include <net/ip_mp_alg.h>
+#include <net/netlink.h>
+#include <net/nexthop.h>
 
-#define FSprintk(a...)
+#include "fib_lookup.h"
 
-static struct fib_info         *fib_info_list;
-static rwlock_t fib_info_lock = RW_LOCK_UNLOCKED;
-int fib_info_cnt;
+#define FSprintk(a...)
 
-#define for_fib_info() { struct fib_info *fi; \
-       for (fi = fib_info_list; fi; fi = fi->fib_next)
+static DEFINE_SPINLOCK(fib_info_lock);
+static struct hlist_head *fib_info_hash;
+static struct hlist_head *fib_info_laddrhash;
+static unsigned int fib_hash_size;
+static unsigned int fib_info_cnt;
 
-#define endfor_fib_info() }
+#define DEVINDEX_HASHBITS 8
+#define DEVINDEX_HASHSIZE (1U << DEVINDEX_HASHBITS)
+static struct hlist_head fib_info_devhash[DEVINDEX_HASHSIZE];
 
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
 
-static spinlock_t fib_multipath_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(fib_multipath_lock);
 
 #define for_nexthops(fi) { int nhsel; const struct fib_nh * nh; \
 for (nhsel=0, nh = (fi)->fib_nh; nhsel < (fi)->fib_nhs; nh++, nhsel++)
@@ -79,7 +85,7 @@ for (nhsel=0; nhsel < 1; nhsel++)
 #define endfor_nexthops(fi) }
 
 
-static struct 
+static const struct 
 {
        int     error;
        u8      scope;
@@ -124,17 +130,10 @@ static struct
                .error  = -EAGAIN,
                .scope  = RT_SCOPE_UNIVERSE,
        },      /* RTN_THROW */
-#ifdef CONFIG_IP_ROUTE_NAT
-       {
-               .error  = 0,
-               .scope  = RT_SCOPE_HOST,
-       },      /* RTN_NAT */
-#else
        {
                .error  = -EINVAL,
                .scope  = RT_SCOPE_NOWHERE,
        },      /* RTN_NAT */
-#endif
        {
                .error  = -EINVAL,
                .scope  = RT_SCOPE_NOWHERE,
@@ -161,18 +160,20 @@ void free_fib_info(struct fib_info *fi)
 
 void fib_release_info(struct fib_info *fi)
 {
-       write_lock(&fib_info_lock);
+       spin_lock_bh(&fib_info_lock);
        if (fi && --fi->fib_treeref == 0) {
-               if (fi->fib_next)
-                       fi->fib_next->fib_prev = fi->fib_prev;
-               if (fi->fib_prev)
-                       fi->fib_prev->fib_next = fi->fib_next;
-               if (fi == fib_info_list)
-                       fib_info_list = fi->fib_next;
+               hlist_del(&fi->fib_hash);
+               if (fi->fib_prefsrc)
+                       hlist_del(&fi->fib_lhash);
+               change_nexthops(fi) {
+                       if (!nh->nh_dev)
+                               continue;
+                       hlist_del(&nh->nh_hash);
+               } endfor_nexthops(fi)
                fi->fib_dead = 1;
                fib_info_put(fi);
        }
-       write_unlock(&fib_info_lock);
+       spin_unlock_bh(&fib_info_lock);
 }
 
 static __inline__ int nh_comp(const struct fib_info *fi, const struct fib_info *ofi)
@@ -196,143 +197,270 @@ static __inline__ int nh_comp(const struct fib_info *fi, const struct fib_info *
        return 0;
 }
 
-static __inline__ struct fib_info * fib_find_info(const struct fib_info *nfi)
+static inline unsigned int fib_info_hashfn(const struct fib_info *fi)
+{
+       unsigned int mask = (fib_hash_size - 1);
+       unsigned int val = fi->fib_nhs;
+
+       val ^= fi->fib_protocol;
+       val ^= (__force u32)fi->fib_prefsrc;
+       val ^= fi->fib_priority;
+
+       return (val ^ (val >> 7) ^ (val >> 12)) & mask;
+}
+
+static struct fib_info *fib_find_info(const struct fib_info *nfi)
 {
-       for_fib_info() {
+       struct hlist_head *head;
+       struct hlist_node *node;
+       struct fib_info *fi;
+       unsigned int hash;
+
+       hash = fib_info_hashfn(nfi);
+       head = &fib_info_hash[hash];
+
+       hlist_for_each_entry(fi, node, head, fib_hash) {
                if (fi->fib_nhs != nfi->fib_nhs)
                        continue;
                if (nfi->fib_protocol == fi->fib_protocol &&
                    nfi->fib_prefsrc == fi->fib_prefsrc &&
                    nfi->fib_priority == fi->fib_priority &&
-                   memcmp(nfi->fib_metrics, fi->fib_metrics, sizeof(fi->fib_metrics)) == 0 &&
+                   memcmp(nfi->fib_metrics, fi->fib_metrics,
+                          sizeof(fi->fib_metrics)) == 0 &&
                    ((nfi->fib_flags^fi->fib_flags)&~RTNH_F_DEAD) == 0 &&
                    (nfi->fib_nhs == 0 || nh_comp(fi, nfi) == 0))
                        return fi;
-       } endfor_fib_info();
+       }
+
        return NULL;
 }
 
+static inline unsigned int fib_devindex_hashfn(unsigned int val)
+{
+       unsigned int mask = DEVINDEX_HASHSIZE - 1;
+
+       return (val ^
+               (val >> DEVINDEX_HASHBITS) ^
+               (val >> (DEVINDEX_HASHBITS * 2))) & mask;
+}
+
 /* Check, that the gateway is already configured.
    Used only by redirect accept routine.
  */
 
-int ip_fib_check_default(u32 gw, struct net_device *dev)
+int ip_fib_check_default(__be32 gw, struct net_device *dev)
 {
-       read_lock(&fib_info_lock);
-       for_fib_info() {
-               if (fi->fib_flags & RTNH_F_DEAD)
-                       continue;
-               for_nexthops(fi) {
-                       if (nh->nh_dev == dev && nh->nh_gw == gw &&
-                           nh->nh_scope == RT_SCOPE_LINK &&
-                           !(nh->nh_flags&RTNH_F_DEAD)) {
-                               read_unlock(&fib_info_lock);
-                               return 0;
-                       }
-               } endfor_nexthops(fi);
-       } endfor_fib_info();
-       read_unlock(&fib_info_lock);
+       struct hlist_head *head;
+       struct hlist_node *node;
+       struct fib_nh *nh;
+       unsigned int hash;
+
+       spin_lock(&fib_info_lock);
+
+       hash = fib_devindex_hashfn(dev->ifindex);
+       head = &fib_info_devhash[hash];
+       hlist_for_each_entry(nh, node, head, nh_hash) {
+               if (nh->nh_dev == dev &&
+                   nh->nh_gw == gw &&
+                   !(nh->nh_flags&RTNH_F_DEAD)) {
+                       spin_unlock(&fib_info_lock);
+                       return 0;
+               }
+       }
+
+       spin_unlock(&fib_info_lock);
+
        return -1;
 }
 
-#ifdef CONFIG_IP_ROUTE_MULTIPATH
+static inline size_t fib_nlmsg_size(struct fib_info *fi)
+{
+       size_t payload = NLMSG_ALIGN(sizeof(struct rtmsg))
+                        + nla_total_size(4) /* RTA_TABLE */
+                        + nla_total_size(4) /* RTA_DST */
+                        + nla_total_size(4) /* RTA_PRIORITY */
+                        + nla_total_size(4); /* RTA_PREFSRC */
+
+       /* space for nested metrics */
+       payload += nla_total_size((RTAX_MAX * nla_total_size(4)));
+
+       if (fi->fib_nhs) {
+               /* Also handles the special case fib_nhs == 1 */
+
+               /* each nexthop is packed in an attribute */
+               size_t nhsize = nla_total_size(sizeof(struct rtnexthop));
 
-static u32 fib_get_attr32(struct rtattr *attr, int attrlen, int type)
+               /* may contain flow and gateway attribute */
+               nhsize += 2 * nla_total_size(4);
+
+               /* all nexthops are packed in a nested attribute */
+               payload += nla_total_size(fi->fib_nhs * nhsize);
+       }
+
+       return payload;
+}
+
+void rtmsg_fib(int event, __be32 key, struct fib_alias *fa,
+              int dst_len, u32 tb_id, struct nl_info *info)
 {
-       while (RTA_OK(attr,attrlen)) {
-               if (attr->rta_type == type)
-                       return *(u32*)RTA_DATA(attr);
-               attr = RTA_NEXT(attr, attrlen);
+       struct sk_buff *skb;
+       u32 seq = info->nlh ? info->nlh->nlmsg_seq : 0;
+       int err = -ENOBUFS;
+
+       skb = nlmsg_new(fib_nlmsg_size(fa->fa_info), GFP_KERNEL);
+       if (skb == NULL)
+               goto errout;
+
+       err = fib_dump_info(skb, info->pid, seq, event, tb_id,
+                           fa->fa_type, fa->fa_scope, key, dst_len,
+                           fa->fa_tos, fa->fa_info, 0);
+       /* failure implies BUG in fib_nlmsg_size() */
+       BUG_ON(err < 0);
+
+       err = rtnl_notify(skb, info->pid, RTNLGRP_IPV4_ROUTE,
+                         info->nlh, GFP_KERNEL);
+errout:
+       if (err < 0)
+               rtnl_set_sk_err(RTNLGRP_IPV4_ROUTE, err);
+}
+
+/* Return the first fib alias matching TOS with
+ * priority less than or equal to PRIO.
+ */
+struct fib_alias *fib_find_alias(struct list_head *fah, u8 tos, u32 prio)
+{
+       if (fah) {
+               struct fib_alias *fa;
+               list_for_each_entry(fa, fah, fa_list) {
+                       if (fa->fa_tos > tos)
+                               continue;
+                       if (fa->fa_info->fib_priority >= prio ||
+                           fa->fa_tos < tos)
+                               return fa;
+               }
        }
-       return 0;
+       return NULL;
+}
+
+int fib_detect_death(struct fib_info *fi, int order,
+                    struct fib_info **last_resort, int *last_idx, int *dflt)
+{
+       struct neighbour *n;
+       int state = NUD_NONE;
+
+       n = neigh_lookup(&arp_tbl, &fi->fib_nh[0].nh_gw, fi->fib_dev);
+       if (n) {
+               state = n->nud_state;
+               neigh_release(n);
+       }
+       if (state==NUD_REACHABLE)
+               return 0;
+       if ((state&NUD_VALID) && order != *dflt)
+               return 0;
+       if ((state&NUD_VALID) ||
+           (*last_idx<0 && order > *dflt)) {
+               *last_resort = fi;
+               *last_idx = order;
+       }
+       return 1;
 }
 
-static int
-fib_count_nexthops(struct rtattr *rta)
+#ifdef CONFIG_IP_ROUTE_MULTIPATH
+
+static int fib_count_nexthops(struct rtnexthop *rtnh, int remaining)
 {
        int nhs = 0;
-       struct rtnexthop *nhp = RTA_DATA(rta);
-       int nhlen = RTA_PAYLOAD(rta);
 
-       while (nhlen >= (int)sizeof(struct rtnexthop)) {
-               if ((nhlen -= nhp->rtnh_len) < 0)
-                       return 0;
+       while (rtnh_ok(rtnh, remaining)) {
                nhs++;
-               nhp = RTNH_NEXT(nhp);
-       };
-       return nhs;
+               rtnh = rtnh_next(rtnh, &remaining);
+       }
+
+       /* leftover implies invalid nexthop configuration, discard it */
+       return remaining > 0 ? 0 : nhs;
 }
 
-static int
-fib_get_nhs(struct fib_info *fi, const struct rtattr *rta, const struct rtmsg *r)
+static int fib_get_nhs(struct fib_info *fi, struct rtnexthop *rtnh,
+                      int remaining, struct fib_config *cfg)
 {
-       struct rtnexthop *nhp = RTA_DATA(rta);
-       int nhlen = RTA_PAYLOAD(rta);
-
        change_nexthops(fi) {
-               int attrlen = nhlen - sizeof(struct rtnexthop);
-               if (attrlen < 0 || (nhlen -= nhp->rtnh_len) < 0)
+               int attrlen;
+
+               if (!rtnh_ok(rtnh, remaining))
                        return -EINVAL;
-               nh->nh_flags = (r->rtm_flags&~0xFF) | nhp->rtnh_flags;
-               nh->nh_oif = nhp->rtnh_ifindex;
-               nh->nh_weight = nhp->rtnh_hops + 1;
-               if (attrlen) {
-                       nh->nh_gw = fib_get_attr32(RTNH_DATA(nhp), attrlen, RTA_GATEWAY);
+
+               nh->nh_flags = (cfg->fc_flags & ~0xFF) | rtnh->rtnh_flags;
+               nh->nh_oif = rtnh->rtnh_ifindex;
+               nh->nh_weight = rtnh->rtnh_hops + 1;
+
+               attrlen = rtnh_attrlen(rtnh);
+               if (attrlen > 0) {
+                       struct nlattr *nla, *attrs = rtnh_attrs(rtnh);
+
+                       nla = nla_find(attrs, attrlen, RTA_GATEWAY);
+                       nh->nh_gw = nla ? nla_get_be32(nla) : 0;
 #ifdef CONFIG_NET_CLS_ROUTE
-                       nh->nh_tclassid = fib_get_attr32(RTNH_DATA(nhp), attrlen, RTA_FLOW);
+                       nla = nla_find(attrs, attrlen, RTA_FLOW);
+                       nh->nh_tclassid = nla ? nla_get_u32(nla) : 0;
 #endif
                }
-               nhp = RTNH_NEXT(nhp);
+
+               rtnh = rtnh_next(rtnh, &remaining);
        } endfor_nexthops(fi);
+
        return 0;
 }
 
 #endif
 
-int fib_nh_match(struct rtmsg *r, struct nlmsghdr *nlh, struct kern_rta *rta,
-                struct fib_info *fi)
+int fib_nh_match(struct fib_config *cfg, struct fib_info *fi)
 {
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
-       struct rtnexthop *nhp;
-       int nhlen;
+       struct rtnexthop *rtnh;
+       int remaining;
 #endif
 
-       if (rta->rta_priority &&
-           *rta->rta_priority != fi->fib_priority)
+       if (cfg->fc_priority && cfg->fc_priority != fi->fib_priority)
                return 1;
 
-       if (rta->rta_oif || rta->rta_gw) {
-               if ((!rta->rta_oif || *rta->rta_oif == fi->fib_nh->nh_oif) &&
-                   (!rta->rta_gw  || memcmp(rta->rta_gw, &fi->fib_nh->nh_gw, 4) == 0))
+       if (cfg->fc_oif || cfg->fc_gw) {
+               if ((!cfg->fc_oif || cfg->fc_oif == fi->fib_nh->nh_oif) &&
+                   (!cfg->fc_gw  || cfg->fc_gw == fi->fib_nh->nh_gw))
                        return 0;
                return 1;
        }
 
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
-       if (rta->rta_mp == NULL)
+       if (cfg->fc_mp == NULL)
                return 0;
-       nhp = RTA_DATA(rta->rta_mp);
-       nhlen = RTA_PAYLOAD(rta->rta_mp);
+
+       rtnh = cfg->fc_mp;
+       remaining = cfg->fc_mp_len;
        
        for_nexthops(fi) {
-               int attrlen = nhlen - sizeof(struct rtnexthop);
-               u32 gw;
+               int attrlen;
 
-               if (attrlen < 0 || (nhlen -= nhp->rtnh_len) < 0)
+               if (!rtnh_ok(rtnh, remaining))
                        return -EINVAL;
-               if (nhp->rtnh_ifindex && nhp->rtnh_ifindex != nh->nh_oif)
+
+               if (rtnh->rtnh_ifindex && rtnh->rtnh_ifindex != nh->nh_oif)
                        return 1;
-               if (attrlen) {
-                       gw = fib_get_attr32(RTNH_DATA(nhp), attrlen, RTA_GATEWAY);
-                       if (gw && gw != nh->nh_gw)
+
+               attrlen = rtnh_attrlen(rtnh);
+               if (attrlen < 0) {
+                       struct nlattr *nla, *attrs = rtnh_attrs(rtnh);
+
+                       nla = nla_find(attrs, attrlen, RTA_GATEWAY);
+                       if (nla && nla_get_be32(nla) != nh->nh_gw)
                                return 1;
 #ifdef CONFIG_NET_CLS_ROUTE
-                       gw = fib_get_attr32(RTNH_DATA(nhp), attrlen, RTA_FLOW);
-                       if (gw && gw != nh->nh_tclassid)
+                       nla = nla_find(attrs, attrlen, RTA_FLOW);
+                       if (nla && nla_get_u32(nla) != nh->nh_tclassid)
                                return 1;
 #endif
                }
-               nhp = RTNH_NEXT(nhp);
+
+               rtnh = rtnh_next(rtnh, &remaining);
        } endfor_nexthops(fi);
 #endif
        return 0;
@@ -383,7 +511,8 @@ int fib_nh_match(struct rtmsg *r, struct nlmsghdr *nlh, struct kern_rta *rta,
                                                |-> {local prefix} (terminal node)
  */
 
-static int fib_check_nh(const struct rtmsg *r, struct fib_info *fi, struct fib_nh *nh)
+static int fib_check_nh(struct fib_config *cfg, struct fib_info *fi,
+                       struct fib_nh *nh)
 {
        int err;
 
@@ -397,7 +526,7 @@ static int fib_check_nh(const struct rtmsg *r, struct fib_info *fi, struct fib_n
                if (nh->nh_flags&RTNH_F_ONLINK) {
                        struct net_device *dev;
 
-                       if (r->rtm_scope >= RT_SCOPE_LINK)
+                       if (cfg->fc_scope >= RT_SCOPE_LINK)
                                return -EINVAL;
                        if (inet_addr_type(nh->nh_gw) != RTN_UNICAST)
                                return -EINVAL;
@@ -411,10 +540,15 @@ static int fib_check_nh(const struct rtmsg *r, struct fib_info *fi, struct fib_n
                        return 0;
                }
                {
-                       struct flowi fl = { .nl_u = { .ip4_u =
-                                                     { .daddr = nh->nh_gw,
-                                                       .scope = r->rtm_scope + 1 } },
-                                           .oif = nh->nh_oif };
+                       struct flowi fl = {
+                               .nl_u = {
+                                       .ip4_u = {
+                                               .daddr = nh->nh_gw,
+                                               .scope = cfg->fc_scope + 1,
+                                       },
+                               },
+                               .oif = nh->nh_oif,
+                       };
 
                        /* It is not necessary, but requires a bit of thinking */
                        if (fl.fl4_scope < RT_SCOPE_LINK)
@@ -458,70 +592,182 @@ out:
        return 0;
 }
 
-struct fib_info *
-fib_create_info(const struct rtmsg *r, struct kern_rta *rta,
-               const struct nlmsghdr *nlh, int *errp)
+static inline unsigned int fib_laddr_hashfn(__be32 val)
+{
+       unsigned int mask = (fib_hash_size - 1);
+
+       return ((__force u32)val ^ ((__force u32)val >> 7) ^ ((__force u32)val >> 14)) & mask;
+}
+
+static struct hlist_head *fib_hash_alloc(int bytes)
+{
+       if (bytes <= PAGE_SIZE)
+               return kmalloc(bytes, GFP_KERNEL);
+       else
+               return (struct hlist_head *)
+                       __get_free_pages(GFP_KERNEL, get_order(bytes));
+}
+
+static void fib_hash_free(struct hlist_head *hash, int bytes)
+{
+       if (!hash)
+               return;
+
+       if (bytes <= PAGE_SIZE)
+               kfree(hash);
+       else
+               free_pages((unsigned long) hash, get_order(bytes));
+}
+
+static void fib_hash_move(struct hlist_head *new_info_hash,
+                         struct hlist_head *new_laddrhash,
+                         unsigned int new_size)
+{
+       struct hlist_head *old_info_hash, *old_laddrhash;
+       unsigned int old_size = fib_hash_size;
+       unsigned int i, bytes;
+
+       spin_lock_bh(&fib_info_lock);
+       old_info_hash = fib_info_hash;
+       old_laddrhash = fib_info_laddrhash;
+       fib_hash_size = new_size;
+
+       for (i = 0; i < old_size; i++) {
+               struct hlist_head *head = &fib_info_hash[i];
+               struct hlist_node *node, *n;
+               struct fib_info *fi;
+
+               hlist_for_each_entry_safe(fi, node, n, head, fib_hash) {
+                       struct hlist_head *dest;
+                       unsigned int new_hash;
+
+                       hlist_del(&fi->fib_hash);
+
+                       new_hash = fib_info_hashfn(fi);
+                       dest = &new_info_hash[new_hash];
+                       hlist_add_head(&fi->fib_hash, dest);
+               }
+       }
+       fib_info_hash = new_info_hash;
+
+       for (i = 0; i < old_size; i++) {
+               struct hlist_head *lhead = &fib_info_laddrhash[i];
+               struct hlist_node *node, *n;
+               struct fib_info *fi;
+
+               hlist_for_each_entry_safe(fi, node, n, lhead, fib_lhash) {
+                       struct hlist_head *ldest;
+                       unsigned int new_hash;
+
+                       hlist_del(&fi->fib_lhash);
+
+                       new_hash = fib_laddr_hashfn(fi->fib_prefsrc);
+                       ldest = &new_laddrhash[new_hash];
+                       hlist_add_head(&fi->fib_lhash, ldest);
+               }
+       }
+       fib_info_laddrhash = new_laddrhash;
+
+       spin_unlock_bh(&fib_info_lock);
+
+       bytes = old_size * sizeof(struct hlist_head *);
+       fib_hash_free(old_info_hash, bytes);
+       fib_hash_free(old_laddrhash, bytes);
+}
+
+struct fib_info *fib_create_info(struct fib_config *cfg)
 {
        int err;
        struct fib_info *fi = NULL;
        struct fib_info *ofi;
-#ifdef CONFIG_IP_ROUTE_MULTIPATH
        int nhs = 1;
-#else
-       const int nhs = 1;
-#endif
 
        /* Fast check to catch the most weird cases */
-       if (fib_props[r->rtm_type].scope > r->rtm_scope)
+       if (fib_props[cfg->fc_type].scope > cfg->fc_scope)
                goto err_inval;
 
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
-       if (rta->rta_mp) {
-               nhs = fib_count_nexthops(rta->rta_mp);
+       if (cfg->fc_mp) {
+               nhs = fib_count_nexthops(cfg->fc_mp, cfg->fc_mp_len);
                if (nhs == 0)
                        goto err_inval;
        }
 #endif
+#ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED
+       if (cfg->fc_mp_alg) {
+               if (cfg->fc_mp_alg < IP_MP_ALG_NONE ||
+                   cfg->fc_mp_alg > IP_MP_ALG_MAX)
+                       goto err_inval;
+       }
+#endif
 
-       fi = kmalloc(sizeof(*fi)+nhs*sizeof(struct fib_nh), GFP_KERNEL);
        err = -ENOBUFS;
+       if (fib_info_cnt >= fib_hash_size) {
+               unsigned int new_size = fib_hash_size << 1;
+               struct hlist_head *new_info_hash;
+               struct hlist_head *new_laddrhash;
+               unsigned int bytes;
+
+               if (!new_size)
+                       new_size = 1;
+               bytes = new_size * sizeof(struct hlist_head *);
+               new_info_hash = fib_hash_alloc(bytes);
+               new_laddrhash = fib_hash_alloc(bytes);
+               if (!new_info_hash || !new_laddrhash) {
+                       fib_hash_free(new_info_hash, bytes);
+                       fib_hash_free(new_laddrhash, bytes);
+               } else {
+                       memset(new_info_hash, 0, bytes);
+                       memset(new_laddrhash, 0, bytes);
+
+                       fib_hash_move(new_info_hash, new_laddrhash, new_size);
+               }
+
+               if (!fib_hash_size)
+                       goto failure;
+       }
+
+       fi = kzalloc(sizeof(*fi)+nhs*sizeof(struct fib_nh), GFP_KERNEL);
        if (fi == NULL)
                goto failure;
        fib_info_cnt++;
-       memset(fi, 0, sizeof(*fi)+nhs*sizeof(struct fib_nh));
 
-       fi->fib_protocol = r->rtm_protocol;
+       fi->fib_protocol = cfg->fc_protocol;
+       fi->fib_flags = cfg->fc_flags;
+       fi->fib_priority = cfg->fc_priority;
+       fi->fib_prefsrc = cfg->fc_prefsrc;
+
        fi->fib_nhs = nhs;
-       fi->fib_flags = r->rtm_flags;
-       if (rta->rta_priority)
-               fi->fib_priority = *rta->rta_priority;
-       if (rta->rta_mx) {
-               int attrlen = RTA_PAYLOAD(rta->rta_mx);
-               struct rtattr *attr = RTA_DATA(rta->rta_mx);
-
-               while (RTA_OK(attr, attrlen)) {
-                       unsigned flavor = attr->rta_type;
-                       if (flavor) {
-                               if (flavor > RTAX_MAX)
+       change_nexthops(fi) {
+               nh->nh_parent = fi;
+       } endfor_nexthops(fi)
+
+       if (cfg->fc_mx) {
+               struct nlattr *nla;
+               int remaining;
+
+               nla_for_each_attr(nla, cfg->fc_mx, cfg->fc_mx_len, remaining) {
+                       int type = nla->nla_type;
+
+                       if (type) {
+                               if (type > RTAX_MAX)
                                        goto err_inval;
-                               fi->fib_metrics[flavor-1] = *(unsigned*)RTA_DATA(attr);
+                               fi->fib_metrics[type - 1] = nla_get_u32(nla);
                        }
-                       attr = RTA_NEXT(attr, attrlen);
                }
        }
-       if (rta->rta_prefsrc)
-               memcpy(&fi->fib_prefsrc, rta->rta_prefsrc, 4);
 
-       if (rta->rta_mp) {
+       if (cfg->fc_mp) {
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
-               if ((err = fib_get_nhs(fi, rta->rta_mp, r)) != 0)
+               err = fib_get_nhs(fi, cfg->fc_mp, cfg->fc_mp_len, cfg);
+               if (err != 0)
                        goto failure;
-               if (rta->rta_oif && fi->fib_nh->nh_oif != *rta->rta_oif)
+               if (cfg->fc_oif && fi->fib_nh->nh_oif != cfg->fc_oif)
                        goto err_inval;
-               if (rta->rta_gw && memcmp(&fi->fib_nh->nh_gw, rta->rta_gw, 4))
+               if (cfg->fc_gw && fi->fib_nh->nh_gw != cfg->fc_gw)
                        goto err_inval;
 #ifdef CONFIG_NET_CLS_ROUTE
-               if (rta->rta_flow && memcmp(&fi->fib_nh->nh_tclassid, rta->rta_flow, 4))
+               if (cfg->fc_flow && fi->fib_nh->nh_tclassid != cfg->fc_flow)
                        goto err_inval;
 #endif
 #else
@@ -529,39 +775,32 @@ fib_create_info(const struct rtmsg *r, struct kern_rta *rta,
 #endif
        } else {
                struct fib_nh *nh = fi->fib_nh;
-               if (rta->rta_oif)
-                       nh->nh_oif = *rta->rta_oif;
-               if (rta->rta_gw)
-                       memcpy(&nh->nh_gw, rta->rta_gw, 4);
+
+               nh->nh_oif = cfg->fc_oif;
+               nh->nh_gw = cfg->fc_gw;
+               nh->nh_flags = cfg->fc_flags;
 #ifdef CONFIG_NET_CLS_ROUTE
-               if (rta->rta_flow)
-                       memcpy(&nh->nh_tclassid, rta->rta_flow, 4);
+               nh->nh_tclassid = cfg->fc_flow;
 #endif
-               nh->nh_flags = r->rtm_flags;
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
                nh->nh_weight = 1;
 #endif
        }
 
-#ifdef CONFIG_IP_ROUTE_NAT
-       if (r->rtm_type == RTN_NAT) {
-               if (rta->rta_gw == NULL || nhs != 1 || rta->rta_oif)
-                       goto err_inval;
-               memcpy(&fi->fib_nh->nh_gw, rta->rta_gw, 4);
-               goto link_it;
-       }
+#ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED
+       fi->fib_mp_alg = cfg->fc_mp_alg;
 #endif
 
-       if (fib_props[r->rtm_type].error) {
-               if (rta->rta_gw || rta->rta_oif || rta->rta_mp)
+       if (fib_props[cfg->fc_type].error) {
+               if (cfg->fc_gw || cfg->fc_oif || cfg->fc_mp)
                        goto err_inval;
                goto link_it;
        }
 
-       if (r->rtm_scope > RT_SCOPE_HOST)
+       if (cfg->fc_scope > RT_SCOPE_HOST)
                goto err_inval;
 
-       if (r->rtm_scope == RT_SCOPE_HOST) {
+       if (cfg->fc_scope == RT_SCOPE_HOST) {
                struct fib_nh *nh = fi->fib_nh;
 
                /* Local address is added. */
@@ -574,14 +813,14 @@ fib_create_info(const struct rtmsg *r, struct kern_rta *rta,
                        goto failure;
        } else {
                change_nexthops(fi) {
-                       if ((err = fib_check_nh(r, fi, nh)) != 0)
+                       if ((err = fib_check_nh(cfg, fi, nh)) != 0)
                                goto failure;
                } endfor_nexthops(fi)
        }
 
        if (fi->fib_prefsrc) {
-               if (r->rtm_type != RTN_LOCAL || rta->rta_dst == NULL ||
-                   memcmp(&fi->fib_prefsrc, rta->rta_dst, 4))
+               if (cfg->fc_type != RTN_LOCAL || !cfg->fc_dst ||
+                   fi->fib_prefsrc != cfg->fc_dst)
                        if (inet_addr_type(fi->fib_prefsrc) != RTN_LOCAL)
                                goto err_inval;
        }
@@ -596,301 +835,205 @@ link_it:
 
        fi->fib_treeref++;
        atomic_inc(&fi->fib_clntref);
-       write_lock(&fib_info_lock);
-       fi->fib_next = fib_info_list;
-       fi->fib_prev = NULL;
-       if (fib_info_list)
-               fib_info_list->fib_prev = fi;
-       fib_info_list = fi;
-       write_unlock(&fib_info_lock);
+       spin_lock_bh(&fib_info_lock);
+       hlist_add_head(&fi->fib_hash,
+                      &fib_info_hash[fib_info_hashfn(fi)]);
+       if (fi->fib_prefsrc) {
+               struct hlist_head *head;
+
+               head = &fib_info_laddrhash[fib_laddr_hashfn(fi->fib_prefsrc)];
+               hlist_add_head(&fi->fib_lhash, head);
+       }
+       change_nexthops(fi) {
+               struct hlist_head *head;
+               unsigned int hash;
+
+               if (!nh->nh_dev)
+                       continue;
+               hash = fib_devindex_hashfn(nh->nh_dev->ifindex);
+               head = &fib_info_devhash[hash];
+               hlist_add_head(&nh->nh_hash, head);
+       } endfor_nexthops(fi)
+       spin_unlock_bh(&fib_info_lock);
        return fi;
 
 err_inval:
        err = -EINVAL;
 
 failure:
-        *errp = err;
         if (fi) {
                fi->fib_dead = 1;
                free_fib_info(fi);
        }
-       return NULL;
+
+       return ERR_PTR(err);
 }
 
-int 
-fib_semantic_match(int type, struct fib_info *fi, const struct flowi *flp, struct fib_result *res)
+/* Note! fib_semantic_match intentionally uses  RCU list functions. */
+int fib_semantic_match(struct list_head *head, const struct flowi *flp,
+                      struct fib_result *res, __be32 zone, __be32 mask,
+                       int prefixlen)
 {
-       int err = fib_props[type].error;
+       struct fib_alias *fa;
+       int nh_sel = 0;
 
-       if (err == 0) {
-               if (fi->fib_flags&RTNH_F_DEAD)
-                       return 1;
+       list_for_each_entry_rcu(fa, head, fa_list) {
+               int err;
 
-               res->fi = fi;
+               if (fa->fa_tos &&
+                   fa->fa_tos != flp->fl4_tos)
+                       continue;
 
-               switch (type) {
-#ifdef CONFIG_IP_ROUTE_NAT
-               case RTN_NAT:
-                       FIB_RES_RESET(*res);
-                       atomic_inc(&fi->fib_clntref);
-                       return 0;
-#endif
-               case RTN_UNICAST:
-               case RTN_LOCAL:
-               case RTN_BROADCAST:
-               case RTN_ANYCAST:
-               case RTN_MULTICAST:
-                       for_nexthops(fi) {
-                               if (nh->nh_flags&RTNH_F_DEAD)
-                                       continue;
-                               if (!flp->oif || flp->oif == nh->nh_oif)
-                                       break;
-                       }
+               if (fa->fa_scope < flp->fl4_scope)
+                       continue;
+
+               fa->fa_state |= FA_S_ACCESSED;
+
+               err = fib_props[fa->fa_type].error;
+               if (err == 0) {
+                       struct fib_info *fi = fa->fa_info;
+
+                       if (fi->fib_flags & RTNH_F_DEAD)
+                               continue;
+
+                       switch (fa->fa_type) {
+                       case RTN_UNICAST:
+                       case RTN_LOCAL:
+                       case RTN_BROADCAST:
+                       case RTN_ANYCAST:
+                       case RTN_MULTICAST:
+                               for_nexthops(fi) {
+                                       if (nh->nh_flags&RTNH_F_DEAD)
+                                               continue;
+                                       if (!flp->oif || flp->oif == nh->nh_oif)
+                                               break;
+                               }
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
-                       if (nhsel < fi->fib_nhs) {
-                               res->nh_sel = nhsel;
-                               atomic_inc(&fi->fib_clntref);
-                               return 0;
-                       }
+                               if (nhsel < fi->fib_nhs) {
+                                       nh_sel = nhsel;
+                                       goto out_fill_res;
+                               }
 #else
-                       if (nhsel < 1) {
-                               atomic_inc(&fi->fib_clntref);
-                               return 0;
-                       }
+                               if (nhsel < 1) {
+                                       goto out_fill_res;
+                               }
 #endif
-                       endfor_nexthops(fi);
-                       res->fi = NULL;
-                       return 1;
-               default:
-                       res->fi = NULL;
-                       printk(KERN_DEBUG "impossible 102\n");
-                       return -EINVAL;
+                               endfor_nexthops(fi);
+                               continue;
+
+                       default:
+                               printk(KERN_DEBUG "impossible 102\n");
+                               return -EINVAL;
+                       };
                }
+               return err;
        }
-       return err;
+       return 1;
+
+out_fill_res:
+       res->prefixlen = prefixlen;
+       res->nh_sel = nh_sel;
+       res->type = fa->fa_type;
+       res->scope = fa->fa_scope;
+       res->fi = fa->fa_info;
+#ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED
+       res->netmask = mask;
+       res->network = zone & inet_make_mask(prefixlen);
+#endif
+       atomic_inc(&res->fi->fib_clntref);
+       return 0;
 }
 
 /* Find appropriate source address to this destination */
 
-u32 __fib_res_prefsrc(struct fib_result *res)
+__be32 __fib_res_prefsrc(struct fib_result *res)
 {
        return inet_select_addr(FIB_RES_DEV(*res), FIB_RES_GW(*res), res->scope);
 }
 
-int
-fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event,
-             u8 tb_id, u8 type, u8 scope, void *dst, int dst_len, u8 tos,
-             struct fib_info *fi)
+int fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event,
+                 u32 tb_id, u8 type, u8 scope, __be32 dst, int dst_len, u8 tos,
+                 struct fib_info *fi, unsigned int flags)
 {
+       struct nlmsghdr *nlh;
        struct rtmsg *rtm;
-       struct nlmsghdr  *nlh;
-       unsigned char    *b = skb->tail;
 
-       nlh = NLMSG_PUT(skb, pid, seq, event, sizeof(*rtm));
-       rtm = NLMSG_DATA(nlh);
+       nlh = nlmsg_put(skb, pid, seq, event, sizeof(*rtm), flags);
+       if (nlh == NULL)
+               return -ENOBUFS;
+
+       rtm = nlmsg_data(nlh);
        rtm->rtm_family = AF_INET;
        rtm->rtm_dst_len = dst_len;
        rtm->rtm_src_len = 0;
        rtm->rtm_tos = tos;
        rtm->rtm_table = tb_id;
+       NLA_PUT_U32(skb, RTA_TABLE, tb_id);
        rtm->rtm_type = type;
        rtm->rtm_flags = fi->fib_flags;
        rtm->rtm_scope = scope;
-       if (rtm->rtm_dst_len)
-               RTA_PUT(skb, RTA_DST, 4, dst);
        rtm->rtm_protocol = fi->fib_protocol;
+
+       if (rtm->rtm_dst_len)
+               NLA_PUT_BE32(skb, RTA_DST, dst);
+
        if (fi->fib_priority)
-               RTA_PUT(skb, RTA_PRIORITY, 4, &fi->fib_priority);
-#ifdef CONFIG_NET_CLS_ROUTE
-       if (fi->fib_nh[0].nh_tclassid)
-               RTA_PUT(skb, RTA_FLOW, 4, &fi->fib_nh[0].nh_tclassid);
-#endif
+               NLA_PUT_U32(skb, RTA_PRIORITY, fi->fib_priority);
+
        if (rtnetlink_put_metrics(skb, fi->fib_metrics) < 0)
-               goto rtattr_failure;
+               goto nla_put_failure;
+
        if (fi->fib_prefsrc)
-               RTA_PUT(skb, RTA_PREFSRC, 4, &fi->fib_prefsrc);
+               NLA_PUT_BE32(skb, RTA_PREFSRC, fi->fib_prefsrc);
+
        if (fi->fib_nhs == 1) {
                if (fi->fib_nh->nh_gw)
-                       RTA_PUT(skb, RTA_GATEWAY, 4, &fi->fib_nh->nh_gw);
+                       NLA_PUT_BE32(skb, RTA_GATEWAY, fi->fib_nh->nh_gw);
+
                if (fi->fib_nh->nh_oif)
-                       RTA_PUT(skb, RTA_OIF, sizeof(int), &fi->fib_nh->nh_oif);
+                       NLA_PUT_U32(skb, RTA_OIF, fi->fib_nh->nh_oif);
+#ifdef CONFIG_NET_CLS_ROUTE
+               if (fi->fib_nh[0].nh_tclassid)
+                       NLA_PUT_U32(skb, RTA_FLOW, fi->fib_nh[0].nh_tclassid);
+#endif
        }
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
        if (fi->fib_nhs > 1) {
-               struct rtnexthop *nhp;
-               struct rtattr *mp_head;
-               if (skb_tailroom(skb) <= RTA_SPACE(0))
-                       goto rtattr_failure;
-               mp_head = (struct rtattr*)skb_put(skb, RTA_SPACE(0));
-
-               for_nexthops(fi) {
-                       if (skb_tailroom(skb) < RTA_ALIGN(RTA_ALIGN(sizeof(*nhp)) + 4))
-                               goto rtattr_failure;
-                       nhp = (struct rtnexthop*)skb_put(skb, RTA_ALIGN(sizeof(*nhp)));
-                       nhp->rtnh_flags = nh->nh_flags & 0xFF;
-                       nhp->rtnh_hops = nh->nh_weight-1;
-                       nhp->rtnh_ifindex = nh->nh_oif;
-                       if (nh->nh_gw)
-                               RTA_PUT(skb, RTA_GATEWAY, 4, &nh->nh_gw);
-                       nhp->rtnh_len = skb->tail - (unsigned char*)nhp;
-               } endfor_nexthops(fi);
-               mp_head->rta_type = RTA_MULTIPATH;
-               mp_head->rta_len = skb->tail - (u8*)mp_head;
-       }
-#endif
-       nlh->nlmsg_len = skb->tail - b;
-       return skb->len;
-
-nlmsg_failure:
-rtattr_failure:
-       skb_trim(skb, b - skb->data);
-       return -1;
-}
+               struct rtnexthop *rtnh;
+               struct nlattr *mp;
 
-#ifndef CONFIG_IP_NOSIOCRT
-
-int
-fib_convert_rtentry(int cmd, struct nlmsghdr *nl, struct rtmsg *rtm,
-                   struct kern_rta *rta, struct rtentry *r)
-{
-       int    plen;
-       u32    *ptr;
-
-       memset(rtm, 0, sizeof(*rtm));
-       memset(rta, 0, sizeof(*rta));
-
-       if (r->rt_dst.sa_family != AF_INET)
-               return -EAFNOSUPPORT;
-
-       /* Check mask for validity:
-          a) it must be contiguous.
-          b) destination must have all host bits clear.
-          c) if application forgot to set correct family (AF_INET),
-             reject request unless it is absolutely clear i.e.
-             both family and mask are zero.
-        */
-       plen = 32;
-       ptr = &((struct sockaddr_in*)&r->rt_dst)->sin_addr.s_addr;
-       if (!(r->rt_flags&RTF_HOST)) {
-               u32 mask = ((struct sockaddr_in*)&r->rt_genmask)->sin_addr.s_addr;
-               if (r->rt_genmask.sa_family != AF_INET) {
-                       if (mask || r->rt_genmask.sa_family)
-                               return -EAFNOSUPPORT;
-               }
-               if (bad_mask(mask, *ptr))
-                       return -EINVAL;
-               plen = inet_mask_len(mask);
-       }
+               mp = nla_nest_start(skb, RTA_MULTIPATH);
+               if (mp == NULL)
+                       goto nla_put_failure;
 
-       nl->nlmsg_flags = NLM_F_REQUEST;
-       nl->nlmsg_pid = 0;
-       nl->nlmsg_seq = 0;
-       nl->nlmsg_len = NLMSG_LENGTH(sizeof(*rtm));
-       if (cmd == SIOCDELRT) {
-               nl->nlmsg_type = RTM_DELROUTE;
-               nl->nlmsg_flags = 0;
-       } else {
-               nl->nlmsg_type = RTM_NEWROUTE;
-               nl->nlmsg_flags = NLM_F_REQUEST|NLM_F_CREATE;
-               rtm->rtm_protocol = RTPROT_BOOT;
-       }
+               for_nexthops(fi) {
+                       rtnh = nla_reserve_nohdr(skb, sizeof(*rtnh));
+                       if (rtnh == NULL)
+                               goto nla_put_failure;
 
-       rtm->rtm_dst_len = plen;
-       rta->rta_dst = ptr;
+                       rtnh->rtnh_flags = nh->nh_flags & 0xFF;
+                       rtnh->rtnh_hops = nh->nh_weight - 1;
+                       rtnh->rtnh_ifindex = nh->nh_oif;
 
-       if (r->rt_metric) {
-               *(u32*)&r->rt_pad3 = r->rt_metric - 1;
-               rta->rta_priority = (u32*)&r->rt_pad3;
-       }
-       if (r->rt_flags&RTF_REJECT) {
-               rtm->rtm_scope = RT_SCOPE_HOST;
-               rtm->rtm_type = RTN_UNREACHABLE;
-               return 0;
-       }
-       rtm->rtm_scope = RT_SCOPE_NOWHERE;
-       rtm->rtm_type = RTN_UNICAST;
-
-       if (r->rt_dev) {
-               char *colon;
-               struct net_device *dev;
-               char   devname[IFNAMSIZ];
-
-               if (copy_from_user(devname, r->rt_dev, IFNAMSIZ-1))
-                       return -EFAULT;
-               devname[IFNAMSIZ-1] = 0;
-               colon = strchr(devname, ':');
-               if (colon)
-                       *colon = 0;
-               dev = __dev_get_by_name(devname);
-               if (!dev)
-                       return -ENODEV;
-               rta->rta_oif = &dev->ifindex;
-               if (colon) {
-                       struct in_ifaddr *ifa;
-                       struct in_device *in_dev = __in_dev_get(dev);
-                       if (!in_dev)
-                               return -ENODEV;
-                       *colon = ':';
-                       for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next)
-                               if (strcmp(ifa->ifa_label, devname) == 0)
-                                       break;
-                       if (ifa == NULL)
-                               return -ENODEV;
-                       rta->rta_prefsrc = &ifa->ifa_local;
-               }
-       }
+                       if (nh->nh_gw)
+                               NLA_PUT_BE32(skb, RTA_GATEWAY, nh->nh_gw);
+#ifdef CONFIG_NET_CLS_ROUTE
+                       if (nh->nh_tclassid)
+                               NLA_PUT_U32(skb, RTA_FLOW, nh->nh_tclassid);
+#endif
+                       /* length of rtnetlink header + attributes */
+                       rtnh->rtnh_len = nlmsg_get_pos(skb) - (void *) rtnh;
+               } endfor_nexthops(fi);
 
-       ptr = &((struct sockaddr_in*)&r->rt_gateway)->sin_addr.s_addr;
-       if (r->rt_gateway.sa_family == AF_INET && *ptr) {
-               rta->rta_gw = ptr;
-               if (r->rt_flags&RTF_GATEWAY && inet_addr_type(*ptr) == RTN_UNICAST)
-                       rtm->rtm_scope = RT_SCOPE_UNIVERSE;
+               nla_nest_end(skb, mp);
        }
+#endif
+       return nlmsg_end(skb, nlh);
 
-       if (cmd == SIOCDELRT)
-               return 0;
-
-       if (r->rt_flags&RTF_GATEWAY && rta->rta_gw == NULL)
-               return -EINVAL;
-
-       if (rtm->rtm_scope == RT_SCOPE_NOWHERE)
-               rtm->rtm_scope = RT_SCOPE_LINK;
-
-       if (r->rt_flags&(RTF_MTU|RTF_WINDOW|RTF_IRTT)) {
-               struct rtattr *rec;
-               struct rtattr *mx = kmalloc(RTA_LENGTH(3*RTA_LENGTH(4)), GFP_KERNEL);
-               if (mx == NULL)
-                       return -ENOMEM;
-               rta->rta_mx = mx;
-               mx->rta_type = RTA_METRICS;
-               mx->rta_len  = RTA_LENGTH(0);
-               if (r->rt_flags&RTF_MTU) {
-                       rec = (void*)((char*)mx + RTA_ALIGN(mx->rta_len));
-                       rec->rta_type = RTAX_ADVMSS;
-                       rec->rta_len = RTA_LENGTH(4);
-                       mx->rta_len += RTA_LENGTH(4);
-                       *(u32*)RTA_DATA(rec) = r->rt_mtu - 40;
-               }
-               if (r->rt_flags&RTF_WINDOW) {
-                       rec = (void*)((char*)mx + RTA_ALIGN(mx->rta_len));
-                       rec->rta_type = RTAX_WINDOW;
-                       rec->rta_len = RTA_LENGTH(4);
-                       mx->rta_len += RTA_LENGTH(4);
-                       *(u32*)RTA_DATA(rec) = r->rt_window;
-               }
-               if (r->rt_flags&RTF_IRTT) {
-                       rec = (void*)((char*)mx + RTA_ALIGN(mx->rta_len));
-                       rec->rta_type = RTAX_RTT;
-                       rec->rta_len = RTA_LENGTH(4);
-                       mx->rta_len += RTA_LENGTH(4);
-                       *(u32*)RTA_DATA(rec) = r->rt_irtt<<3;
-               }
-       }
-       return 0;
+nla_put_failure:
+       return nlmsg_cancel(skb, nlh);
 }
 
-#endif
-
 /*
    Update FIB if:
    - local address disappeared -> we must delete all the entries
@@ -898,7 +1041,7 @@ fib_convert_rtentry(int cmd, struct nlmsghdr *nl, struct rtmsg *rtm,
    - device went down -> we must shutdown all nexthops going via it.
  */
 
-int fib_sync_down(u32 local, struct net_device *dev, int force)
+int fib_sync_down(__be32 local, struct net_device *dev, int force)
 {
        int ret = 0;
        int scope = RT_SCOPE_NOWHERE;
@@ -906,13 +1049,36 @@ int fib_sync_down(u32 local, struct net_device *dev, int force)
        if (force)
                scope = -1;
 
-       for_fib_info() {
-               if (local && fi->fib_prefsrc == local) {
-                       fi->fib_flags |= RTNH_F_DEAD;
-                       ret++;
-               } else if (dev && fi->fib_nhs) {
-                       int dead = 0;
+       if (local && fib_info_laddrhash) {
+               unsigned int hash = fib_laddr_hashfn(local);
+               struct hlist_head *head = &fib_info_laddrhash[hash];
+               struct hlist_node *node;
+               struct fib_info *fi;
 
+               hlist_for_each_entry(fi, node, head, fib_lhash) {
+                       if (fi->fib_prefsrc == local) {
+                               fi->fib_flags |= RTNH_F_DEAD;
+                               ret++;
+                       }
+               }
+       }
+
+       if (dev) {
+               struct fib_info *prev_fi = NULL;
+               unsigned int hash = fib_devindex_hashfn(dev->ifindex);
+               struct hlist_head *head = &fib_info_devhash[hash];
+               struct hlist_node *node;
+               struct fib_nh *nh;
+
+               hlist_for_each_entry(nh, node, head, nh_hash) {
+                       struct fib_info *fi = nh->nh_parent;
+                       int dead;
+
+                       BUG_ON(!fi->fib_nhs);
+                       if (nh->nh_dev != dev || fi == prev_fi)
+                               continue;
+                       prev_fi = fi;
+                       dead = 0;
                        change_nexthops(fi) {
                                if (nh->nh_flags&RTNH_F_DEAD)
                                        dead++;
@@ -939,7 +1105,8 @@ int fib_sync_down(u32 local, struct net_device *dev, int force)
                                ret++;
                        }
                }
-       } endfor_fib_info();
+       }
+
        return ret;
 }
 
@@ -952,14 +1119,31 @@ int fib_sync_down(u32 local, struct net_device *dev, int force)
 
 int fib_sync_up(struct net_device *dev)
 {
-       int ret = 0;
+       struct fib_info *prev_fi;
+       unsigned int hash;
+       struct hlist_head *head;
+       struct hlist_node *node;
+       struct fib_nh *nh;
+       int ret;
 
        if (!(dev->flags&IFF_UP))
                return 0;
 
-       for_fib_info() {
-               int alive = 0;
+       prev_fi = NULL;
+       hash = fib_devindex_hashfn(dev->ifindex);
+       head = &fib_info_devhash[hash];
+       ret = 0;
 
+       hlist_for_each_entry(nh, node, head, nh_hash) {
+               struct fib_info *fi = nh->nh_parent;
+               int alive;
+
+               BUG_ON(!fi->fib_nhs);
+               if (nh->nh_dev != dev || fi == prev_fi)
+                       continue;
+
+               prev_fi = fi;
+               alive = 0;
                change_nexthops(fi) {
                        if (!(nh->nh_flags&RTNH_F_DEAD)) {
                                alive++;
@@ -967,7 +1151,7 @@ int fib_sync_up(struct net_device *dev)
                        }
                        if (nh->nh_dev == NULL || !(nh->nh_dev->flags&IFF_UP))
                                continue;
-                       if (nh->nh_dev != dev || __in_dev_get(dev) == NULL)
+                       if (nh->nh_dev != dev || !__in_dev_get_rtnl(dev))
                                continue;
                        alive++;
                        spin_lock_bh(&fib_multipath_lock);
@@ -980,7 +1164,8 @@ int fib_sync_up(struct net_device *dev)
                        fi->fib_flags &= ~RTNH_F_DEAD;
                        ret++;
                }
-       } endfor_fib_info();
+       }
+
        return ret;
 }