Author: arekm Date: Thu Feb 25 23:09:45 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- update patches
---- Files affected:
packages/kernel:
kernel-multiarch.config (1.34 -> 1.35) , kernel-routes.patch (1.7 -> 1.8) ,
kernel-squashfs-lzma.patch (1.1 -> 1.2) , kernel-unionfs.patch (1.6 -> 1.7) ,
kernel.spec (1.757 -> 1.758)
---- Diffs:
================================================================
Index: packages/kernel/kernel-multiarch.config
diff -u packages/kernel/kernel-multiarch.config:1.34
packages/kernel/kernel-multiarch.config:1.35
--- packages/kernel/kernel-multiarch.config:1.34 Sun Dec 6 01:58:53 2009
+++ packages/kernel/kernel-multiarch.config Fri Feb 26 00:09:39 2010
@@ -15,6 +15,8 @@
IOSCHED_AS all=y
IOSCHED_DEADLINE all=y
IOSCHED_CFQ all=y
+CFQ_GROUP_IOSCHED all=y
+# DEBUG_CFQ_IOSCHED is not set
DEFAULT_AS all=n
DEFAULT_DEADLINE all=n
DEFAULT_CFQ all=y
@@ -5103,6 +5105,7 @@
KERNEL_GZIP all=n
KERNEL_BZIP2 all=n
KERNEL_LZMA all=y
+KERNEL_LZO all=n
SWAP all=y
SYSVIPC all=y
SYSVIPC_SYSCTL all=y
@@ -5665,6 +5668,7 @@
INET6_XFRM_MODE_BEET all=m
INET6_XFRM_MODE_ROUTEOPTIMIZATION all=m
IPV6_SIT all=m
+IPV6_SIT_6RD all=y
IPV6_TUNNEL all=m
IPV6_MULTIPLE_TABLES all=y
IPV6_SUBTREES all=y
================================================================
Index: packages/kernel/kernel-routes.patch
diff -u packages/kernel/kernel-routes.patch:1.7
packages/kernel/kernel-routes.patch:1.8
--- packages/kernel/kernel-routes.patch:1.7 Thu Sep 10 22:31:37 2009
+++ packages/kernel/kernel-routes.patch Fri Feb 26 00:09:40 2010
@@ -1,7 +1,7 @@
-diff -urp v2.6.28/linux/include/linux/rtnetlink.h
linux/include/linux/rtnetlink.h
---- v2.6.28/linux/include/linux/rtnetlink.h 2008-12-25 10:12:24.000000000
+0200
-+++ linux/include/linux/rtnetlink.h 2009-02-06 09:43:23.000000000 +0200
-@@ -304,6 +304,8 @@ struct rtnexthop
+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
+@@ -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 */
#define RTNH_F_ONLINK 4 /* Gateway is forced on link */
@@ -10,9 +10,9 @@
/* Macros to handle hexthops */
-diff -urp v2.6.28/linux/include/net/flow.h linux/include/net/flow.h
---- v2.6.28/linux/include/net/flow.h 2008-12-25 10:12:24.000000000 +0200
-+++ linux/include/net/flow.h 2009-02-06 09:43:23.000000000 +0200
+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
@@ -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.28/linux/include/net/ip_fib.h linux/include/net/ip_fib.h
---- v2.6.28/linux/include/net/ip_fib.h 2008-04-17 09:58:08.000000000 +0300
-+++ linux/include/net/ip_fib.h 2009-02-06 09:43:23.000000000 +0200
+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
@@ -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);
@@ -43,17 +43,17 @@
#endif /* CONFIG_IP_MULTIPLE_TABLES */
/* Exported by fib_frontend.c */
-@@ -276,4 +278,6 @@ static inline void fib_proc_exit(struct
+@@ -277,4 +279,6 @@ static inline void fib_proc_exit(struct
}
#endif
+extern rwlock_t fib_nhflags_lock;
+
#endif /* _NET_FIB_H */
-diff -urp v2.6.28/linux/include/net/netfilter/nf_nat.h
linux/include/net/netfilter/nf_nat.h
---- v2.6.28/linux/include/net/netfilter/nf_nat.h 2008-04-17
09:58:08.000000000 +0300
-+++ linux/include/net/netfilter/nf_nat.h 2009-02-06 09:43:23.000000000
+0200
-@@ -77,6 +77,13 @@ struct nf_conn_nat
+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
+@@ -73,6 +73,13 @@ struct nf_conn_nat {
#endif
};
@@ -67,10 +67,10 @@
/* 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.28/linux/include/net/route.h linux/include/net/route.h
---- v2.6.28/linux/include/net/route.h 2008-12-25 10:12:24.000000000 +0200
-+++ linux/include/net/route.h 2009-02-06 09:43:23.000000000 +0200
-@@ -116,6 +116,7 @@ extern int __ip_route_output_key(struct
+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
+@@ -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);
extern int ip_route_input(struct sk_buff*, __be32 dst, __be32 src,
u8 tos, struct net_device *devin);
@@ -78,24 +78,23 @@
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.28/linux/net/bridge/br_netfilter.c
linux/net/bridge/br_netfilter.c
---- v2.6.28/linux/net/bridge/br_netfilter.c 2008-12-25 10:12:25.000000000
+0200
-+++ linux/net/bridge/br_netfilter.c 2009-02-06 09:43:23.000000000 +0200
-@@ -341,6 +341,10 @@ static int br_nf_pre_routing_finish(stru
- struct nf_bridge_info *nf_bridge = skb->nf_bridge;
+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
+ struct rtable *rt;
int err;
+ /* Old skb->dst is not expected, it is lost in all cases */
+ skb_dst_drop(skb);
+
-+
if (nf_bridge->mask & BRNF_PKT_TYPE) {
skb->pkt_type = PACKET_OTHERHOST;
nf_bridge->mask ^= BRNF_PKT_TYPE;
-diff -urp v2.6.28/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
---- v2.6.28/linux/net/ipv4/fib_frontend.c 2008-10-11 12:46:16.000000000
+0300
-+++ linux/net/ipv4/fib_frontend.c 2009-02-06 09:43:23.000000000 +0200
-@@ -47,6 +47,8 @@
+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 @@
#ifndef CONFIG_IP_MULTIPLE_TABLES
@@ -104,7 +103,7 @@
static int __net_init fib4_rules_init(struct net *net)
{
struct fib_table *local_table, *main_table;
-@@ -71,6 +73,8 @@ fail:
+@@ -70,6 +72,8 @@ fail:
}
#else
@@ -113,28 +112,28 @@
struct fib_table *fib_new_table(struct net *net, u32 id)
{
struct fib_table *tb;
-@@ -125,7 +129,8 @@ void fib_select_default(struct net *net,
+@@ -124,7 +128,8 @@ void fib_select_default(struct net *net,
table = res->r->table;
#endif
tb = fib_get_table(net, table);
- if (FIB_RES_GW(*res) && FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK)
+ if ((FIB_RES_GW(*res) && FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK) ||
+ FIB_RES_NH(*res).nh_scope == RT_SCOPE_HOST)
- tb->tb_select_default(tb, flp, res);
+ fib_table_select_default(tb, flp, res);
}
-@@ -239,6 +244,9 @@ int fib_validate_source(__be32 src, __be
- .tos = tos } },
+@@ -241,6 +246,9 @@ int fib_validate_source(__be32 src, __be
.iif = oif };
+
struct fib_result res;
+ int table;
+ unsigned char prefixlen;
+ unsigned char scope;
- int no_addr, rpf;
+ int no_addr, rpf, accept_local;
int ret;
struct net *net;
-@@ -262,31 +270,35 @@ int fib_validate_source(__be32 src, __be
- goto e_inval_res;
+@@ -269,31 +277,35 @@ int fib_validate_source(__be32 src, __be
+ }
*spec_dst = FIB_RES_PREFSRC(res);
fib_combine_itag(itag, &res);
-#ifdef CONFIG_IP_ROUTE_MULTIPATH
@@ -171,12 +170,12 @@
}
fib_res_put(&res);
}
-+ if (rpf)
++ if (rpf == 1)
+ goto e_inval;
return ret;
last_resort:
-@@ -909,9 +921,7 @@ static int fib_inetaddr_event(struct not
+@@ -916,9 +928,7 @@ static int fib_inetaddr_event(struct not
switch (event) {
case NETDEV_UP:
fib_add_ifaddr(ifa);
@@ -186,7 +185,7 @@
rt_cache_flush(dev_net(dev), -1);
break;
case NETDEV_DOWN:
-@@ -947,9 +957,7 @@ static int fib_netdev_event(struct notif
+@@ -954,9 +964,7 @@ static int fib_netdev_event(struct notif
for_ifa(in_dev) {
fib_add_ifaddr(ifa);
} endfor_ifa(in_dev);
@@ -196,12 +195,12 @@
rt_cache_flush(dev_net(dev), -1);
break;
case NETDEV_DOWN:
-diff -urp v2.6.28/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
---- v2.6.28/linux/net/ipv4/fib_hash.c 2008-10-11 12:46:16.000000000 +0300
-+++ linux/net/ipv4/fib_hash.c 2009-02-06 09:43:23.000000000 +0200
-@@ -278,25 +278,35 @@ out:
- static void
- fn_hash_select_default(struct fib_table *tb, const struct flowi *flp, struct
fib_result *res)
+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:
+ void fib_table_select_default(struct fib_table *tb,
+ const struct flowi *flp, struct fib_result *res)
{
- int order, last_idx;
+ int order, last_idx, last_dflt, last_nhsel;
@@ -238,7 +237,7 @@
list_for_each_entry(fa, &f->fn_alias, fa_list) {
struct fib_info *next_fi = fa->fa_info;
-@@ -304,42 +314,56 @@ fn_hash_select_default(struct fib_table
+@@ -303,42 +313,56 @@ void fib_table_select_default(struct fib
fa->fa_type != RTN_UNICAST)
continue;
@@ -309,7 +308,7 @@
out:
read_unlock(&fib_hash_lock);
}
-@@ -463,6 +487,7 @@ static int fn_hash_insert(struct fib_tab
+@@ -462,6 +486,7 @@ int fib_table_insert(struct fib_table *t
write_lock_bh(&fib_hash_lock);
fi_drop = fa->fa_info;
fa->fa_info = fi;
@@ -317,7 +316,7 @@
fa->fa_type = cfg->fc_type;
fa->fa_scope = cfg->fc_scope;
state = fa->fa_state;
-@@ -517,6 +542,7 @@ static int fn_hash_insert(struct fib_tab
+@@ -516,6 +541,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;
@@ -325,9 +324,9 @@
/*
* Insert new entry to the list.
-diff -urp v2.6.28/linux/net/ipv4/fib_lookup.h linux/net/ipv4/fib_lookup.h
---- v2.6.28/linux/net/ipv4/fib_lookup.h 2008-04-17 09:58:09.000000000
+0300
-+++ linux/net/ipv4/fib_lookup.h 2009-02-06 09:43:23.000000000 +0200
+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
@@ -8,6 +8,7 @@
struct fib_alias {
struct list_head fa_list;
@@ -336,7 +335,7 @@
u8 fa_tos;
u8 fa_type;
u8 fa_scope;
-@@ -38,7 +39,8 @@ extern struct fib_alias *fib_find_alias(
+@@ -37,7 +38,8 @@ extern struct fib_alias *fib_find_alias(
u8 tos, u32 prio);
extern int fib_detect_death(struct fib_info *fi, int order,
struct fib_info **last_resort,
@@ -346,9 +345,9 @@
static inline void fib_result_assign(struct fib_result *res,
struct fib_info *fi)
-diff -urp v2.6.28/linux/net/ipv4/fib_rules.c linux/net/ipv4/fib_rules.c
---- v2.6.28/linux/net/ipv4/fib_rules.c 2008-10-11 12:46:16.000000000 +0300
-+++ linux/net/ipv4/fib_rules.c 2009-02-06 09:43:23.000000000 +0200
+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
@@ -54,6 +54,11 @@ u32 fib_rules_tclass(struct fib_result *
}
#endif
@@ -361,9 +360,9 @@
int fib_lookup(struct net *net, struct flowi *flp, struct fib_result *res)
{
struct fib_lookup_arg arg = {
-diff -urp v2.6.28/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
---- v2.6.28/linux/net/ipv4/fib_semantics.c 2008-10-11 12:46:16.000000000
+0300
-+++ linux/net/ipv4/fib_semantics.c 2009-02-06 09:43:23.000000000 +0200
+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;
static struct hlist_head *fib_info_laddrhash;
static unsigned int fib_hash_size;
@@ -390,7 +389,7 @@
(nfi->fib_nhs == 0 || nh_comp(fi, nfi) == 0))
return fi;
}
-@@ -348,26 +349,70 @@ struct fib_alias *fib_find_alias(struct
+@@ -349,26 +350,70 @@ struct fib_alias *fib_find_alias(struct
}
int fib_detect_death(struct fib_info *fi, int order,
@@ -445,7 +444,7 @@
+ state = n->nud_state;
+ neigh_release(n);
+ }
-+ if (state == NUD_REACHABLE ||
++ if (state==NUD_REACHABLE ||
+ ((state&NUD_VALID) && order != *dflt)) {
+ dead = 0;
+ goto setfl;
@@ -477,7 +476,7 @@
}
#ifdef CONFIG_IP_ROUTE_MULTIPATH
-@@ -539,8 +584,11 @@ static int fib_check_nh(struct fib_confi
+@@ -540,8 +585,11 @@ static int fib_check_nh(struct fib_confi
return -EINVAL;
if ((dev = __dev_get_by_index(net, nh->nh_oif)) == NULL)
return -ENODEV;
@@ -491,7 +490,7 @@
nh->nh_dev = dev;
dev_hold(dev);
nh->nh_scope = RT_SCOPE_LINK;
-@@ -560,24 +608,48 @@ static int fib_check_nh(struct fib_confi
+@@ -561,24 +609,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;
@@ -556,7 +555,7 @@
} else {
struct in_device *in_dev;
-@@ -588,8 +660,11 @@ out:
+@@ -589,8 +661,11 @@ out:
if (in_dev == NULL)
return -ENODEV;
if (!(in_dev->dev->flags&IFF_UP)) {
@@ -812,10 +811,10 @@
spin_unlock_bh(&fib_multipath_lock);
}
#endif
-diff -urp v2.6.28/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
---- v2.6.28/linux/net/ipv4/fib_trie.c 2008-10-11 12:46:16.000000000 +0300
-+++ linux/net/ipv4/fib_trie.c 2009-02-06 09:43:23.000000000 +0200
-@@ -1261,6 +1261,7 @@ static int fn_trie_insert(struct fib_tab
+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
fi_drop = fa->fa_info;
new_fa->fa_tos = fa->fa_tos;
new_fa->fa_info = fi;
@@ -823,7 +822,7 @@
new_fa->fa_type = cfg->fc_type;
new_fa->fa_scope = cfg->fc_scope;
state = fa->fa_state;
-@@ -1301,6 +1302,7 @@ static int fn_trie_insert(struct fib_tab
+@@ -1312,6 +1313,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;
@@ -831,8 +830,8 @@
/*
* Insert new entry to the list.
*/
-@@ -1802,24 +1804,31 @@ static void fn_trie_select_default(struc
- struct fib_result *res)
+@@ -1812,24 +1814,31 @@ void fib_table_select_default(struct fib
+ struct fib_result *res)
{
struct trie *t = (struct trie *) tb->tb_data;
- int order, last_idx;
@@ -866,7 +865,7 @@
if (!fa_head)
goto out;
-@@ -1833,39 +1842,52 @@ static void fn_trie_select_default(struc
+@@ -1843,39 +1852,52 @@ void fib_table_select_default(struct fib
fa->fa_type != RTN_UNICAST)
continue;
@@ -933,10 +932,10 @@
out:
rcu_read_unlock();
}
-diff -urp v2.6.28/linux/net/ipv4/netfilter/ipt_MASQUERADE.c
linux/net/ipv4/netfilter/ipt_MASQUERADE.c
---- v2.6.28/linux/net/ipv4/netfilter/ipt_MASQUERADE.c 2008-12-25
10:12:25.000000000 +0200
-+++ linux/net/ipv4/netfilter/ipt_MASQUERADE.c 2009-02-06 09:43:23.000000000
+0200
-@@ -54,7 +54,7 @@ masquerade_tg(struct sk_buff *skb, const
+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
+@@ -51,7 +51,7 @@ masquerade_tg(struct sk_buff *skb, const
enum ip_conntrack_info ctinfo;
struct nf_nat_range newrange;
const struct nf_nat_multi_range_compat *mr;
@@ -945,7 +944,7 @@
__be32 newsrc;
NF_CT_ASSERT(par->hooknum == NF_INET_POST_ROUTING);
-@@ -69,13 +69,27 @@ masquerade_tg(struct sk_buff *skb, const
+@@ -69,13 +69,28 @@ masquerade_tg(struct sk_buff *skb, const
return NF_ACCEPT;
mr = par->targinfo;
@@ -954,20 +953,21 @@
- if (!newsrc) {
- printk("MASQUERADE: %s ate my IP address\n", par->out->name);
- return NF_DROP;
++
+ {
+ struct flowi fl = { .nl_u = { .ip4_u =
-+ { .daddr = ip_hdr(skb)->daddr,
-+ .tos = (RT_TOS(ip_hdr(skb)->tos) |
-+ RTO_CONN),
-+ .gw = skb_rtable(skb)->rt_gateway,
-+ } },
-+ .mark = skb->mark,
-+ .oif = par->out->ifindex };
++ { .daddr = ip_hdr(skb)->daddr,
++ .tos =
(RT_TOS(ip_hdr(skb)->tos) |
++ RTO_CONN),
++ .gw =
skb_rtable(skb)->rt_gateway,
++ } },
++ .mark = skb->mark,
++ .oif = par->out->ifindex };
+ if (ip_route_output_key(dev_net(par->out), &rt, &fl) != 0) {
+ /* Funky routing can do this. */
+ if (net_ratelimit())
+ printk("MASQUERADE:"
-+ " No route: Rusty's brain
broke!\n");
++ " No route: Rusty's brain broke!\n");
+ return NF_DROP;
+ }
}
@@ -978,9 +978,9 @@
nat->masq_index = par->out->ifindex;
/* Transfer from original range. */
-diff -urp v2.6.28/linux/net/ipv4/netfilter/nf_nat_core.c
linux/net/ipv4/netfilter/nf_nat_core.c
---- v2.6.28/linux/net/ipv4/netfilter/nf_nat_core.c 2008-12-25
10:12:25.000000000 +0200
-+++ linux/net/ipv4/netfilter/nf_nat_core.c 2009-02-06 09:43:23.000000000
+0200
+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
.exit = nf_nat_net_exit,
};
@@ -1034,10 +1034,10 @@
static int __init nf_nat_init(void)
{
size_t i;
-diff -urp v2.6.28/linux/net/ipv4/netfilter/nf_nat_standalone.c
linux/net/ipv4/netfilter/nf_nat_standalone.c
---- v2.6.28/linux/net/ipv4/netfilter/nf_nat_standalone.c 2008-07-14
09:58:50.000000000 +0300
-+++ linux/net/ipv4/netfilter/nf_nat_standalone.c 2009-02-06
09:43:23.000000000 +0200
-@@ -256,6 +256,14 @@ static struct nf_hook_ops nf_nat_ops[] _
+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[] _
.hooknum = NF_INET_PRE_ROUTING,
.priority = NF_IP_PRI_NAT_DST,
},
@@ -1045,25 +1045,26 @@
+ {
+ .hook = ip_nat_route_input,
+ .owner = THIS_MODULE,
-+ .pf = PF_INET,
++ .pf = NFPROTO_IPV4,
+ .hooknum = NF_INET_PRE_ROUTING,
+ .priority = NF_IP_PRI_LAST-1,
+ },
/* After packet filtering, change source */
{
.hook = nf_nat_out,
-diff -urp v2.6.28/linux/net/ipv4/route.c linux/net/ipv4/route.c
---- v2.6.28/linux/net/ipv4/route.c 2008-12-25 10:12:25.000000000 +0200
-+++ linux/net/ipv4/route.c 2009-02-06 09:43:43.000000000 +0200
-@@ -679,6 +679,7 @@ static inline int compare_keys(struct fl
+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
+@@ -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)) |
(fl1->mark ^ fl2->mark) |
+ ((__force u32)(fl1->nl_u.ip4_u.lsrc ^ fl2->nl_u.ip4_u.lsrc)) |
++ ((__force u32)(fl1->nl_u.ip4_u.gw ^ fl2->nl_u.ip4_u.gw)) |
(*(u16 *)&fl1->nl_u.ip4_u.tos ^
*(u16 *)&fl2->nl_u.ip4_u.tos) |
(fl1->oif ^ fl2->oif) |
-@@ -1286,6 +1287,7 @@ void ip_rt_redirect(__be32 old_gw, __be3
+@@ -1430,6 +1432,7 @@ void ip_rt_redirect(__be32 old_gw, __be3
/* Gateway is different ... */
rt->rt_gateway = new_gw;
@@ -1071,7 +1072,7 @@
/* Redirect received -> path was valid */
dst_confirm(&rth->u.dst);
-@@ -1735,6 +1737,7 @@ static int ip_route_input_mc(struct sk_b
+@@ -1875,6 +1878,7 @@ static int ip_route_input_mc(struct sk_b
rth->fl.fl4_tos = tos;
rth->fl.mark = skb->mark;
rth->fl.fl4_src = saddr;
@@ -1079,7 +1080,7 @@
rth->rt_src = saddr;
#ifdef CONFIG_NET_CLS_ROUTE
rth->u.dst.tclassid = itag;
-@@ -1745,6 +1748,7 @@ static int ip_route_input_mc(struct sk_b
+@@ -1885,6 +1889,7 @@ static int ip_route_input_mc(struct sk_b
dev_hold(rth->u.dst.dev);
rth->idev = in_dev_get(rth->u.dst.dev);
rth->fl.oif = 0;
@@ -1087,7 +1088,7 @@
rth->rt_gateway = daddr;
rth->rt_spec_dst= spec_dst;
rth->rt_genid = rt_genid(dev_net(dev));
-@@ -1810,7 +1814,7 @@ static int __mkroute_input(struct sk_buf
+@@ -1949,7 +1954,7 @@ static int __mkroute_input(struct sk_buf
struct fib_result *res,
struct in_device *in_dev,
__be32 daddr, __be32 saddr, u32 tos,
@@ -1096,7 +1097,7 @@
{
struct rtable *rth;
-@@ -1844,6 +1848,7 @@ static int __mkroute_input(struct sk_buf
+@@ -1983,6 +1988,7 @@ static int __mkroute_input(struct sk_buf
flags |= RTCF_DIRECTSRC;
if (out_dev == in_dev && err &&
@@ -1104,7 +1105,7 @@
(IN_DEV_SHARED_MEDIA(out_dev) ||
inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res))))
flags |= RTCF_DOREDIRECT;
-@@ -1877,6 +1882,7 @@ static int __mkroute_input(struct sk_buf
+@@ -2016,6 +2022,7 @@ static int __mkroute_input(struct sk_buf
rth->fl.mark = skb->mark;
rth->fl.fl4_src = saddr;
rth->rt_src = saddr;
@@ -1112,7 +1113,7 @@
rth->rt_gateway = daddr;
rth->rt_iif =
rth->fl.iif = in_dev->dev->ifindex;
-@@ -1884,6 +1890,7 @@ static int __mkroute_input(struct sk_buf
+@@ -2023,6 +2030,7 @@ static int __mkroute_input(struct sk_buf
dev_hold(rth->u.dst.dev);
rth->idev = in_dev_get(rth->u.dst.dev);
rth->fl.oif = 0;
@@ -1120,7 +1121,7 @@
rth->rt_spec_dst= spec_dst;
rth->u.dst.input = ip_forward;
-@@ -1904,21 +1911,23 @@ static int __mkroute_input(struct sk_buf
+@@ -2043,21 +2051,23 @@ static int __mkroute_input(struct sk_buf
static int ip_mkroute_input(struct sk_buff *skb,
struct fib_result *res,
@@ -1147,7 +1148,7 @@
if (err)
return err;
-@@ -1939,18 +1948,19 @@ static int ip_mkroute_input(struct sk_bu
+@@ -2078,18 +2088,19 @@ static int ip_mkroute_input(struct sk_bu
*/
static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32
saddr,
@@ -1170,7 +1171,7 @@
unsigned flags = 0;
u32 itag = 0;
struct rtable * rth;
-@@ -1986,6 +1996,12 @@ static int ip_route_input_slow(struct sk
+@@ -2125,6 +2136,12 @@ static int ip_route_input_slow(struct sk
ipv4_is_loopback(daddr))
goto martian_destination;
@@ -1183,7 +1184,7 @@
/*
* Now we are ready to route packet.
*/
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.34&r2=1.35&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-routes.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-squashfs-lzma.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-unionfs.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.757&r2=1.758&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
