From ca1b61a91794ae95e0e32d1e7b50b02ebe7189b7 Mon Sep 17 00:00:00 2001
From: Roland Dreier <roland@purestorage.com>
Date: Mon, 31 Jan 2011 13:16:00 -0800
Subject: [PATCH] --- yaml --- r: 232851 b: refs/heads/master c:
 ec831ea72ee5d7d473899e27a86bd659482c4d0d h: refs/heads/master i:   232849:
 074b3498cce834083abf4e6b6655529ea4b4ebb1   232847:
 29b29a34c71aa5bb1b475e9330f4c764fc9bd68c v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv4/route.c | 6 ++++++
 trunk/net/ipv6/route.c | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 38a6f4bd82d2..aa07a314c2c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4c93106741bbf61ecd05a2a835af8e3bf31c1bd
+refs/heads/master: ec831ea72ee5d7d473899e27a86bd659482c4d0d
diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
index 351dc4e85242..788a3e74834e 100644
--- a/trunk/net/ipv4/route.c
+++ b/trunk/net/ipv4/route.c
@@ -2707,6 +2707,11 @@ static struct dst_entry *ipv4_blackhole_dst_check(struct dst_entry *dst, u32 coo
 	return NULL;
 }
 
+static unsigned int ipv4_blackhole_default_mtu(const struct dst_entry *dst)
+{
+	return 0;
+}
+
 static void ipv4_rt_blackhole_update_pmtu(struct dst_entry *dst, u32 mtu)
 {
 }
@@ -2716,6 +2721,7 @@ static struct dst_ops ipv4_dst_blackhole_ops = {
 	.protocol		=	cpu_to_be16(ETH_P_IP),
 	.destroy		=	ipv4_dst_destroy,
 	.check			=	ipv4_blackhole_dst_check,
+	.default_mtu		=	ipv4_blackhole_default_mtu,
 	.update_pmtu		=	ipv4_rt_blackhole_update_pmtu,
 };
 
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 28a85fc63cb8..1c29f95695de 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -113,6 +113,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)
 {
 }
@@ -122,6 +127,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,
 };