Author: arekm Date: Sun May 23 08:14:33 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- drop lzma patches (included already); updated routes patch
---- Files affected:
packages/kernel:
kernel-routes.patch (1.8 -> 1.9) , kernel.spec (1.785 -> 1.786) ,
kernel-squashfs-lzma-fixes.patch (1.1 -> NONE) (REMOVED),
kernel-squashfs-lzma.patch (1.3 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/kernel/kernel-routes.patch
diff -u packages/kernel/kernel-routes.patch:1.8
packages/kernel/kernel-routes.patch:1.9
--- packages/kernel/kernel-routes.patch:1.8 Fri Feb 26 00:09:40 2010
+++ packages/kernel/kernel-routes.patch Sun May 23 10:14:27 2010
@@ -1,6 +1,6 @@
-diff -urp v2.6.33/linux/include/linux/rtnetlink.h
linux/include/linux/rtnetlink.h
---- v2.6.33/linux/include/linux/rtnetlink.h 2010-02-25 09:01:36.000000000
+0200
-+++ linux/include/linux/rtnetlink.h 2010-02-25 11:11:52.000000000 +0200
+diff -urp v2.6.34/linux/include/linux/rtnetlink.h
linux/include/linux/rtnetlink.h
+--- v2.6.34/linux/include/linux/rtnetlink.h 2010-05-17 10:49:00.000000000
+0300
++++ linux/include/linux/rtnetlink.h 2010-05-18 09:58:49.000000000 +0300
@@ -304,6 +304,8 @@ struct rtnexthop {
#define RTNH_F_DEAD 1 /* Nexthop is dead (used by multipath)
*/
#define RTNH_F_PERVASIVE 2 /* Do recursive gateway lookup */
@@ -10,9 +10,9 @@
/* Macros to handle hexthops */
-diff -urp v2.6.33/linux/include/net/flow.h linux/include/net/flow.h
---- v2.6.33/linux/include/net/flow.h 2009-03-25 09:48:32.000000000 +0200
-+++ linux/include/net/flow.h 2010-02-25 11:11:52.000000000 +0200
+diff -urp v2.6.34/linux/include/net/flow.h linux/include/net/flow.h
+--- v2.6.34/linux/include/net/flow.h 2009-03-25 09:48:32.000000000 +0200
++++ linux/include/net/flow.h 2010-05-18 09:58:49.000000000 +0300
@@ -19,6 +19,8 @@ struct flowi {
struct {
__be32 daddr;
@@ -31,9 +31,9 @@
#define fl4_tos nl_u.ip4_u.tos
#define fl4_scope nl_u.ip4_u.scope
-diff -urp v2.6.33/linux/include/net/ip_fib.h linux/include/net/ip_fib.h
---- v2.6.33/linux/include/net/ip_fib.h 2010-02-25 09:01:36.000000000 +0200
-+++ linux/include/net/ip_fib.h 2010-02-25 11:11:52.000000000 +0200
+diff -urp v2.6.34/linux/include/net/ip_fib.h linux/include/net/ip_fib.h
+--- v2.6.34/linux/include/net/ip_fib.h 2010-02-25 09:01:36.000000000 +0200
++++ linux/include/net/ip_fib.h 2010-05-18 09:58:49.000000000 +0300
@@ -207,6 +207,8 @@ extern int fib_lookup(struct net *n, str
extern struct fib_table *fib_new_table(struct net *net, u32 id);
extern struct fib_table *fib_get_table(struct net *net, u32 id);
@@ -50,9 +50,9 @@
+extern rwlock_t fib_nhflags_lock;
+
#endif /* _NET_FIB_H */
-diff -urp v2.6.33/linux/include/net/netfilter/nf_nat.h
linux/include/net/netfilter/nf_nat.h
---- v2.6.33/linux/include/net/netfilter/nf_nat.h 2010-02-25
09:01:36.000000000 +0200
-+++ linux/include/net/netfilter/nf_nat.h 2010-02-25 11:11:52.000000000
+0200
+diff -urp v2.6.34/linux/include/net/netfilter/nf_nat.h
linux/include/net/netfilter/nf_nat.h
+--- v2.6.34/linux/include/net/netfilter/nf_nat.h 2010-02-25
09:01:36.000000000 +0200
++++ linux/include/net/netfilter/nf_nat.h 2010-05-18 09:58:49.000000000
+0300
@@ -73,6 +73,13 @@ struct nf_conn_nat {
#endif
};
@@ -67,9 +67,9 @@
/* Set up the info structure to map into this range. */
extern unsigned int nf_nat_setup_info(struct nf_conn *ct,
const struct nf_nat_range *range,
-diff -urp v2.6.33/linux/include/net/route.h linux/include/net/route.h
---- v2.6.33/linux/include/net/route.h 2010-02-25 09:01:36.000000000 +0200
-+++ linux/include/net/route.h 2010-02-25 11:11:52.000000000 +0200
+diff -urp v2.6.34/linux/include/net/route.h linux/include/net/route.h
+--- v2.6.34/linux/include/net/route.h 2010-05-17 10:49:00.000000000 +0300
++++ linux/include/net/route.h 2010-05-18 09:58:49.000000000 +0300
@@ -113,6 +113,7 @@ extern int __ip_route_output_key(struct
extern int ip_route_output_key(struct net *, struct rtable **,
struct flowi *flp);
extern int ip_route_output_flow(struct net *, struct rtable **rp,
struct flowi *flp, struct sock *sk, int flags);
@@ -78,10 +78,10 @@
extern unsigned short ip_rt_frag_needed(struct net *net, struct iphdr *iph,
unsigned short new_mtu, struct net_device *dev);
extern void ip_rt_send_redirect(struct sk_buff *skb);
-diff -urp v2.6.33/linux/net/bridge/br_netfilter.c
linux/net/bridge/br_netfilter.c
---- v2.6.33/linux/net/bridge/br_netfilter.c 2010-02-25 09:01:36.000000000
+0200
-+++ linux/net/bridge/br_netfilter.c 2010-02-25 11:11:52.000000000 +0200
-@@ -343,6 +343,9 @@ static int br_nf_pre_routing_finish(stru
+diff -urp v2.6.34/linux/net/bridge/br_netfilter.c
linux/net/bridge/br_netfilter.c
+--- v2.6.34/linux/net/bridge/br_netfilter.c 2010-05-17 10:49:01.000000000
+0300
++++ linux/net/bridge/br_netfilter.c 2010-05-18 09:58:49.000000000 +0300
+@@ -344,6 +344,9 @@ static int br_nf_pre_routing_finish(stru
struct rtable *rt;
int err;
@@ -91,10 +91,10 @@
if (nf_bridge->mask & BRNF_PKT_TYPE) {
skb->pkt_type = PACKET_OTHERHOST;
nf_bridge->mask ^= BRNF_PKT_TYPE;
-diff -urp v2.6.33/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
---- v2.6.33/linux/net/ipv4/fib_frontend.c 2010-02-25 09:01:36.000000000
+0200
-+++ linux/net/ipv4/fib_frontend.c 2010-02-25 11:13:43.000000000 +0200
-@@ -46,6 +46,8 @@
+diff -urp v2.6.34/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
+--- v2.6.34/linux/net/ipv4/fib_frontend.c 2010-05-17 10:49:01.000000000
+0300
++++ linux/net/ipv4/fib_frontend.c 2010-05-18 09:58:49.000000000 +0300
+@@ -47,6 +47,8 @@
#ifndef CONFIG_IP_MULTIPLE_TABLES
@@ -103,7 +103,7 @@
static int __net_init fib4_rules_init(struct net *net)
{
struct fib_table *local_table, *main_table;
-@@ -70,6 +72,8 @@ fail:
+@@ -71,6 +73,8 @@ fail:
}
#else
@@ -112,7 +112,7 @@
struct fib_table *fib_new_table(struct net *net, u32 id)
{
struct fib_table *tb;
-@@ -124,7 +128,8 @@ void fib_select_default(struct net *net,
+@@ -125,7 +129,8 @@ void fib_select_default(struct net *net,
table = res->r->table;
#endif
tb = fib_get_table(net, table);
@@ -122,7 +122,7 @@
fib_table_select_default(tb, flp, res);
}
-@@ -241,6 +246,9 @@ int fib_validate_source(__be32 src, __be
+@@ -242,6 +247,9 @@ int fib_validate_source(__be32 src, __be
.iif = oif };
struct fib_result res;
@@ -132,7 +132,7 @@
int no_addr, rpf, accept_local;
int ret;
struct net *net;
-@@ -269,31 +277,35 @@ int fib_validate_source(__be32 src, __be
+@@ -270,31 +278,35 @@ int fib_validate_source(__be32 src, __be
}
*spec_dst = FIB_RES_PREFSRC(res);
fib_combine_itag(itag, &res);
@@ -175,7 +175,7 @@
return ret;
last_resort:
-@@ -916,9 +928,7 @@ static int fib_inetaddr_event(struct not
+@@ -917,9 +929,7 @@ static int fib_inetaddr_event(struct not
switch (event) {
case NETDEV_UP:
fib_add_ifaddr(ifa);
@@ -185,7 +185,7 @@
rt_cache_flush(dev_net(dev), -1);
break;
case NETDEV_DOWN:
-@@ -954,9 +964,7 @@ static int fib_netdev_event(struct notif
+@@ -955,9 +965,7 @@ static int fib_netdev_event(struct notif
for_ifa(in_dev) {
fib_add_ifaddr(ifa);
} endfor_ifa(in_dev);
@@ -195,10 +195,10 @@
rt_cache_flush(dev_net(dev), -1);
break;
case NETDEV_DOWN:
-diff -urp v2.6.33/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
---- v2.6.33/linux/net/ipv4/fib_hash.c 2010-02-25 09:01:36.000000000 +0200
-+++ linux/net/ipv4/fib_hash.c 2010-02-25 11:11:52.000000000 +0200
-@@ -277,25 +277,35 @@ out:
+diff -urp v2.6.34/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
+--- v2.6.34/linux/net/ipv4/fib_hash.c 2010-05-17 10:49:01.000000000 +0300
++++ linux/net/ipv4/fib_hash.c 2010-05-18 09:58:49.000000000 +0300
+@@ -278,25 +278,35 @@ out:
void fib_table_select_default(struct fib_table *tb,
const struct flowi *flp, struct fib_result *res)
{
@@ -237,7 +237,7 @@
list_for_each_entry(fa, &f->fn_alias, fa_list) {
struct fib_info *next_fi = fa->fa_info;
-@@ -303,42 +313,56 @@ void fib_table_select_default(struct fib
+@@ -304,42 +314,56 @@ void fib_table_select_default(struct fib
fa->fa_type != RTN_UNICAST)
continue;
@@ -308,7 +308,7 @@
out:
read_unlock(&fib_hash_lock);
}
-@@ -462,6 +486,7 @@ int fib_table_insert(struct fib_table *t
+@@ -463,6 +487,7 @@ int fib_table_insert(struct fib_table *t
write_lock_bh(&fib_hash_lock);
fi_drop = fa->fa_info;
fa->fa_info = fi;
@@ -316,7 +316,7 @@
fa->fa_type = cfg->fc_type;
fa->fa_scope = cfg->fc_scope;
state = fa->fa_state;
-@@ -516,6 +541,7 @@ int fib_table_insert(struct fib_table *t
+@@ -517,6 +542,7 @@ int fib_table_insert(struct fib_table *t
new_fa->fa_type = cfg->fc_type;
new_fa->fa_scope = cfg->fc_scope;
new_fa->fa_state = 0;
@@ -324,9 +324,9 @@
/*
* Insert new entry to the list.
-diff -urp v2.6.33/linux/net/ipv4/fib_lookup.h linux/net/ipv4/fib_lookup.h
---- v2.6.33/linux/net/ipv4/fib_lookup.h 2009-09-11 10:27:17.000000000
+0300
-+++ linux/net/ipv4/fib_lookup.h 2010-02-25 11:11:52.000000000 +0200
+diff -urp v2.6.34/linux/net/ipv4/fib_lookup.h linux/net/ipv4/fib_lookup.h
+--- v2.6.34/linux/net/ipv4/fib_lookup.h 2009-09-11 10:27:17.000000000
+0300
++++ linux/net/ipv4/fib_lookup.h 2010-05-18 09:58:49.000000000 +0300
@@ -8,6 +8,7 @@
struct fib_alias {
struct list_head fa_list;
@@ -345,9 +345,9 @@
static inline void fib_result_assign(struct fib_result *res,
struct fib_info *fi)
-diff -urp v2.6.33/linux/net/ipv4/fib_rules.c linux/net/ipv4/fib_rules.c
---- v2.6.33/linux/net/ipv4/fib_rules.c 2010-02-25 09:01:36.000000000 +0200
-+++ linux/net/ipv4/fib_rules.c 2010-02-25 11:11:52.000000000 +0200
+diff -urp v2.6.34/linux/net/ipv4/fib_rules.c linux/net/ipv4/fib_rules.c
+--- v2.6.34/linux/net/ipv4/fib_rules.c 2010-02-25 09:01:36.000000000 +0200
++++ linux/net/ipv4/fib_rules.c 2010-05-18 09:58:49.000000000 +0300
@@ -54,6 +54,11 @@ u32 fib_rules_tclass(struct fib_result *
}
#endif
@@ -360,10 +360,10 @@
int fib_lookup(struct net *net, struct flowi *flp, struct fib_result *res)
{
struct fib_lookup_arg arg = {
-diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
---- v2.6.33/linux/net/ipv4/fib_semantics.c 2010-02-25 09:01:36.000000000
+0200
-+++ linux/net/ipv4/fib_semantics.c 2010-02-25 11:11:52.000000000 +0200
-@@ -50,6 +50,7 @@ static struct hlist_head *fib_info_hash;
+diff -urp v2.6.34/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
+--- v2.6.34/linux/net/ipv4/fib_semantics.c 2010-05-17 10:49:01.000000000
+0300
++++ linux/net/ipv4/fib_semantics.c 2010-05-18 09:58:49.000000000 +0300
+@@ -51,6 +51,7 @@ static struct hlist_head *fib_info_hash;
static struct hlist_head *fib_info_laddrhash;
static unsigned int fib_hash_size;
static unsigned int fib_info_cnt;
@@ -371,7 +371,7 @@
#define DEVINDEX_HASHBITS 8
#define DEVINDEX_HASHSIZE (1U << DEVINDEX_HASHBITS)
-@@ -186,7 +187,7 @@ static __inline__ int nh_comp(const stru
+@@ -187,7 +188,7 @@ static __inline__ int nh_comp(const stru
#ifdef CONFIG_NET_CLS_ROUTE
nh->nh_tclassid != onh->nh_tclassid ||
#endif
@@ -380,7 +380,7 @@
return -1;
onh++;
} endfor_nexthops(fi);
-@@ -237,7 +238,7 @@ static struct fib_info *fib_find_info(co
+@@ -238,7 +239,7 @@ static struct fib_info *fib_find_info(co
nfi->fib_priority == fi->fib_priority &&
memcmp(nfi->fib_metrics, fi->fib_metrics,
sizeof(fi->fib_metrics)) == 0 &&
@@ -389,7 +389,7 @@
(nfi->fib_nhs == 0 || nh_comp(fi, nfi) == 0))
return fi;
}
-@@ -349,26 +350,70 @@ struct fib_alias *fib_find_alias(struct
+@@ -350,26 +351,70 @@ struct fib_alias *fib_find_alias(struct
}
int fib_detect_death(struct fib_info *fi, int order,
@@ -476,7 +476,7 @@
}
#ifdef CONFIG_IP_ROUTE_MULTIPATH
-@@ -540,8 +585,11 @@ static int fib_check_nh(struct fib_confi
+@@ -538,8 +583,11 @@ static int fib_check_nh(struct fib_confi
return -EINVAL;
if ((dev = __dev_get_by_index(net, nh->nh_oif)) == NULL)
return -ENODEV;
@@ -490,7 +490,7 @@
nh->nh_dev = dev;
dev_hold(dev);
nh->nh_scope = RT_SCOPE_LINK;
-@@ -561,24 +609,48 @@ static int fib_check_nh(struct fib_confi
+@@ -559,24 +607,48 @@ static int fib_check_nh(struct fib_confi
/* It is not necessary, but requires a bit of thinking
*/
if (fl.fl4_scope < RT_SCOPE_LINK)
fl.fl4_scope = RT_SCOPE_LINK;
@@ -555,7 +555,7 @@
} else {
struct in_device *in_dev;
-@@ -589,8 +661,11 @@ out:
+@@ -587,8 +659,11 @@ out:
if (in_dev == NULL)
return -ENODEV;
if (!(in_dev->dev->flags&IFF_UP)) {
@@ -569,7 +569,7 @@
}
nh->nh_dev = in_dev->dev;
dev_hold(nh->nh_dev);
-@@ -899,8 +974,12 @@ int fib_semantic_match(struct list_head
+@@ -897,8 +972,12 @@ int fib_semantic_match(struct list_head
for_nexthops(fi) {
if (nh->nh_flags&RTNH_F_DEAD)
continue;
@@ -584,34 +584,34 @@
}
#ifdef CONFIG_IP_ROUTE_MULTIPATH
if (nhsel < fi->fib_nhs) {
-@@ -1080,18 +1159,29 @@ int fib_sync_down_dev(struct net_device
+@@ -1078,18 +1157,29 @@ int fib_sync_down_dev(struct net_device
prev_fi = fi;
dead = 0;
change_nexthops(fi) {
-- if (nh->nh_flags&RTNH_F_DEAD)
+- if (nexthop_nh->nh_flags&RTNH_F_DEAD)
- dead++;
-- else if (nh->nh_dev == dev &&
-- nh->nh_scope != scope) {
-- nh->nh_flags |= RTNH_F_DEAD;
-+ if (nh->nh_flags&RTNH_F_DEAD) {
+- else if (nexthop_nh->nh_dev == dev &&
+- nexthop_nh->nh_scope != scope) {
+- nexthop_nh->nh_flags |= RTNH_F_DEAD;
++ if (nexthop_nh->nh_flags&RTNH_F_DEAD) {
+ if (fi->fib_protocol!=RTPROT_STATIC ||
-+ nh->nh_dev == NULL ||
-+ __in_dev_get_rtnl(nh->nh_dev) == NULL ||
-+ nh->nh_dev->flags&IFF_UP)
++ nexthop_nh->nh_dev == NULL ||
++ __in_dev_get_rtnl(nexthop_nh->nh_dev) ==
NULL ||
++ nexthop_nh->nh_dev->flags&IFF_UP)
+ dead++;
-+ } else if (nh->nh_dev == dev &&
-+ nh->nh_scope != scope) {
++ } else if (nexthop_nh->nh_dev == dev &&
++ nexthop_nh->nh_scope != scope) {
+ write_lock_bh(&fib_nhflags_lock);
#ifdef CONFIG_IP_ROUTE_MULTIPATH
- spin_lock_bh(&fib_multipath_lock);
+ spin_lock(&fib_multipath_lock);
-+ nh->nh_flags |= RTNH_F_DEAD;
- fi->fib_power -= nh->nh_power;
- nh->nh_power = 0;
++ nexthop_nh->nh_flags |= RTNH_F_DEAD;
+ fi->fib_power -= nexthop_nh->nh_power;
+ nexthop_nh->nh_power = 0;
- spin_unlock_bh(&fib_multipath_lock);
+ spin_unlock(&fib_multipath_lock);
+#else
-+ nh->nh_flags |= RTNH_F_DEAD;
++ nexthop_nh->nh_flags |= RTNH_F_DEAD;
#endif
- dead++;
+ write_unlock_bh(&fib_nhflags_lock);
@@ -621,8 +621,8 @@
+ dead++;
}
#ifdef CONFIG_IP_ROUTE_MULTIPATH
- if (force > 1 && nh->nh_dev == dev) {
-@@ -1109,11 +1199,8 @@ int fib_sync_down_dev(struct net_device
+ if (force > 1 && nexthop_nh->nh_dev == dev) {
+@@ -1107,11 +1197,8 @@ int fib_sync_down_dev(struct net_device
return ret;
}
@@ -635,7 +635,7 @@
*/
int fib_sync_up(struct net_device *dev)
-@@ -1123,8 +1210,10 @@ int fib_sync_up(struct net_device *dev)
+@@ -1121,8 +1208,10 @@ int fib_sync_up(struct net_device *dev)
struct hlist_head *head;
struct hlist_node *node;
struct fib_nh *nh;
@@ -647,7 +647,7 @@
if (!(dev->flags&IFF_UP))
return 0;
-@@ -1132,6 +1221,7 @@ int fib_sync_up(struct net_device *dev)
+@@ -1130,6 +1219,7 @@ int fib_sync_up(struct net_device *dev)
hash = fib_devindex_hashfn(dev->ifindex);
head = &fib_info_devhash[hash];
ret = 0;
@@ -655,25 +655,27 @@
hlist_for_each_entry(nh, node, head, nh_hash) {
struct fib_info *fi = nh->nh_parent;
-@@ -1144,19 +1234,39 @@ int fib_sync_up(struct net_device *dev)
+@@ -1142,21 +1232,41 @@ int fib_sync_up(struct net_device *dev)
prev_fi = fi;
alive = 0;
change_nexthops(fi) {
-- if (!(nh->nh_flags&RTNH_F_DEAD)) {
+- if (!(nexthop_nh->nh_flags&RTNH_F_DEAD)) {
- alive++;
-+ if (!(nh->nh_flags&RTNH_F_DEAD))
++ if (!(nexthop_nh->nh_flags&RTNH_F_DEAD))
continue;
- }
- if (nh->nh_dev == NULL || !(nh->nh_dev->flags&IFF_UP))
+ if (nexthop_nh->nh_dev == NULL ||
+ !(nexthop_nh->nh_dev->flags&IFF_UP))
continue;
- if (nh->nh_dev != dev || !__in_dev_get_rtnl(dev))
+ if (nexthop_nh->nh_dev != dev ||
+ !__in_dev_get_rtnl(dev))
continue;
-+ if (nh->nh_gw && fi->fib_protocol == RTPROT_STATIC) {
++ if (nexthop_nh->nh_gw && fi->fib_protocol ==
RTPROT_STATIC) {
+ struct flowi fl = {
+ .nl_u = { .ip4_u =
-+ { .daddr = nh->nh_gw,
-+ .scope = nh->nh_scope } },
-+ .oif = nh->nh_oif,
++ { .daddr = nexthop_nh->nh_gw,
++ .scope =
nexthop_nh->nh_scope } },
++ .oif = nexthop_nh->nh_oif,
+ };
+ if (fib_lookup(dev_net(dev), &fl, &res) != 0)
+ continue;
@@ -682,16 +684,16 @@
+ fib_res_put(&res);
+ continue;
+ }
-+ nh->nh_scope = res.scope;
++ nexthop_nh->nh_scope = res.scope;
+ fib_res_put(&res);
+ rep = 1;
+ }
alive++;
+#ifdef CONFIG_IP_ROUTE_MULTIPATH
spin_lock_bh(&fib_multipath_lock);
- nh->nh_power = 0;
+ nexthop_nh->nh_power = 0;
+#endif
- nh->nh_flags &= ~RTNH_F_DEAD;
+ nexthop_nh->nh_flags &= ~RTNH_F_DEAD;
+#ifdef CONFIG_IP_ROUTE_MULTIPATH
spin_unlock_bh(&fib_multipath_lock);
+#endif
@@ -725,14 +727,14 @@
+ int sel = -1;
+ w = -1;
+ change_nexthops(fi) {
-+ if (flp->oif != nh->nh_oif)
++ if (flp->oif != nexthop_nh->nh_oif)
+ continue;
-+ if (flp->fl4_gw && flp->fl4_gw != nh->nh_gw &&
-+ nh->nh_gw && nh->nh_scope == RT_SCOPE_LINK)
++ if (flp->fl4_gw && flp->fl4_gw != nexthop_nh->nh_gw &&
++ nexthop_nh->nh_gw && nexthop_nh->nh_scope ==
RT_SCOPE_LINK)
+ continue;
-+ if (!(nh->nh_flags&RTNH_F_BADSTATE)) {
-+ if (nh->nh_power > w) {
-+ w = nh->nh_power;
++ if (!(nexthop_nh->nh_flags&RTNH_F_BADSTATE)) {
++ if (nexthop_nh->nh_power > w) {
++ w = nexthop_nh->nh_power;
+ sel = nhsel;
+ }
+ }
@@ -749,10 +751,10 @@
if (fi->fib_power <= 0) {
int power = 0;
change_nexthops(fi) {
-- if (!(nh->nh_flags&RTNH_F_DEAD)) {
-+ if (!(nh->nh_flags&RTNH_F_BADSTATE)) {
- power += nh->nh_weight;
- nh->nh_power = nh->nh_weight;
+- if (!(nexthop_nh->nh_flags&RTNH_F_DEAD)) {
++ if (!(nexthop_nh->nh_flags&RTNH_F_BADSTATE)) {
+ power += nexthop_nh->nh_weight;
+ nexthop_nh->nh_power = nexthop_nh->nh_weight;
}
} endfor_nexthops(fi);
fi->fib_power = power;
@@ -767,16 +769,17 @@
}
-@@ -1203,20 +1338,40 @@ void fib_select_multipath(const struct f
+@@ -1203,21 +1338,41 @@ void fib_select_multipath(const struct f
w = jiffies % fi->fib_power;
+ alive = 0;
change_nexthops(fi) {
-- if (!(nh->nh_flags&RTNH_F_DEAD) && nh->nh_power) {
-+ if (!(nh->nh_flags&RTNH_F_BADSTATE) && nh->nh_power) {
- if ((w -= nh->nh_power) <= 0) {
- nh->nh_power--;
+- if (!(nexthop_nh->nh_flags&RTNH_F_DEAD) &&
++ if (!(nexthop_nh->nh_flags&RTNH_F_BADSTATE) &&
+ nexthop_nh->nh_power) {
+ if ((w -= nexthop_nh->nh_power) <= 0) {
+ nexthop_nh->nh_power--;
fi->fib_power--;
- res->nh_sel = nhsel;
spin_unlock_bh(&fib_multipath_lock);
@@ -811,10 +814,10 @@
spin_unlock_bh(&fib_multipath_lock);
}
#endif
-diff -urp v2.6.33/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
---- v2.6.33/linux/net/ipv4/fib_trie.c 2010-02-25 09:01:36.000000000 +0200
-+++ linux/net/ipv4/fib_trie.c 2010-02-25 11:11:52.000000000 +0200
-@@ -1272,6 +1272,7 @@ int fib_table_insert(struct fib_table *t
+diff -urp v2.6.34/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
+--- v2.6.34/linux/net/ipv4/fib_trie.c 2010-05-17 10:49:01.000000000 +0300
++++ linux/net/ipv4/fib_trie.c 2010-05-18 09:58:49.000000000 +0300
+@@ -1277,6 +1277,7 @@ int fib_table_insert(struct fib_table *t
fi_drop = fa->fa_info;
new_fa->fa_tos = fa->fa_tos;
new_fa->fa_info = fi;
@@ -822,7 +825,7 @@
new_fa->fa_type = cfg->fc_type;
new_fa->fa_scope = cfg->fc_scope;
state = fa->fa_state;
-@@ -1312,6 +1313,7 @@ int fib_table_insert(struct fib_table *t
+@@ -1317,6 +1318,7 @@ int fib_table_insert(struct fib_table *t
new_fa->fa_type = cfg->fc_type;
new_fa->fa_scope = cfg->fc_scope;
new_fa->fa_state = 0;
@@ -830,7 +833,7 @@
/*
* Insert new entry to the list.
*/
-@@ -1812,24 +1814,31 @@ void fib_table_select_default(struct fib
+@@ -1817,24 +1819,31 @@ void fib_table_select_default(struct fib
struct fib_result *res)
{
struct trie *t = (struct trie *) tb->tb_data;
@@ -865,7 +868,7 @@
if (!fa_head)
goto out;
-@@ -1843,39 +1852,52 @@ void fib_table_select_default(struct fib
+@@ -1848,39 +1857,52 @@ void fib_table_select_default(struct fib
fa->fa_type != RTN_UNICAST)
continue;
@@ -932,9 +935,9 @@
out:
rcu_read_unlock();
}
-diff -urp v2.6.33/linux/net/ipv4/netfilter/ipt_MASQUERADE.c
linux/net/ipv4/netfilter/ipt_MASQUERADE.c
---- v2.6.33/linux/net/ipv4/netfilter/ipt_MASQUERADE.c 2010-02-25
09:01:36.000000000 +0200
-+++ linux/net/ipv4/netfilter/ipt_MASQUERADE.c 2010-02-25 11:11:52.000000000
+0200
+diff -urp v2.6.34/linux/net/ipv4/netfilter/ipt_MASQUERADE.c
linux/net/ipv4/netfilter/ipt_MASQUERADE.c
+--- v2.6.34/linux/net/ipv4/netfilter/ipt_MASQUERADE.c 2010-02-25
09:01:36.000000000 +0200
++++ linux/net/ipv4/netfilter/ipt_MASQUERADE.c 2010-05-18 09:58:49.000000000
+0300
@@ -51,7 +51,7 @@ masquerade_tg(struct sk_buff *skb, const
enum ip_conntrack_info ctinfo;
struct nf_nat_range newrange;
@@ -978,10 +981,10 @@
nat->masq_index = par->out->ifindex;
/* Transfer from original range. */
-diff -urp v2.6.33/linux/net/ipv4/netfilter/nf_nat_core.c
linux/net/ipv4/netfilter/nf_nat_core.c
---- v2.6.33/linux/net/ipv4/netfilter/nf_nat_core.c 2010-02-25
09:01:36.000000000 +0200
-+++ linux/net/ipv4/netfilter/nf_nat_core.c 2010-02-25 11:11:52.000000000
+0200
-@@ -710,6 +710,52 @@ static struct pernet_operations nf_nat_n
+diff -urp v2.6.34/linux/net/ipv4/netfilter/nf_nat_core.c
linux/net/ipv4/netfilter/nf_nat_core.c
+--- v2.6.34/linux/net/ipv4/netfilter/nf_nat_core.c 2010-05-17
10:49:01.000000000 +0300
++++ linux/net/ipv4/netfilter/nf_nat_core.c 2010-05-18 09:58:49.000000000
+0300
+@@ -715,6 +715,52 @@ static struct pernet_operations nf_nat_n
.exit = nf_nat_net_exit,
};
@@ -1034,10 +1037,10 @@
static int __init nf_nat_init(void)
{
size_t i;
-diff -urp v2.6.33/linux/net/ipv4/netfilter/nf_nat_standalone.c
linux/net/ipv4/netfilter/nf_nat_standalone.c
---- v2.6.33/linux/net/ipv4/netfilter/nf_nat_standalone.c 2010-02-25
09:01:36.000000000 +0200
-+++ linux/net/ipv4/netfilter/nf_nat_standalone.c 2010-02-25
11:11:52.000000000 +0200
-@@ -255,6 +255,14 @@ static struct nf_hook_ops nf_nat_ops[] _
+diff -urp v2.6.34/linux/net/ipv4/netfilter/nf_nat_standalone.c
linux/net/ipv4/netfilter/nf_nat_standalone.c
+--- v2.6.34/linux/net/ipv4/netfilter/nf_nat_standalone.c 2010-05-17
10:49:01.000000000 +0300
++++ linux/net/ipv4/netfilter/nf_nat_standalone.c 2010-05-18
09:58:49.000000000 +0300
+@@ -256,6 +256,14 @@ static struct nf_hook_ops nf_nat_ops[] _
.hooknum = NF_INET_PRE_ROUTING,
.priority = NF_IP_PRI_NAT_DST,
},
@@ -1052,9 +1055,9 @@
/* After packet filtering, change source */
{
.hook = nf_nat_out,
-diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
---- v2.6.33/linux/net/ipv4/route.c 2010-02-25 09:01:36.000000000 +0200
-+++ linux/net/ipv4/route.c 2010-02-25 11:11:52.000000000 +0200
+diff -urp v2.6.34/linux/net/ipv4/route.c linux/net/ipv4/route.c
+--- v2.6.34/linux/net/ipv4/route.c 2010-05-17 10:49:01.000000000 +0300
++++ linux/net/ipv4/route.c 2010-05-18 09:58:49.000000000 +0300
@@ -695,6 +695,8 @@ static inline int compare_keys(struct fl
return ((__force u32)((fl1->nl_u.ip4_u.daddr ^ fl2->nl_u.ip4_u.daddr) |
(fl1->nl_u.ip4_u.saddr ^ fl2->nl_u.ip4_u.saddr)) |
@@ -1064,7 +1067,7 @@
(*(u16 *)&fl1->nl_u.ip4_u.tos ^
*(u16 *)&fl2->nl_u.ip4_u.tos) |
(fl1->oif ^ fl2->oif) |
-@@ -1430,6 +1432,7 @@ void ip_rt_redirect(__be32 old_gw, __be3
+@@ -1460,6 +1462,7 @@ void ip_rt_redirect(__be32 old_gw, __be3
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-routes.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.785&r2=1.786&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
