Commit 07cb9623 authored by Felix Fietkau's avatar Felix Fietkau Committed by Pablo Neira Ayuso
Browse files

ipv6: make ip6_dst_mtu_forward inline 



Just like ip_dst_mtu_maybe_forward(), to avoid a dependency with ipv6.ko.

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 047b300e

include/net/ip6_route.h

+21 −0
Original line number Diff line number Diff line
@@ -279,6 +279,27 @@ static inline bool rt6_duplicate_nexthop(struct fib6_info *a, struct fib6_info * 
	       !lwtunnel_cmp_encap(a->fib6_nh.nh_lwtstate, b->fib6_nh.nh_lwtstate);

}



static inline unsigned int ip6_dst_mtu_forward(const struct dst_entry *dst)

{

	struct inet6_dev *idev;

	unsigned int mtu;



	if (dst_metric_locked(dst, RTAX_MTU)) {

		mtu = dst_metric_raw(dst, RTAX_MTU);

		if (mtu)

			return mtu;

	}



	mtu = IPV6_MIN_MTU;

	rcu_read_lock();

	idev = __in6_dev_get(dst->dev);

	if (idev)

		mtu = idev->cnf.mtu6;

	rcu_read_unlock();



	return mtu;

}



struct neighbour *ip6_neigh_lookup(const struct in6_addr *gw,

				   struct net_device *dev, struct sk_buff *skb,

				   const void *daddr);

include/net/ipv6.h

+0 −2
Original line number Diff line number Diff line
@@ -958,8 +958,6 @@ static inline struct sk_buff *ip6_finish_skb(struct sock *sk) 
			      &inet6_sk(sk)->cork);

}



unsigned int ip6_dst_mtu_forward(const struct dst_entry *dst);



int ip6_dst_lookup(struct net *net, struct sock *sk, struct dst_entry **dst,

		   struct flowi6 *fl6);

struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6,

net/ipv6/ip6_output.c

+0 −22
Original line number Diff line number Diff line
@@ -383,28 +383,6 @@ static inline int ip6_forward_finish(struct net *net, struct sock *sk, 
	return dst_output(net, sk, skb);

}



unsigned int ip6_dst_mtu_forward(const struct dst_entry *dst)

{

	unsigned int mtu;

	struct inet6_dev *idev;



	if (dst_metric_locked(dst, RTAX_MTU)) {

		mtu = dst_metric_raw(dst, RTAX_MTU);

		if (mtu)

			return mtu;

	}



	mtu = IPV6_MIN_MTU;

	rcu_read_lock();

	idev = __in6_dev_get(dst->dev);

	if (idev)

		mtu = idev->cnf.mtu6;

	rcu_read_unlock();



	return mtu;

}

EXPORT_SYMBOL_GPL(ip6_dst_mtu_forward);



static bool ip6_pkt_too_big(const struct sk_buff *skb, unsigned int mtu)

{

	if (skb->len <= mtu)