[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20130517.141327.2084320693913331713.davem@davemloft.net>
Date: Fri, 17 May 2013 14:13:27 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: amwang@...hat.com
Cc: netdev@...r.kernel.org
Subject: Re: [Patch net-next v8 02/11] ipv6: make ip6_dst_hoplimit() static
inline
From: Cong Wang <amwang@...hat.com>
Date: Fri, 17 May 2013 08:21:30 +0800
> @@ -201,4 +200,24 @@ static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt, struct in6_addr
> return dest;
> }
>
> +#if IS_ENABLED(CONFIG_IPV6)
> +static inline int ip6_dst_hoplimit(struct dst_entry *dst)
> +{
> + int hoplimit = dst_metric_raw(dst, RTAX_HOPLIMIT);
> + if (hoplimit == 0) {
> + struct net_device *dev = dst->dev;
> + struct inet6_dev *idev;
> +
> + rcu_read_lock();
> + idev = __in6_dev_get(dev);
> + if (idev)
> + hoplimit = idev->cnf.hop_limit;
> + else
> + hoplimit = dev_net(dev)->ipv6.devconf_all->hop_limit;
> + rcu_read_unlock();
> + }
> + return hoplimit;
> +}
> +#endif
Create a dummy stub version in an #else branch here, so that you have
to ifdef less in vxlan.c
In fact I think you can avoid nearly every ifdef in vxlan.c if you apply
this technique throughout your changes.
Please do that and resubmit this series.
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists