[ Ola, this is about applying the patch in lenny kernel-patch-openvz to the etch's linux-2.6 ]

On Sat, Mar 15, 2008 at 03:53:21PM +0300, Vitaliy Gusev wrote:
> Patch kernel-patch-openvz_028.18.1 is too old. This patch conforms
> with OpenVZ-028stab018.1 version.
> 
> I see kernel-patch-openvz_028.51.3d2.tar.gz (that conforms with OpenVZ-028stab051.3)
> in this repository. Can you try to use this openvz_028.51.3 patch?

Unfortunately that one does not apply. If I'm reading the .rej file
correctly, it's because the following chunk against net/ipv6/exthdrs.c seems to
be missing the line which is shown as line 236 in
http://git.openvz.org/?p=linux-2.6.18-openvz;a=blame;f=net/ipv6/exthdrs.c;h=38fdd5f4b1c800181b3aea3b47910aadbb1c646e;hb=HEAD

I mean: the line "hdr = (struct ipv6_rt_hdr *) skb->h.raw;" is in debian
kernel source tree, but the following chunk of the 028.51.3d2 patch does
not expect it (there is just an empty line between the switch and preceding
block).

Ola, any ideas what's going on? Is it supposed to apply at all?


| @@ -255,6 +255,20 @@ static int ipv6_rthdr_rcv(struct sk_buff
|                 return -1;
|         }
| 
| +       switch (hdr->type) {
| +       case IPV6_SRCRT_TYPE_0:
| +               /* Completely disallow routing header type 0 for now, it can be
| +                * made conditional at a later point if needed. Even though the
| +                * code is non functional at the moment, it is left intact to
| +                * allow backporting Mobile IPv6 later on. */
| +               kfree_skb(skb);
| +               return -1;
| +       default:
| +               IP6_INC_STATS_BH(IPSTATS_MIB_INHDRERRORS);
| +               icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, (&hdr->type) - skb->nh.raw);
| +               return -1;
| +       }
| +
|         if (ipv6_addr_is_multicast(&skb->nh.ipv6h->daddr) ||
|             skb->pkt_type != PACKET_HOST) {
|                 IP6_INC_STATS_BH(IPSTATS_MIB_INADDRERRORS);


-- 
Marcin Owsiany <marcin@owsiany.pl>              http://marcin.owsiany.pl/
GnuPG: 1024D/60F41216  FE67 DA2D 0ACA FC5E 3F75  D6F6 3A0D 8AA0 60F4 1216
 
"Every program in development at MIT expands until it can read mail."
                                                              -- Unknown