summaryrefslogtreecommitdiffstats
path: root/br-nf-bds/linux2.5
diff options
context:
space:
mode:
authorBart De Schuymer <bdschuym@pandora.be>2002-11-03 22:22:37 +0000
committerBart De Schuymer <bdschuym@pandora.be>2002-11-03 22:22:37 +0000
commit0eaa1d73ab14f39262107802d34514b9c764b807 (patch)
tree5caa69e6f538faff75a983f9b0bf71ff6b11fab6 /br-nf-bds/linux2.5
parent9f99a671d32ef5c7af01221c317bfdb080a5359b (diff)
update to 2.5.45 state
Diffstat (limited to 'br-nf-bds/linux2.5')
-rw-r--r--br-nf-bds/linux2.5/net/bridge/br_netfilter.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/br-nf-bds/linux2.5/net/bridge/br_netfilter.c b/br-nf-bds/linux2.5/net/bridge/br_netfilter.c
index 3e72859..467925d 100644
--- a/br-nf-bds/linux2.5/net/bridge/br_netfilter.c
+++ b/br-nf-bds/linux2.5/net/bridge/br_netfilter.c
@@ -6,8 +6,6 @@
* Lennert Buytenhek <buytenh@gnu.org>
* Bart De Schuymer <bart.de.schuymer@pandora.be>
*
- * $Id: br_netfilter.c,v 1.4 2002/10/21 17:38:16 bdschuym Exp $
- *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
@@ -59,7 +57,8 @@ static struct rtable __fake_rtable = {
dst: {
__refcnt: ATOMIC_INIT(1),
dev: &__fake_net_device,
- pmtu: 1500
+ path: &__fake_rtable.u.dst,
+ metrics: {[RTAX_MTU] 1500},
}
},
@@ -111,8 +110,8 @@ static void __br_dnat_complain(void)
* Let us now consider the case that ip_route_input() fails:
*
* After a "echo '0' > /proc/sys/net/ipv4/ip_forward" ip_route_input()
- * will fail, while ip_route_output() will return success. The source
- * address for ip_route_output() is set to zero, so ip_route_output()
+ * will fail, while __ip_route_output_key() will return success. The source
+ * address for __ip_route_output_key() is set to zero, so __ip_route_output_key
* thinks we're handling a locally generated packet and won't care
* if IP forwarding is allowed. We send a warning message to the users's
* log telling her to put IP forwarding on.
@@ -160,8 +159,11 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
if (ip_route_input(skb, iph->daddr, iph->saddr, iph->tos,
dev)) {
struct rtable *rt;
+ struct flowi fl = { .nl_u =
+ { .ip4_u = { .daddr = iph->daddr, .saddr = 0 ,
+ .tos = iph->tos} }, .proto = 0};
- if (!ip_route_output(&rt, iph->daddr, 0, iph->tos, 0)) {
+ if (!ip_route_output_key(&rt, &fl)) {
/* Bridged-and-DNAT'ed traffic doesn't
* require ip_forwarding.
*/