Annotation of /trunk/kernel26-alx/patches-2.6.20-r6/0110-2.6.20.10-all-fixes.patch
Parent Directory
| 
Revision Log
Revision 1175 -
(hide annotations)
(download)
Thu Oct 14 12:15:46 2010 UTC (13 years, 8 months ago) by niro
File size: 765 byte(s)
Thu Oct 14 12:15:46 2010 UTC (13 years, 8 months ago) by niro
File size: 765 byte(s)
-2.6.20-alx-r6 new magellan 0.5.2 kernel
| 1 | niro | 1175 | diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c |
| 2 | index fa2cb8c..30aae76 100644 | ||
| 3 | --- a/net/ipv4/fib_frontend.c | ||
| 4 | +++ b/net/ipv4/fib_frontend.c | ||
| 5 | @@ -773,6 +773,10 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb ) | ||
| 6 | .tos = frn->fl_tos, | ||
| 7 | .scope = frn->fl_scope } } }; | ||
| 8 | |||
| 9 | +#ifdef CONFIG_IP_MULTIPLE_TABLES | ||
| 10 | + res.r = NULL; | ||
| 11 | +#endif | ||
| 12 | + | ||
| 13 | frn->err = -ENOENT; | ||
| 14 | if (tb) { | ||
| 15 | local_bh_disable(); | ||
| 16 | diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c | ||
| 17 | index 5fd7cf9..de96e1a 100644 | ||
| 18 | --- a/net/ipv6/exthdrs.c | ||
| 19 | +++ b/net/ipv6/exthdrs.c | ||
| 20 | @@ -397,6 +397,7 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp) | ||
| 21 | |||
| 22 | switch (hdr->type) { | ||
| 23 | #ifdef CONFIG_IPV6_MIP6 | ||
| 24 | + case IPV6_SRCRT_TYPE_2: | ||
| 25 | break; | ||
| 26 | #endif | ||
| 27 | case IPV6_SRCRT_TYPE_0: |