[Openswan Users] Kernel 2.6.18 NAT-T patch

[Giovani Moda - MR Informática]

Hello again,

I'm trying to patch a 2.6.18.6rc2 kernel (fedora core 6) with NAT-T patch, 
and getting a failure on Hunk 4.

I noticed a change in udp.c

        /* if we're overly short, let UDP handle it */
        len = skb->len - sizeof(struct udphdr);
        if (len <= 0)
                return 1;

where the patch is expecting:

        /* if we're overly short, let UDP handle it */
        if (udpdata > skb->tail)
-               return 1;
+               return 2;

If I just change the patch to

        /* if we're overly short, let UDP handle it */
        len = skb->len - sizeof(struct udphdr);
        if (len <= 0)
-               return 1;
+               return 2;

will it work?

Thanks,

Giovani