---

yaml --- r: 210587 b: refs/heads/master c: ae2688d h: refs/heads/master i: 210585: 3b57b20 210583: e45766c v: v3
git-mirror · Sep 8, 2010 · 0ca82ec · 0ca82ec
1 parent 4adcb63
commit 0ca82ec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6b085b69d1cbbd62f49f34e71a3d58cb6d34b7e
+refs/heads/master: ae2688d59b5f861dc70a091d003773975d2ae7fb
diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
@@ -2738,6 +2738,11 @@ int __ip_route_output_key(struct net *net, struct rtable **rp,
 }
 EXPORT_SYMBOL_GPL(__ip_route_output_key);
 
+static struct dst_entry *ipv4_blackhole_dst_check(struct dst_entry *dst, u32 cookie)
+{
+	return NULL;
+}
+
 static void ipv4_rt_blackhole_update_pmtu(struct dst_entry *dst, u32 mtu)
 {
 }
@@ -2746,7 +2751,7 @@ static struct dst_ops ipv4_dst_blackhole_ops = {
 	.family			=	AF_INET,
 	.protocol		=	cpu_to_be16(ETH_P_IP),
 	.destroy		=	ipv4_dst_destroy,
-	.check			=	ipv4_dst_check,
+	.check			=	ipv4_blackhole_dst_check,
 	.update_pmtu		=	ipv4_rt_blackhole_update_pmtu,
 	.entries		=	ATOMIC_INIT(0),
 };