Re: [mpls-linux-devel] linux-kernel-2.6.14

[Bob B. <bob...@gm...>]

On 11/10/05, James R. Leu <jl...@mi...> wrote:
> My development tree is currently patched against 2.6.13 so getting
> mpls-linux to work on a 2.6.11 (and beyond) kernel is possible.
>
>
I got your development tree as of 20051121, and applied
 patch-2.6.15-rc1-rc2 since I noticed you were at -rc1.

But I get a compile error:

  CC [M]  net/ipv4/mpls4.o
net/ipv4/mpls4.c: In function `mpls4_local_deliver':
net/ipv4/mpls4.c:298: error: too few arguments to function `ip_rcv'
make[2]: *** [net/ipv4/mpls4.o] Error 1
make[1]: *** [net/ipv4] Error 2
make: *** [net] Error 2

and, of course it's true: ip_rvc() expects 4 arguments.
net/ipv4/ip_input.c:
     int ip_rcv(struct sk_buff *skb,
                    struct net_device *dev,
                    struct packet_type *pt,
                    struct net_device *orig_dev)

but mpls4_local_deliver() provides only 3:
net/ipv4/mpls4.c:
       return ip_rcv(skb, skb->dev, NULL);

Should I go just drop back to the 1.946 tarball and apply to say, 2.6.10?
What is likely to get me to a working MPLS enabled 2.6.x kernel most quickl=
y?

Thanks,

-Bob