Author: paszczus Date: Wed Aug 31 07:01:30 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated for 2.6.13
---- Files affected:
SOURCES:
routes-2.6.12-12.diff (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: SOURCES/routes-2.6.12-12.diff
diff -u SOURCES/routes-2.6.12-12.diff:1.1.2.1
SOURCES/routes-2.6.12-12.diff:1.1.2.2
--- SOURCES/routes-2.6.12-12.diff:1.1.2.1 Wed Jun 22 15:51:11 2005
+++ SOURCES/routes-2.6.12-12.diff Wed Aug 31 09:01:25 2005
@@ -1,7 +1,7 @@
-diff -ur v2.6.12/linux/include/linux/netfilter_ipv4/ip_nat.h
linux/include/linux/netfilter_ipv4/ip_nat.h
---- v2.6.12/linux/include/linux/netfilter_ipv4/ip_nat.h 2005-03-03
10:17:23.000000000 +0200
-+++ linux/include/linux/netfilter_ipv4/ip_nat.h 2005-06-18
10:06:59.654795656 +0300
-@@ -68,6 +68,13 @@
+diff -ur v2.6.13/linux/include/linux/netfilter_ipv4/ip_nat.h
linux/include/linux/netfilter_ipv4/ip_nat.h
+--- v2.6.13/linux/include/linux/netfilter_ipv4/ip_nat.h 2005-08-29
07:51:29.000000000 +0300
++++ linux/include/linux/netfilter_ipv4/ip_nat.h 2005-08-29
08:45:27.575265560 +0300
+@@ -67,6 +67,13 @@
struct ip_conntrack;
@@ -15,10 +15,10 @@
/* Set up the info structure to map into this range. */
extern unsigned int ip_nat_setup_info(struct ip_conntrack *conntrack,
const struct ip_nat_range *range,
-diff -ur v2.6.12/linux/include/linux/rtnetlink.h
linux/include/linux/rtnetlink.h
---- v2.6.12/linux/include/linux/rtnetlink.h 2005-06-18 08:50:52.000000000
+0300
-+++ linux/include/linux/rtnetlink.h 2005-06-18 10:06:59.655795504 +0300
-@@ -285,6 +285,8 @@
+diff -ur v2.6.13/linux/include/linux/rtnetlink.h
linux/include/linux/rtnetlink.h
+--- v2.6.13/linux/include/linux/rtnetlink.h 2005-08-29 07:51:29.000000000
+0300
++++ linux/include/linux/rtnetlink.h 2005-08-29 08:45:07.206362104 +0300
+@@ -292,6 +292,8 @@
#define RTNH_F_DEAD 1 /* Nexthop is dead (used by multipath)
*/
#define RTNH_F_PERVASIVE 2 /* Do recursive gateway lookup */
#define RTNH_F_ONLINK 4 /* Gateway is forced on link */
@@ -27,9 +27,9 @@
/* Macros to handle hexthops */
-diff -ur v2.6.12/linux/include/net/flow.h linux/include/net/flow.h
---- v2.6.12/linux/include/net/flow.h 2005-06-18 08:50:52.000000000 +0300
-+++ linux/include/net/flow.h 2005-06-18 10:06:59.655795504 +0300
+diff -ur v2.6.13/linux/include/net/flow.h linux/include/net/flow.h
+--- v2.6.13/linux/include/net/flow.h 2005-06-18 08:50:52.000000000 +0300
++++ linux/include/net/flow.h 2005-08-29 08:45:27.576265408 +0300
@@ -19,6 +19,8 @@
__u32 daddr;
__u32 saddr;
@@ -48,10 +48,10 @@
#define fl4_tos nl_u.ip4_u.tos
#define fl4_scope nl_u.ip4_u.scope
-diff -ur v2.6.12/linux/include/net/ip_fib.h linux/include/net/ip_fib.h
---- v2.6.12/linux/include/net/ip_fib.h 2005-06-18 08:50:52.000000000 +0300
-+++ linux/include/net/ip_fib.h 2005-06-18 10:06:59.655795504 +0300
-@@ -181,7 +181,8 @@
+diff -ur v2.6.13/linux/include/net/ip_fib.h linux/include/net/ip_fib.h
+--- v2.6.13/linux/include/net/ip_fib.h 2005-08-29 07:51:29.000000000 +0300
++++ linux/include/net/ip_fib.h 2005-08-29 08:45:07.207361952 +0300
+@@ -195,7 +195,8 @@
static inline void fib_select_default(const struct flowi *flp, struct
fib_result *res)
{
@@ -61,7 +61,7 @@
ip_fib_main_table->tb_select_default(ip_fib_main_table, flp,
res);
}
-@@ -193,6 +194,7 @@
+@@ -207,6 +208,7 @@
extern int fib_lookup(const struct flowi *flp, struct fib_result *res);
extern struct fib_table *__fib_new_table(int id);
extern void fib_rule_put(struct fib_rule *r);
@@ -69,16 +69,16 @@
static inline struct fib_table *fib_get_table(int id)
{
-@@ -281,4 +283,6 @@
+@@ -295,4 +297,6 @@
#endif
}
+extern rwlock_t fib_nhflags_lock;
+
#endif /* _NET_FIB_H */
-diff -ur v2.6.12/linux/include/net/route.h linux/include/net/route.h
---- v2.6.12/linux/include/net/route.h 2005-06-18 08:50:52.000000000 +0300
-+++ linux/include/net/route.h 2005-06-18 10:06:59.656795352 +0300
+diff -ur v2.6.13/linux/include/net/route.h linux/include/net/route.h
+--- v2.6.13/linux/include/net/route.h 2005-08-29 07:51:29.000000000 +0300
++++ linux/include/net/route.h 2005-08-29 08:45:27.576265408 +0300
@@ -121,6 +121,7 @@
extern int ip_route_output_key(struct rtable **, struct flowi
*flp);
extern int ip_route_output_flow(struct rtable **rp, struct flowi
*flp, struct sock *sk, int flags);
@@ -87,9 +87,9 @@
extern unsigned short ip_rt_frag_needed(struct iphdr *iph, unsigned short
new_mtu);
extern void ip_rt_send_redirect(struct sk_buff *skb);
-diff -ur v2.6.12/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
---- v2.6.12/linux/net/ipv4/fib_frontend.c 2005-03-03 10:17:23.000000000
+0200
-+++ linux/net/ipv4/fib_frontend.c 2005-06-18 10:06:59.656795352 +0300
+diff -ur v2.6.13/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
+--- v2.6.13/linux/net/ipv4/fib_frontend.c 2005-08-29 07:51:29.000000000
+0300
++++ linux/net/ipv4/fib_frontend.c 2005-08-29 08:45:07.207361952 +0300
@@ -54,6 +54,8 @@
struct fib_table *ip_fib_local_table;
struct fib_table *ip_fib_main_table;
@@ -160,7 +160,7 @@
return ret;
last_resort:
-@@ -531,9 +541,7 @@
+@@ -585,9 +595,7 @@
switch (event) {
case NETDEV_UP:
fib_add_ifaddr(ifa);
@@ -170,7 +170,7 @@
rt_cache_flush(-1);
break;
case NETDEV_DOWN:
-@@ -569,9 +577,7 @@
+@@ -623,9 +631,7 @@
for_ifa(in_dev) {
fib_add_ifaddr(ifa);
} endfor_ifa(in_dev);
@@ -180,9 +180,9 @@
rt_cache_flush(-1);
break;
case NETDEV_DOWN:
-diff -ur v2.6.12/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
---- v2.6.12/linux/net/ipv4/fib_hash.c 2005-06-18 08:50:52.000000000 +0300
-+++ linux/net/ipv4/fib_hash.c 2005-06-18 10:06:59.657795200 +0300
+diff -ur v2.6.13/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
+--- v2.6.13/linux/net/ipv4/fib_hash.c 2005-08-29 07:51:29.000000000 +0300
++++ linux/net/ipv4/fib_hash.c 2005-08-29 08:45:07.208361800 +0300
@@ -276,30 +276,38 @@
return err;
}
@@ -321,9 +321,9 @@
/*
* Insert new entry to the list.
-diff -ur v2.6.12/linux/net/ipv4/fib_lookup.h linux/net/ipv4/fib_lookup.h
---- v2.6.12/linux/net/ipv4/fib_lookup.h 2005-06-18 08:50:52.000000000
+0300
-+++ linux/net/ipv4/fib_lookup.h 2005-06-18 10:06:59.657795200 +0300
+diff -ur v2.6.13/linux/net/ipv4/fib_lookup.h linux/net/ipv4/fib_lookup.h
+--- v2.6.13/linux/net/ipv4/fib_lookup.h 2005-08-29 07:51:29.000000000
+0300
++++ linux/net/ipv4/fib_lookup.h 2005-08-29 08:45:07.208361800 +0300
@@ -8,6 +8,7 @@
struct fib_alias {
struct list_head fa_list;
@@ -332,7 +332,7 @@
u8 fa_tos;
u8 fa_type;
u8 fa_scope;
-@@ -38,6 +39,7 @@
+@@ -39,6 +40,7 @@
u8 tos, u32 prio);
extern int fib_detect_death(struct fib_info *fi, int order,
struct fib_info **last_resort,
@@ -341,9 +341,9 @@
+ const struct flowi *flp);
#endif /* _FIB_LOOKUP_H */
-diff -ur v2.6.12/linux/net/ipv4/fib_rules.c linux/net/ipv4/fib_rules.c
---- v2.6.12/linux/net/ipv4/fib_rules.c 2005-03-03 10:17:23.000000000 +0200
-+++ linux/net/ipv4/fib_rules.c 2005-06-18 10:06:59.658795048 +0300
+diff -ur v2.6.13/linux/net/ipv4/fib_rules.c linux/net/ipv4/fib_rules.c
+--- v2.6.13/linux/net/ipv4/fib_rules.c 2005-08-29 07:51:29.000000000 +0300
++++ linux/net/ipv4/fib_rules.c 2005-08-29 08:45:07.209361648 +0300
@@ -280,6 +280,11 @@
}
}
@@ -366,9 +366,9 @@
struct fib_table *tb;
if ((tb = fib_get_table(res->r->r_table)) != NULL)
tb->tb_select_default(tb, flp, res);
-diff -ur v2.6.12/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
---- v2.6.12/linux/net/ipv4/fib_semantics.c 2005-06-18 08:50:52.000000000
+0300
-+++ linux/net/ipv4/fib_semantics.c 2005-06-18 10:06:59.659794896 +0300
+diff -ur v2.6.13/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
+--- v2.6.13/linux/net/ipv4/fib_semantics.c 2005-08-29 07:51:29.000000000
+0300
++++ linux/net/ipv4/fib_semantics.c 2005-08-29 08:45:27.577265256 +0300
@@ -53,6 +53,7 @@
static struct hlist_head *fib_info_laddrhash;
static unsigned int fib_hash_size;
@@ -575,7 +575,7 @@
}
nh->nh_dev = in_dev->dev;
dev_hold(nh->nh_dev);
-@@ -882,8 +957,12 @@
+@@ -889,8 +964,12 @@
for_nexthops(fi) {
if (nh->nh_flags&RTNH_F_DEAD)
continue;
@@ -590,7 +590,7 @@
}
#ifdef CONFIG_IP_ROUTE_MULTIPATH
if (nhsel < fi->fib_nhs) {
-@@ -1189,18 +1268,29 @@
+@@ -1196,18 +1275,29 @@
prev_fi = fi;
dead = 0;
change_nexthops(fi) {
@@ -628,7 +628,7 @@
}
#ifdef CONFIG_IP_ROUTE_MULTIPATH
if (force > 1 && nh->nh_dev == dev) {
-@@ -1219,11 +1309,8 @@
+@@ -1226,11 +1316,8 @@
return ret;
}
@@ -641,7 +641,7 @@
*/
int fib_sync_up(struct net_device *dev)
-@@ -1233,8 +1320,10 @@
+@@ -1240,8 +1327,10 @@
struct hlist_head *head;
struct hlist_node *node;
struct fib_nh *nh;
@@ -653,7 +653,7 @@
if (!(dev->flags&IFF_UP))
return 0;
-@@ -1242,6 +1331,7 @@
+@@ -1249,6 +1338,7 @@
hash = fib_devindex_hashfn(dev->ifindex);
head = &fib_info_devhash[hash];
ret = 0;
@@ -661,7 +661,7 @@
hlist_for_each_entry(nh, node, head, nh_hash) {
struct fib_info *fi = nh->nh_parent;
-@@ -1254,19 +1344,37 @@
+@@ -1261,19 +1351,37 @@
prev_fi = fi;
alive = 0;
change_nexthops(fi) {
@@ -702,7 +702,7 @@
} endfor_nexthops(fi)
if (alive > 0) {
-@@ -1274,10 +1382,14 @@
+@@ -1281,10 +1389,14 @@
ret++;
}
}
@@ -717,7 +717,7 @@
/*
The algorithm is suboptimal, but it provides really
fair weighted route distribution.
-@@ -1286,24 +1398,45 @@
+@@ -1293,24 +1405,45 @@
void fib_select_multipath(const struct flowi *flp, struct fib_result *res)
{
struct fib_info *fi = res->fi;
@@ -771,7 +771,7 @@
}
-@@ -1313,20 +1446,40 @@
+@@ -1320,20 +1453,40 @@
w = jiffies % fi->fib_power;
@@ -815,9 +815,9 @@
spin_unlock_bh(&fib_multipath_lock);
}
#endif
-diff -ur v2.6.12/linux/net/ipv4/netfilter/ip_nat_core.c
linux/net/ipv4/netfilter/ip_nat_core.c
---- v2.6.12/linux/net/ipv4/netfilter/ip_nat_core.c 2005-06-18
08:50:52.000000000 +0300
-+++ linux/net/ipv4/netfilter/ip_nat_core.c 2005-06-18 10:06:59.659794896
+0300
+diff -ur v2.6.13/linux/net/ipv4/netfilter/ip_nat_core.c
linux/net/ipv4/netfilter/ip_nat_core.c
+--- v2.6.13/linux/net/ipv4/netfilter/ip_nat_core.c 2005-08-29
07:51:29.000000000 +0300
++++ linux/net/ipv4/netfilter/ip_nat_core.c 2005-08-29 08:45:27.577265256
+0300
@@ -496,6 +496,52 @@
synchronize_net();
}
@@ -871,10 +871,10 @@
int __init ip_nat_init(void)
{
size_t i;
-diff -ur v2.6.12/linux/net/ipv4/netfilter/ip_nat_standalone.c
linux/net/ipv4/netfilter/ip_nat_standalone.c
---- v2.6.12/linux/net/ipv4/netfilter/ip_nat_standalone.c 2005-06-18
08:50:52.000000000 +0300
-+++ linux/net/ipv4/netfilter/ip_nat_standalone.c 2005-06-18
10:06:59.661794592 +0300
-@@ -260,6 +260,14 @@
+diff -ur v2.6.13/linux/net/ipv4/netfilter/ip_nat_standalone.c
linux/net/ipv4/netfilter/ip_nat_standalone.c
+--- v2.6.13/linux/net/ipv4/netfilter/ip_nat_standalone.c 2005-08-29
07:51:29.000000000 +0300
++++ linux/net/ipv4/netfilter/ip_nat_standalone.c 2005-08-29
08:45:27.578265104 +0300
+@@ -264,6 +264,14 @@
.priority = NF_IP_PRI_NAT_DST,
};
@@ -889,7 +889,7 @@
/* After packet filtering, change source */
static struct nf_hook_ops ip_nat_out_ops = {
.hook = ip_nat_out,
-@@ -329,10 +337,15 @@
+@@ -333,10 +341,15 @@
printk("ip_nat_init: can't register in hook.\n");
goto cleanup_nat;
}
@@ -906,7 +906,7 @@
}
ret = nf_register_hook(&ip_nat_adjust_in_ops);
if (ret < 0) {
-@@ -366,6 +379,8 @@
+@@ -370,6 +383,8 @@
nf_unregister_hook(&ip_nat_adjust_in_ops);
cleanup_outops:
nf_unregister_hook(&ip_nat_out_ops);
@@ -915,9 +915,9 @@
cleanup_inops:
nf_unregister_hook(&ip_nat_in_ops);
cleanup_nat:
-diff -ur v2.6.12/linux/net/ipv4/netfilter/ipt_MASQUERADE.c
linux/net/ipv4/netfilter/ipt_MASQUERADE.c
---- v2.6.12/linux/net/ipv4/netfilter/ipt_MASQUERADE.c 2005-03-03
10:17:23.000000000 +0200
-+++ linux/net/ipv4/netfilter/ipt_MASQUERADE.c 2005-06-18 10:06:59.661794592
+0300
+diff -ur v2.6.13/linux/net/ipv4/netfilter/ipt_MASQUERADE.c
linux/net/ipv4/netfilter/ipt_MASQUERADE.c
+--- v2.6.13/linux/net/ipv4/netfilter/ipt_MASQUERADE.c 2005-08-29
07:51:29.000000000 +0300
++++ linux/net/ipv4/netfilter/ipt_MASQUERADE.c 2005-08-29 08:45:27.578265104
+0300
@@ -96,13 +96,31 @@
|| ctinfo == IP_CT_RELATED + IP_CT_IS_REPLY));
@@ -952,13 +952,13 @@
+ DEBUGP("newsrc = %u.%u.%u.%u\n", NIPQUAD(newsrc));
+ ip_rt_put(rt);
+
- WRITE_LOCK(&masq_lock);
+ write_lock_bh(&masq_lock);
ct->nat.masq_index = out->ifindex;
- WRITE_UNLOCK(&masq_lock);
-diff -ur v2.6.12/linux/net/ipv4/route.c linux/net/ipv4/route.c
---- v2.6.12/linux/net/ipv4/route.c 2005-06-18 08:50:52.000000000 +0300
-+++ linux/net/ipv4/route.c 2005-06-18 10:06:59.663794288 +0300
-@@ -1157,6 +1157,7 @@
+ write_unlock_bh(&masq_lock);
+diff -ur v2.6.13/linux/net/ipv4/route.c linux/net/ipv4/route.c
+--- v2.6.13/linux/net/ipv4/route.c 2005-08-29 07:51:29.000000000 +0300
++++ linux/net/ipv4/route.c 2005-08-29 08:45:27.580264800 +0300
+@@ -1195,6 +1195,7 @@
/* Gateway is different ... */
rt->rt_gateway = new_gw;
@@ -966,7 +966,7 @@
/* Redirect received -> path was valid */
dst_confirm(&rth->u.dst);
-@@ -1592,6 +1593,7 @@
+@@ -1630,6 +1631,7 @@
rth->fl.fl4_fwmark= skb->nfmark;
#endif
rth->fl.fl4_src = saddr;
@@ -974,7 +974,7 @@
rth->rt_src = saddr;
#ifdef CONFIG_NET_CLS_ROUTE
rth->u.dst.tclassid = itag;
-@@ -1602,6 +1604,7 @@
+@@ -1640,6 +1642,7 @@
dev_hold(rth->u.dst.dev);
rth->idev = in_dev_get(rth->u.dst.dev);
rth->fl.oif = 0;
@@ -982,7 +982,7 @@
rth->rt_gateway = daddr;
rth->rt_spec_dst= spec_dst;
rth->rt_type = RTN_MULTICAST;
-@@ -1666,7 +1669,7 @@
+@@ -1704,7 +1707,7 @@
struct fib_result* res,
struct in_device *in_dev,
u32 daddr, u32 saddr, u32 tos,
@@ -991,7 +991,7 @@
{
struct rtable *rth;
-@@ -1699,6 +1702,7 @@
+@@ -1737,6 +1740,7 @@
flags |= RTCF_DIRECTSRC;
if (out_dev == in_dev && err && !(flags & (RTCF_NAT | RTCF_MASQ)) &&
@@ -999,7 +999,7 @@
(IN_DEV_SHARED_MEDIA(out_dev) ||
inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res))))
flags |= RTCF_DOREDIRECT;
-@@ -1737,6 +1741,7 @@
+@@ -1775,6 +1779,7 @@
#endif
rth->fl.fl4_src = saddr;
rth->rt_src = saddr;
@@ -1007,7 +1007,7 @@
rth->rt_gateway = daddr;
rth->rt_iif =
rth->fl.iif = in_dev->dev->ifindex;
-@@ -1744,6 +1749,7 @@
+@@ -1782,6 +1787,7 @@
dev_hold(rth->u.dst.dev);
rth->idev = in_dev_get(rth->u.dst.dev);
rth->fl.oif = 0;
@@ -1015,14 +1015,14 @@
rth->rt_spec_dst= spec_dst;
rth->u.dst.input = ip_forward;
-@@ -1765,19 +1771,20 @@
+@@ -1803,19 +1809,20 @@
struct fib_result* res,
const struct flowi *fl,
struct in_device *in_dev,
- u32 daddr, u32 saddr, u32 tos)
+ u32 daddr, u32 saddr, u32 tos, u32 lsrc)
{
- struct rtable* rth;
+ struct rtable* rth = NULL;
int err;
unsigned hash;
@@ -1039,7 +1039,7 @@
if (err)
return err;
atomic_set(&rth->u.dst.__refcnt, 1);
-@@ -1791,7 +1798,7 @@
+@@ -1829,7 +1836,7 @@
struct fib_result* res,
const struct flowi *fl,
struct in_device *in_dev,
@@ -1047,8 +1047,8 @@
+ u32 daddr, u32 saddr, u32 tos, u32 lsrc)
{
#ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED
- struct rtable* rth;
-@@ -1809,7 +1816,7 @@
+ struct rtable* rth = NULL;
+@@ -1847,7 +1854,7 @@
/* distinguish between multipath and singlepath */
if (hopcount < 2)
return ip_mkroute_input_def(skb, res, fl, in_dev, daddr,
@@ -1057,7 +1057,7 @@
/* add all alternatives to the routing cache */
for (hop = 0; hop < hopcount; hop++) {
-@@ -1817,7 +1824,7 @@
+@@ -1855,7 +1862,7 @@
/* create a routing cache entry */
err = __mkroute_input(skb, res, in_dev, daddr, saddr, tos,
@@ -1066,7 +1066,7 @@
if (err)
return err;
-@@ -1842,7 +1849,7 @@
+@@ -1880,7 +1887,7 @@
}
return err;
#else /* CONFIG_IP_ROUTE_MULTIPATH_CACHED */
@@ -1075,7 +1075,7 @@
#endif /* CONFIG_IP_ROUTE_MULTIPATH_CACHED */
}
-@@ -1858,20 +1865,20 @@
+@@ -1896,20 +1903,20 @@
*/
static int ip_route_input_slow(struct sk_buff *skb, u32 daddr, u32 saddr,
@@ -1099,7 +1099,7 @@
unsigned flags = 0;
u32 itag = 0;
struct rtable * rth;
-@@ -1904,6 +1911,12 @@
+@@ -1942,6 +1949,12 @@
if (BADCLASS(daddr) || ZERONET(daddr) || LOOPBACK(daddr))
goto martian_destination;
@@ -1112,7 +1112,7 @@
/*
* Now we are ready to route packet.
*/
-@@ -1913,6 +1926,10 @@
+@@ -1951,6 +1964,10 @@
goto no_route;
}
free_res = 1;
@@ -1123,7 +1123,7 @@
RT_CACHE_STAT_INC(in_slow_tot);
-@@ -1937,7 +1954,7 @@
+@@ -1975,7 +1992,7 @@
if (res.type != RTN_UNICAST)
goto martian_destination;
@@ -1132,7 +1132,7 @@
if (err == -ENOBUFS)
goto e_nobufs;
if (err == -EINVAL)
-@@ -1952,6 +1969,8 @@
+@@ -1990,6 +2007,8 @@
brd_input:
if (skb->protocol != htons(ETH_P_IP))
goto e_inval;
@@ -1141,7 +1141,7 @@
if (ZERONET(saddr))
spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK);
-@@ -1994,6 +2013,7 @@
+@@ -2032,6 +2051,7 @@
rth->u.dst.dev = &loopback_dev;
dev_hold(rth->u.dst.dev);
rth->idev = in_dev_get(rth->u.dst.dev);
@@ -1149,7 +1149,7 @@
rth->rt_gateway = daddr;
rth->rt_spec_dst= spec_dst;
rth->u.dst.input= ip_local_deliver;
-@@ -2038,8 +2058,9 @@
+@@ -2081,8 +2101,9 @@
goto e_inval;
}
@@ -1161,7 +1161,7 @@
{
struct rtable * rth;
unsigned hash;
-@@ -2054,6 +2075,7 @@
+@@ -2097,6 +2118,7 @@
if (rth->fl.fl4_dst == daddr &&
rth->fl.fl4_src == saddr &&
rth->fl.iif == iif &&
@@ -1169,7 +1169,7 @@
rth->fl.oif == 0 &&
#ifdef CONFIG_IP_ROUTE_FWMARK
rth->fl.fl4_fwmark == skb->nfmark &&
-@@ -2102,7 +2124,19 @@
+@@ -2145,7 +2167,19 @@
rcu_read_unlock();
return -EINVAL;
}
@@ -1190,7 +1190,7 @@
}
static inline int __mkroute_output(struct rtable **result,
-@@ -2180,6 +2214,7 @@
+@@ -2223,6 +2257,7 @@
rth->fl.fl4_tos = tos;
rth->fl.fl4_src = oldflp->fl4_src;
rth->fl.oif = oldflp->oif;
@@ -1198,7 +1198,7 @@
#ifdef CONFIG_IP_ROUTE_FWMARK
rth->fl.fl4_fwmark= oldflp->fl4_fwmark;
#endif
-@@ -2326,6 +2361,7 @@
+@@ -2369,6 +2404,7 @@
struct flowi fl = { .nl_u = { .ip4_u =
{ .daddr = oldflp->fl4_dst,
.saddr = oldflp->fl4_src,
@@ -1206,7 +1206,7 @@
.tos = tos & IPTOS_RT_MASK,
.scope = ((tos & RTO_ONLINK) ?
RT_SCOPE_LINK :
-@@ -2429,6 +2465,7 @@
+@@ -2472,6 +2508,7 @@
dev_out = &loopback_dev;
dev_hold(dev_out);
fl.oif = loopback_dev.ifindex;
@@ -1214,7 +1214,7 @@
res.type = RTN_LOCAL;
flags |= RTCF_LOCAL;
goto make_route;
-@@ -2436,7 +2473,7 @@
+@@ -2479,7 +2516,7 @@
if (fib_lookup(&fl, &res)) {
res.fi = NULL;
@@ -1223,7 +1223,7 @@
/* Apparently, routing tables are wrong. Assume,
that the destination is on link.
-@@ -2476,6 +2513,7 @@
+@@ -2519,6 +2556,7 @@
dev_out = &loopback_dev;
dev_hold(dev_out);
fl.oif = dev_out->ifindex;
@@ -1231,7 +1231,7 @@
if (res.fi)
fib_info_put(res.fi);
res.fi = NULL;
-@@ -2483,13 +2521,12 @@
+@@ -2526,13 +2564,12 @@
goto make_route;
}
@@ -1248,7 +1248,7 @@
if (!fl.fl4_src)
fl.fl4_src = FIB_RES_PREFSRC(res);
-@@ -2526,6 +2563,7 @@
+@@ -2569,6 +2606,7 @@
rth->fl.fl4_src == flp->fl4_src &&
rth->fl.iif == 0 &&
rth->fl.oif == flp->oif &&
@@ -1256,7 +1256,7 @@
#ifdef CONFIG_IP_ROUTE_FWMARK
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/routes-2.6.12-12.diff?r1=1.1.2.1&r2=1.1.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
