On 5/18/20 8:14 PM, Roopa Prabhu wrote: > diff --git a/include/net/nexthop.h b/include/net/nexthop.h > index 04dafc6..d929c98 100644 > --- a/include/net/nexthop.h > +++ b/include/net/nexthop.h > @@ -331,6 +331,8 @@ static inline struct fib_nh_common > *nexthop_path_fdb_result(struct nexthop *nh, > struct nexthop *nhp; > > nhp = nexthop_select_path(nh, hash); > + if (unlikely(!nhp)) > + return NULL; > nhi = rcu_dereference(nhp->nh_info); > return &nhi->fib_nhc; > }
that should be folded into patch 2 which introduces nexthop_path_fdb_result > diff --git a/include/uapi/linux/neighbour.h b/include/uapi/linux/neighbour.h > index cd144e3..eefcda8 100644 > --- a/include/uapi/linux/neighbour.h > +++ b/include/uapi/linux/neighbour.h > @@ -29,6 +29,7 @@ enum { > NDA_LINK_NETNSID, > NDA_SRC_VNI, > NDA_PROTOCOL, /* Originator of entry */ > + NDA_NH_ID, > __NDA_MAX > }; > > That needs to be in Patch 2 for it to compile. I am not qualified to review the vxlan code.