Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -260,34 +260,16 @@ static struct dst_ops ip6_dst_ops_template = {
|
||||
.confirm_neigh = ip6_confirm_neigh,
|
||||
};
|
||||
|
||||
static unsigned int ip6_blackhole_mtu(const struct dst_entry *dst)
|
||||
{
|
||||
unsigned int mtu = dst_metric_raw(dst, RTAX_MTU);
|
||||
|
||||
return mtu ? : dst->dev->mtu;
|
||||
}
|
||||
|
||||
static void ip6_rt_blackhole_update_pmtu(struct dst_entry *dst, struct sock *sk,
|
||||
struct sk_buff *skb, u32 mtu,
|
||||
bool confirm_neigh)
|
||||
{
|
||||
}
|
||||
|
||||
static void ip6_rt_blackhole_redirect(struct dst_entry *dst, struct sock *sk,
|
||||
struct sk_buff *skb)
|
||||
{
|
||||
}
|
||||
|
||||
static struct dst_ops ip6_dst_blackhole_ops = {
|
||||
.family = AF_INET6,
|
||||
.destroy = ip6_dst_destroy,
|
||||
.check = ip6_dst_check,
|
||||
.mtu = ip6_blackhole_mtu,
|
||||
.default_advmss = ip6_default_advmss,
|
||||
.update_pmtu = ip6_rt_blackhole_update_pmtu,
|
||||
.redirect = ip6_rt_blackhole_redirect,
|
||||
.cow_metrics = dst_cow_metrics_generic,
|
||||
.neigh_lookup = ip6_dst_neigh_lookup,
|
||||
.family = AF_INET6,
|
||||
.default_advmss = ip6_default_advmss,
|
||||
.neigh_lookup = ip6_dst_neigh_lookup,
|
||||
.check = ip6_dst_check,
|
||||
.destroy = ip6_dst_destroy,
|
||||
.cow_metrics = dst_cow_metrics_generic,
|
||||
.update_pmtu = dst_blackhole_update_pmtu,
|
||||
.redirect = dst_blackhole_redirect,
|
||||
.mtu = dst_blackhole_mtu,
|
||||
};
|
||||
|
||||
static const u32 ip6_template_metrics[RTAX_MAX] = {
|
||||
|
||||
Reference in New Issue
Block a user