[mpls-linux-general] MPLS-1.0.diff

[nomit k. <nom...@in...>]

Hello

I tried to patch from the latest diff file mpls-1.0.diff on a linux
2.4.5 kernel. It was not a sucessful patch any pointers what to do next
( or it will be there in next version of diff for 2.4.5 ).


with regards=20

Nomit

An optimist is a man who looks forward to marriage.
A pessimist is a married optimist.


Output from command $patch -p1 <
../mpls-linux-0.990/kernel/mpls-1.0.diff

patching file drivers/net/ppp_generic.c
Hunk #1 succeeded at 55 (offset 1 line).
Hunk #2 succeeded at 254 (offset 4 lines).
Hunk #3 succeeded at 265 (offset 1 line).
Hunk #4 succeeded at 286 (offset 4 lines).
Hunk #5 succeeded at 297 (offset 1 line).
patching file include/linux/atmdev.h
patching file include/linux/if_arp.h
Hunk #1 succeeded at 79 (offset 2 lines).
patching file include/linux/if_ether.h
Hunk #1 succeeded at 60 (offset 2 lines).
patching file include/linux/mpls.h
patching file include/linux/netdevice.h
Hunk #1 succeeded at 404 (offset 3 lines).
Hunk #2 succeeded at 659 (offset -4 lines).
patching file include/linux/ppp_defs.h
patching file include/linux/rtnetlink.h
patching file include/linux/skbuff.h
Hunk #1 succeeded at 188 with fuzz 1 (offset 68 lines).
Hunk #2 succeeded at 177 (offset 3 lines).
Hunk #3 succeeded at 1132 (offset 162 lines).
patching file include/net/dst.h
patching file include/net/fib_aux.h
patching file include/net/ip.h
patching file include/net/ip_fib.h
patching file include/net/mpls.h
patching file net/Config.in
patching file net/Makefile
patching file net/atm/atm_misc.c
patching file net/atm/common.c
patching file net/atm/proc.c
patching file net/atm/resources.c
patching file net/core/dev.c
Hunk #1 succeeded at 2211 (offset 82 lines).
Hunk #3 succeeded at 2807 (offset 82 lines).
patching file net/core/neighbour.c
patching file net/core/skbuff.c
Hunk #1 succeeded at 197 (offset 1 line).
Hunk #2 succeeded at 255 with fuzz 1 (offset 3 lines).
Hunk #3 succeeded at 417 (offset 72 lines).
Hunk #4 succeeded at 382 (offset 2 lines).
Hunk #5 succeeded at 1178 (offset 692 lines).
patching file net/ipv4/af_inet.c
Hunk #2 succeeded at 912 (offset 1 line).
patching file net/ipv4/devinet.c
Hunk #2 succeeded at 967 (offset -2 lines).
patching file net/ipv4/fib_hash.c
patching file net/ipv4/fib_rules.c
Hunk #1 succeeded at 307 (offset 18 lines).
Hunk #3 succeeded at 377 (offset 18 lines).
patching file net/ipv4/ip_output.c
patching file net/ipv4/route.c
Hunk #2 succeeded at 1147 (offset 26 lines).
Hunk #3 FAILED at 1165.
Hunk #4 succeeded at 1456 (offset 4 lines).
1 out of 4 hunks FAILED -- saving rejects to file net/ipv4/route.c.rej
patching file net/mpls/Makefile
patching file net/mpls/mpls_atm.c
patching file net/mpls/mpls_if.c
patching file net/mpls/mpls_in_info.c
patching file net/mpls/mpls_init.c
patching file net/mpls/mpls_input.c
patching file net/mpls/mpls_ioctls.c
patching file net/mpls/mpls_netlink.c
patching file net/mpls/mpls_opcode.c
patching file net/mpls/mpls_out_info.c
patching file net/mpls/mpls_output.c
patching file net/mpls/mpls_proc.c
patching file net/mpls/mpls_ref.c
patching file net/mpls/mpls_tunnel.c
patching file net/mpls/mpls_utils.c
patching file net/sched/sch_ingress