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:
@@ -2669,44 +2669,15 @@ out:
|
||||
return rth;
|
||||
}
|
||||
|
||||
static struct dst_entry *ipv4_blackhole_dst_check(struct dst_entry *dst, u32 cookie)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static unsigned int ipv4_blackhole_mtu(const struct dst_entry *dst)
|
||||
{
|
||||
unsigned int mtu = dst_metric_raw(dst, RTAX_MTU);
|
||||
|
||||
return mtu ? : dst->dev->mtu;
|
||||
}
|
||||
|
||||
static void ipv4_rt_blackhole_update_pmtu(struct dst_entry *dst, struct sock *sk,
|
||||
struct sk_buff *skb, u32 mtu,
|
||||
bool confirm_neigh)
|
||||
{
|
||||
}
|
||||
|
||||
static void ipv4_rt_blackhole_redirect(struct dst_entry *dst, struct sock *sk,
|
||||
struct sk_buff *skb)
|
||||
{
|
||||
}
|
||||
|
||||
static u32 *ipv4_rt_blackhole_cow_metrics(struct dst_entry *dst,
|
||||
unsigned long old)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static struct dst_ops ipv4_dst_blackhole_ops = {
|
||||
.family = AF_INET,
|
||||
.check = ipv4_blackhole_dst_check,
|
||||
.mtu = ipv4_blackhole_mtu,
|
||||
.default_advmss = ipv4_default_advmss,
|
||||
.update_pmtu = ipv4_rt_blackhole_update_pmtu,
|
||||
.redirect = ipv4_rt_blackhole_redirect,
|
||||
.cow_metrics = ipv4_rt_blackhole_cow_metrics,
|
||||
.neigh_lookup = ipv4_neigh_lookup,
|
||||
.family = AF_INET,
|
||||
.default_advmss = ipv4_default_advmss,
|
||||
.neigh_lookup = ipv4_neigh_lookup,
|
||||
.check = dst_blackhole_check,
|
||||
.cow_metrics = dst_blackhole_cow_metrics,
|
||||
.update_pmtu = dst_blackhole_update_pmtu,
|
||||
.redirect = dst_blackhole_redirect,
|
||||
.mtu = dst_blackhole_mtu,
|
||||
};
|
||||
|
||||
struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_orig)
|
||||
|
||||
Reference in New Issue
Block a user