---

yaml --- r: 8959 b: refs/heads/master c: 1c011be h: refs/heads/master i: 8957: f2a6fec 8955: 1296464 8951: cc53a34 8943: bfabd45 8927: 7b0ee1f 8895: 315a571 8831: 31da5f0 8703: c1fcf53 v: v3
git-mirror · Sep 15, 2005 · 854e93c · 854e93c
1 parent 5673663
commit 854e93c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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;
 				}