usagi/kernel/linux25/net/ipv6 addrconf.c af_inet6.c ah6.c esp6.c exthdrs.c icmp.c ip6_fib.c ip6_output.c ipv6_sockglue.c ipv6_syms.c ndisc.c route.c tcp_ipv6.c udp.c xfrm6_input.c

miyazawa    2003/05/09 12:51:13 JST

  Modified files:
    kernel/linux25/net/ipv6 addrconf.c af_inet6.c ah6.c esp6.c 
                            exthdrs.c icmp.c ip6_fib.c 
                            ip6_output.c ipv6_sockglue.c 
                            ipv6_syms.c ndisc.c route.c tcp_ipv6.c 
                            udp.c xfrm6_input.c 
  Log:
  sync with linux-2.5.69; conflicts resolved
  
  Revision  Changes    Path
  1.23      +47 -34    usagi/kernel/linux25/net/ipv6/addrconf.c
  1.11      +56 -60    usagi/kernel/linux25/net/ipv6/af_inet6.c
  1.9       +2 -3      usagi/kernel/linux25/net/ipv6/ah6.c
  1.11      +2 -4      usagi/kernel/linux25/net/ipv6/esp6.c
  1.23      +2 -2      usagi/kernel/linux25/net/ipv6/exthdrs.c
  1.31      +26 -10    usagi/kernel/linux25/net/ipv6/icmp.c
  1.5       +2 -2      usagi/kernel/linux25/net/ipv6/ip6_fib.c
  1.26      +1 -1      usagi/kernel/linux25/net/ipv6/ip6_output.c
  1.6       +10 -2     usagi/kernel/linux25/net/ipv6/ipv6_sockglue.c
  1.12      +1 -0      usagi/kernel/linux25/net/ipv6/ipv6_syms.c
  1.13      +30 -10    usagi/kernel/linux25/net/ipv6/ndisc.c
  1.16      +7 -0      usagi/kernel/linux25/net/ipv6/route.c
  1.15      +8 -10     usagi/kernel/linux25/net/ipv6/tcp_ipv6.c
  1.26      +1 -1      usagi/kernel/linux25/net/ipv6/udp.c
  1.9       +1 -1      usagi/kernel/linux25/net/ipv6/xfrm6_input.c