summaryrefslogtreecommitdiffstats
path: root/net/ipv6/route.c
diff options
context:
space:
mode:
authorDavid S. Miller2011-02-04 23:28:58 +0100
committerDavid S. Miller2011-02-04 23:28:58 +0100
commitbd4a6974cc9090ef3851e5b0a2071e5383565c7c (patch)
treee96ef46426d293b730a305b5185ba5412c9172d4 /net/ipv6/route.c
parentbe2net: use device model DMA API (diff)
parentnet: can: janz-ican3: world-writable sysfs termination file (diff)
downloadkernel-qcow2-linux-bd4a6974cc9090ef3851e5b0a2071e5383565c7c.tar.gz
kernel-qcow2-linux-bd4a6974cc9090ef3851e5b0a2071e5383565c7c.tar.xz
kernel-qcow2-linux-bd4a6974cc9090ef3851e5b0a2071e5383565c7c.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6/route.c')
-rw-r--r--net/ipv6/route.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 72609f1c6158..0a63d44e6f48 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -144,6 +144,11 @@ static struct dst_ops ip6_dst_ops_template = {
.local_out = __ip6_local_out,
};
+static unsigned int ip6_blackhole_default_mtu(const struct dst_entry *dst)
+{
+ return 0;
+}
+
static void ip6_rt_blackhole_update_pmtu(struct dst_entry *dst, u32 mtu)
{
}
@@ -153,6 +158,7 @@ static struct dst_ops ip6_dst_blackhole_ops = {
.protocol = cpu_to_be16(ETH_P_IPV6),
.destroy = ip6_dst_destroy,
.check = ip6_dst_check,
+ .default_mtu = ip6_blackhole_default_mtu,
.update_pmtu = ip6_rt_blackhole_update_pmtu,
};