From d2d2a0b2d5eaf831db11322f22cb0a3d4f0e2cbc Mon Sep 17 00:00:00 2001
From: Alexander Holler <holler@ahsoftware.de>
Date: Tue, 7 Jun 2011 00:51:35 -0700
Subject: [PATCH] --- yaml --- r: 253404 b: refs/heads/master c:
 6407d74c5106bb362b4087693688afd34942b094 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/net/bridge/br_netfilter.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d3a3005ce828..17f74cc41834 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13fcb7bd322164c67926ffe272846d4860196dc6
+refs/heads/master: 6407d74c5106bb362b4087693688afd34942b094
diff --git a/trunk/net/bridge/br_netfilter.c b/trunk/net/bridge/br_netfilter.c
index 3fa123185e89..56149ec36d7f 100644
--- a/trunk/net/bridge/br_netfilter.c
+++ b/trunk/net/bridge/br_netfilter.c
@@ -104,10 +104,16 @@ static void fake_update_pmtu(struct dst_entry *dst, u32 mtu)
 {
 }
 
+static u32 *fake_cow_metrics(struct dst_entry *dst, unsigned long old)
+{
+	return NULL;
+}
+
 static struct dst_ops fake_dst_ops = {
 	.family =		AF_INET,
 	.protocol =		cpu_to_be16(ETH_P_IP),
 	.update_pmtu =		fake_update_pmtu,
+	.cow_metrics =		fake_cow_metrics,
 };
 
 /*