Contents of /trunk/kernel26-magellan/patches-2.6.21-r1/0100-2.6.21.1-all-fixes.patch
Parent Directory
| 
Revision Log
Revision 196 -
(show annotations)
(download)
Thu May 17 23:20:52 2007 UTC (16 years, 11 months ago) by niro
File size: 765 byte(s)
Thu May 17 23:20:52 2007 UTC (16 years, 11 months ago) by niro
File size: 765 byte(s)
-ver bump to 2.6.21-r1 using: -linux-2.6.21.1 -2.6.21-ck2 patchset -fbsplash-0.9.2-r5 -vesafb-tng-1.0-rc2 -squashfs-3.2-r2 -unionfs-2.0-u2 -suspend2-2.2.9.17 -linux-phc-0.2.10 -acpi-dsdt-0.8.4 -fuse-2.6.5 -reiser4-mm -nvidia-drivers-1.0.9755 -ati-drivers-8.36.5 -ipw3945-1.2.1 - added a fix for sis900 oops on linux-2.6.21
| 1 | diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c |
| 2 | index cac06c4..444a56b 100644 |
| 3 | --- a/net/ipv4/fib_frontend.c |
| 4 | +++ b/net/ipv4/fib_frontend.c |
| 5 | @@ -777,6 +777,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 fb39604..3205ec9 100644 |
| 18 | --- a/net/ipv6/exthdrs.c |
| 19 | +++ b/net/ipv6/exthdrs.c |
| 20 | @@ -396,6 +396,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: |