From 854e93cbd15a658d66538fdadd1657f4d9cdd95f Mon Sep 17 00:00:00 2001
From: Bart De Schuymer <bdschuym@pandora.be>
Date: Wed, 14 Sep 2005 20:55:16 -0700
Subject: [PATCH] --- yaml --- r: 8959 b: refs/heads/master c:
 1c011bed5f49ce9e6193b18b226106a41ecfa95c h: refs/heads/master i:   8957:
 f2a6fec6a18a76aa0007c01631b97007c0081d62   8955:
 1296464fb988616b2db830864cf4943372ba9594   8951:
 cc53a345d5ae2923a8b47030fa511034d8e85350   8943:
 bfabd45e9fb0d0a04fdccb8f152e7d7ba5139329   8927:
 7b0ee1fe9937ded23f141a361c9c115196b5ebf0   8895:
 315a57113bc8092377042ce13d0802c74ae3e1c0   8831:
 31da5f02e04af640010609ebbb7718a640c126f3   8703:
 c1fcf537ef35906171bb1e1fc1344bd5220bd83a v: v3

---
 [refs]                          | 2 +-
 trunk/net/bridge/br_netfilter.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 75da1229a6df..ade4811d2fba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de9daad90ecb54f3c37c3f8967d581e20d927539
+refs/heads/master: 1c011bed5f49ce9e6193b18b226106a41ecfa95c
diff --git a/trunk/net/bridge/br_netfilter.c b/trunk/net/bridge/br_netfilter.c
index 2d52fee63a8c..d8e36b775125 100644
--- a/trunk/net/bridge/br_netfilter.c
+++ b/trunk/net/bridge/br_netfilter.c
@@ -214,9 +214,11 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
 				     .tos = RT_TOS(iph->tos)} }, .proto = 0};
 
 			if (!ip_route_output_key(&rt, &fl)) {
-				/* Bridged-and-DNAT'ed traffic doesn't
-				 * require ip_forwarding. */
-				if (((struct dst_entry *)rt)->dev == dev) {
+				/* - Bridged-and-DNAT'ed traffic doesn't
+				 *   require ip_forwarding.
+				 * - Deal with redirected traffic. */
+				if (((struct dst_entry *)rt)->dev == dev ||
+				    rt->rt_type == RTN_LOCAL) {
 					skb->dst = (struct dst_entry *)rt;
 					goto bridged_dnat;
 				}