From 87986cb7e1e25f4253ba7a6972c9c04c9a082e79 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 29 Sep 2006 18:30:05 +0100 Subject: [PATCH] --- yaml --- r: 42075 b: refs/heads/master c: 7e45b0e5f6f68d04311ba7813f5f5457c9119640 h: refs/heads/master i: 42073: 1b796846321f61629a1c2e4c479e08154284f796 42071: a213542258aff4537fcf986d4d69ba5694e4a463 v: v3 --- [refs] | 2 +- trunk/CREDITS | 3 - trunk/Documentation/00-INDEX | 2 + .../feature-removal-schedule.txt | 38 +- trunk/Documentation/ftape.txt | 307 ++ trunk/Documentation/kernel-parameters.txt | 3 + trunk/Documentation/networking/dccp.txt | 84 +- trunk/Documentation/networking/e1000.txt | 451 +- trunk/Documentation/networking/ip-sysctl.txt | 347 +- trunk/Documentation/networking/phy.txt | 13 +- trunk/Documentation/networking/udplite.txt | 281 -- trunk/Documentation/networking/xfrm_sync.txt | 5 +- trunk/Documentation/s390/CommonIO | 4 +- trunk/Documentation/s390/Debugging390.txt | 38 +- trunk/Documentation/s390/cds.txt | 12 +- .../Documentation/s390/crypto/crypto-API.txt | 6 +- trunk/Documentation/s390/s390dbf.txt | 8 +- trunk/MAINTAINERS | 19 +- trunk/arch/alpha/lib/checksum.c | 37 +- trunk/arch/alpha/lib/csum_partial_copy.c | 31 +- trunk/arch/cris/arch-v10/lib/old_checksum.c | 62 +- trunk/arch/frv/lib/checksum.c | 25 +- trunk/arch/h8300/kernel/h8300_ksyms.c | 2 +- trunk/arch/h8300/lib/checksum.c | 29 +- trunk/arch/i386/kernel/acpi/boot.c | 10 +- trunk/arch/i386/kernel/acpi/cstate.c | 1 - trunk/arch/i386/kernel/alternative.c | 1 - .../arch/i386/kernel/cpu/mcheck/therm_throt.c | 1 - trunk/arch/ia64/lib/checksum.c | 38 +- trunk/arch/ia64/lib/csum_partial_copy.c | 31 +- trunk/arch/m32r/lib/csum_partial_copy.c | 12 +- trunk/arch/m68k/lib/checksum.c | 13 +- trunk/arch/m68knommu/Kconfig | 12 +- trunk/arch/m68knommu/kernel/m68k_ksyms.c | 2 +- trunk/arch/m68knommu/kernel/process.c | 34 +- trunk/arch/m68knommu/kernel/setup.c | 3 + trunk/arch/m68knommu/kernel/sys_m68k.c | 23 +- trunk/arch/m68knommu/kernel/traps.c | 13 +- trunk/arch/m68knommu/lib/checksum.c | 28 +- trunk/arch/m68knommu/platform/5307/head.S | 20 - .../arch/m68knommu/platform/68360/head-ram.S | 3 +- trunk/arch/mips/lib/csum_partial_copy.c | 8 +- trunk/arch/parisc/lib/checksum.c | 17 +- trunk/arch/s390/Kconfig | 5 +- trunk/arch/s390/Makefile | 3 - trunk/arch/s390/kernel/Makefile | 2 +- trunk/arch/s390/kernel/cpcmd.c | 18 +- trunk/arch/s390/kernel/head.S | 21 + trunk/arch/s390/kernel/head31.S | 8 +- trunk/arch/s390/kernel/head64.S | 17 +- trunk/arch/s390/kernel/ipl.c | 185 +- trunk/arch/s390/kernel/machine_kexec.c | 78 +- trunk/arch/s390/kernel/reipl.S | 17 +- trunk/arch/s390/kernel/reipl64.S | 16 +- trunk/arch/s390/kernel/relocate_kernel.S | 5 +- trunk/arch/s390/kernel/relocate_kernel64.S | 5 +- trunk/arch/s390/kernel/reset.S | 48 - trunk/arch/s390/kernel/setup.c | 66 +- trunk/arch/s390/kernel/smp.c | 117 +- trunk/arch/s390/kernel/traps.c | 30 +- trunk/arch/s390/lib/Makefile | 2 +- trunk/arch/s390/lib/uaccess_mvcos.c | 27 +- trunk/arch/s390/lib/uaccess_pt.c | 153 - trunk/arch/s390/lib/uaccess_std.c | 67 +- trunk/arch/s390/mm/extmem.c | 38 +- trunk/arch/s390/mm/fault.c | 28 +- trunk/arch/sh/kernel/sh_ksyms.c | 1 + trunk/arch/sh64/kernel/sh_ksyms.c | 2 +- trunk/arch/sh64/lib/c-checksum.c | 49 +- trunk/arch/um/include/sysdep-i386/checksum.h | 74 +- .../arch/um/include/sysdep-x86_64/checksum.h | 47 +- trunk/arch/v850/kernel/v850_ksyms.c | 2 +- trunk/arch/v850/lib/checksum.c | 26 +- trunk/arch/x86_64/lib/csum-partial.c | 7 +- trunk/arch/x86_64/lib/csum-wrappers.c | 37 +- trunk/drivers/acpi/dock.c | 1 - trunk/drivers/ata/Kconfig | 7 + trunk/drivers/ata/Makefile | 1 + trunk/drivers/ata/pata_winbond.c | 306 ++ trunk/drivers/atm/ambassador.c | 2 +- trunk/drivers/atm/firestream.c | 2 +- trunk/drivers/base/cpu.c | 1 - trunk/drivers/char/Kconfig | 33 + trunk/drivers/char/Makefile | 1 + trunk/drivers/char/ftape/Kconfig | 330 ++ trunk/drivers/char/ftape/Makefile | 28 + trunk/drivers/char/ftape/README.PCI | 81 + trunk/drivers/char/ftape/RELEASE-NOTES | 966 ++++ trunk/drivers/char/ftape/compressor/Makefile | 31 + trunk/drivers/char/ftape/compressor/lzrw3.c | 743 +++ trunk/drivers/char/ftape/compressor/lzrw3.h | 253 + .../char/ftape/compressor/zftape-compress.c | 1203 +++++ .../char/ftape/compressor/zftape-compress.h | 83 + trunk/drivers/char/ftape/lowlevel/Makefile | 43 + trunk/drivers/char/ftape/lowlevel/fc-10.c | 175 + trunk/drivers/char/ftape/lowlevel/fc-10.h | 39 + trunk/drivers/char/ftape/lowlevel/fdc-io.c | 1349 ++++++ trunk/drivers/char/ftape/lowlevel/fdc-io.h | 252 + trunk/drivers/char/ftape/lowlevel/fdc-isr.c | 1170 +++++ trunk/drivers/char/ftape/lowlevel/fdc-isr.h | 55 + trunk/drivers/char/ftape/lowlevel/ftape-bsm.c | 491 ++ trunk/drivers/char/ftape/lowlevel/ftape-bsm.h | 66 + .../char/ftape/lowlevel/ftape-buffer.c | 130 + .../char/ftape/lowlevel/ftape-buffer.h | 32 + .../char/ftape/lowlevel/ftape-calibr.c | 275 ++ .../char/ftape/lowlevel/ftape-calibr.h | 37 + trunk/drivers/char/ftape/lowlevel/ftape-ctl.c | 896 ++++ trunk/drivers/char/ftape/lowlevel/ftape-ctl.h | 162 + trunk/drivers/char/ftape/lowlevel/ftape-ecc.c | 853 ++++ trunk/drivers/char/ftape/lowlevel/ftape-ecc.h | 84 + .../char/ftape/lowlevel/ftape-format.c | 344 ++ .../char/ftape/lowlevel/ftape-format.h | 37 + .../drivers/char/ftape/lowlevel/ftape-init.c | 160 + .../drivers/char/ftape/lowlevel/ftape-init.h | 43 + trunk/drivers/char/ftape/lowlevel/ftape-io.c | 992 ++++ trunk/drivers/char/ftape/lowlevel/ftape-io.h | 90 + .../drivers/char/ftape/lowlevel/ftape-proc.c | 214 + .../drivers/char/ftape/lowlevel/ftape-proc.h | 35 + .../drivers/char/ftape/lowlevel/ftape-read.c | 621 +++ .../drivers/char/ftape/lowlevel/ftape-read.h | 51 + trunk/drivers/char/ftape/lowlevel/ftape-rw.c | 1092 +++++ trunk/drivers/char/ftape/lowlevel/ftape-rw.h | 111 + .../drivers/char/ftape/lowlevel/ftape-setup.c | 104 + .../char/ftape/lowlevel/ftape-tracing.c | 118 + .../char/ftape/lowlevel/ftape-tracing.h | 179 + .../drivers/char/ftape/lowlevel/ftape-write.c | 336 ++ .../drivers/char/ftape/lowlevel/ftape-write.h | 53 + .../drivers/char/ftape/lowlevel/ftape_syms.c | 87 + trunk/drivers/char/ftape/zftape/Makefile | 36 + .../char/ftape/zftape/zftape-buffers.c | 149 + .../char/ftape/zftape/zftape-buffers.h | 55 + trunk/drivers/char/ftape/zftape/zftape-ctl.c | 1417 ++++++ trunk/drivers/char/ftape/zftape/zftape-ctl.h | 58 + trunk/drivers/char/ftape/zftape/zftape-eof.c | 199 + trunk/drivers/char/ftape/zftape/zftape-eof.h | 52 + trunk/drivers/char/ftape/zftape/zftape-init.c | 377 ++ trunk/drivers/char/ftape/zftape/zftape-init.h | 77 + trunk/drivers/char/ftape/zftape/zftape-read.c | 377 ++ trunk/drivers/char/ftape/zftape/zftape-read.h | 53 + trunk/drivers/char/ftape/zftape/zftape-rw.c | 375 ++ trunk/drivers/char/ftape/zftape/zftape-rw.h | 101 + trunk/drivers/char/ftape/zftape/zftape-vtbl.c | 757 +++ trunk/drivers/char/ftape/zftape/zftape-vtbl.h | 227 + .../drivers/char/ftape/zftape/zftape-write.c | 483 ++ .../drivers/char/ftape/zftape/zftape-write.h | 38 + trunk/drivers/char/ftape/zftape/zftape_syms.c | 43 + trunk/drivers/char/hpet.c | 1 - trunk/drivers/char/hw_random/core.c | 1 - trunk/drivers/char/random.c | 48 +- trunk/drivers/char/tpm/tpm.h | 1 - trunk/drivers/hwmon/abituguru.c | 1 - trunk/drivers/hwmon/hdaps.c | 1 - .../drivers/infiniband/ulp/iser/iser_memory.c | 1 - trunk/drivers/isdn/divert/isdn_divert.c | 2 - trunk/drivers/leds/ledtrig-ide-disk.c | 1 - trunk/drivers/leds/ledtrig-timer.c | 1 - trunk/drivers/media/dvb/cinergyT2/cinergyT2.c | 1 - trunk/drivers/mmc/Kconfig | 2 +- trunk/drivers/mmc/at91_mci.c | 2 +- trunk/drivers/mmc/au1xmmc.c | 2 +- trunk/drivers/mmc/imxmmc.c | 2 +- trunk/drivers/mmc/mmc.c | 294 +- trunk/drivers/mmc/mmc_block.c | 15 +- trunk/drivers/mmc/mmc_queue.c | 63 +- trunk/drivers/mmc/mmc_queue.h | 3 +- trunk/drivers/mmc/mmci.c | 2 +- trunk/drivers/mmc/omap.c | 272 +- trunk/drivers/mmc/omap.h | 55 + trunk/drivers/mmc/pxamci.c | 2 +- trunk/drivers/mmc/sdhci.c | 17 +- trunk/drivers/mmc/sdhci.h | 2 - trunk/drivers/mmc/wbsd.c | 2 +- trunk/drivers/net/8390.c | 1080 ++++- trunk/drivers/net/8390.h | 37 +- trunk/drivers/net/Kconfig | 43 +- trunk/drivers/net/Makefile | 13 +- trunk/drivers/net/Space.c | 1 + trunk/drivers/net/amd8111e.c | 27 +- trunk/drivers/net/amd8111e.h | 4 + trunk/drivers/net/arm/etherh.c | 39 +- trunk/drivers/net/au1000_eth.c | 3 +- trunk/drivers/net/bnx2.c | 689 ++- trunk/drivers/net/bnx2.h | 2940 +----------- trunk/drivers/net/bnx2_fw.h | 1234 ++--- trunk/drivers/net/bnx2_fw2.h | 4086 ----------------- trunk/drivers/net/bonding/bond_main.c | 63 +- trunk/drivers/net/cassini.c | 2 +- trunk/drivers/net/chelsio/Makefile | 8 +- trunk/drivers/net/chelsio/common.h | 105 +- trunk/drivers/net/chelsio/cphy.h | 24 +- trunk/drivers/net/chelsio/cpl5_cmd.h | 510 +- trunk/drivers/net/chelsio/cxgb2.c | 591 +-- trunk/drivers/net/chelsio/elmer0.h | 7 - trunk/drivers/net/chelsio/espi.c | 205 +- trunk/drivers/net/chelsio/espi.h | 1 - trunk/drivers/net/chelsio/fpga_defs.h | 232 - trunk/drivers/net/chelsio/gmac.h | 5 - trunk/drivers/net/chelsio/ixf1010.c | 485 -- trunk/drivers/net/chelsio/mac.c | 368 -- trunk/drivers/net/chelsio/mv88e1xxx.c | 397 -- trunk/drivers/net/chelsio/mv88e1xxx.h | 127 - trunk/drivers/net/chelsio/mv88x201x.c | 36 +- trunk/drivers/net/chelsio/my3126.c | 204 - trunk/drivers/net/chelsio/pm3393.c | 125 +- trunk/drivers/net/chelsio/regs.h | 1718 +------ trunk/drivers/net/chelsio/sge.c | 867 +--- trunk/drivers/net/chelsio/sge.h | 33 +- trunk/drivers/net/chelsio/subr.c | 494 +- trunk/drivers/net/chelsio/suni1x10gexp_regs.h | 1430 ------ trunk/drivers/net/chelsio/tp.c | 178 - trunk/drivers/net/chelsio/tp.h | 73 - trunk/drivers/net/chelsio/vsc7326.c | 725 --- trunk/drivers/net/chelsio/vsc7326_reg.h | 286 -- trunk/drivers/net/chelsio/vsc8244.c | 368 -- trunk/drivers/net/chelsio/vsc8244_reg.h | 172 - trunk/drivers/net/cs89x0.c | 4 +- trunk/drivers/net/defxx.c | 39 +- trunk/drivers/net/defxx.h | 15 +- trunk/drivers/net/depca.c | 28 +- trunk/drivers/net/e1000/e1000.h | 17 +- trunk/drivers/net/e1000/e1000_ethtool.c | 36 +- trunk/drivers/net/e1000/e1000_hw.c | 137 +- trunk/drivers/net/e1000/e1000_hw.h | 90 +- trunk/drivers/net/e1000/e1000_main.c | 490 +- trunk/drivers/net/e1000/e1000_osdep.h | 9 +- trunk/drivers/net/e1000/e1000_param.c | 98 +- trunk/drivers/net/ehea/ehea_qmr.c | 1 - trunk/drivers/net/forcedeth.c | 290 +- trunk/drivers/net/fs_enet/fs_enet-main.c | 3 +- trunk/drivers/net/gianfar.c | 72 +- trunk/drivers/net/gianfar.h | 3 - trunk/drivers/net/hydra.c | 23 +- trunk/drivers/net/ioc3-eth.c | 1 + trunk/drivers/net/ixgb/ixgb_main.c | 2 +- trunk/drivers/net/lance.c | 1 - trunk/drivers/net/lib8390.c | 1097 ----- trunk/drivers/net/mac8390.c | 26 +- trunk/drivers/net/macb.c | 1210 ----- trunk/drivers/net/macb.h | 387 -- trunk/drivers/net/meth.c | 1 + trunk/drivers/net/myri10ge/myri10ge.c | 2 +- trunk/drivers/net/myri_sbus.c | 1 + trunk/drivers/net/ne-h8300.c | 23 +- trunk/drivers/net/ne3210.c | 1 - trunk/drivers/net/netconsole.c | 8 +- trunk/drivers/net/netxen/Makefile | 35 - trunk/drivers/net/netxen/netxen_nic.h | 1028 ----- trunk/drivers/net/netxen/netxen_nic_ethtool.c | 741 --- trunk/drivers/net/netxen/netxen_nic_hdr.h | 678 --- trunk/drivers/net/netxen/netxen_nic_hw.c | 1010 ---- trunk/drivers/net/netxen/netxen_nic_hw.h | 482 -- trunk/drivers/net/netxen/netxen_nic_init.c | 1304 ------ trunk/drivers/net/netxen/netxen_nic_ioctl.h | 77 - trunk/drivers/net/netxen/netxen_nic_isr.c | 215 - trunk/drivers/net/netxen/netxen_nic_main.c | 1161 ----- trunk/drivers/net/netxen/netxen_nic_niu.c | 894 ---- .../drivers/net/netxen/netxen_nic_phan_reg.h | 215 - trunk/drivers/net/pcmcia/pcnet_cs.c | 1 + trunk/drivers/net/phy/Kconfig | 6 - trunk/drivers/net/phy/Makefile | 1 - trunk/drivers/net/phy/broadcom.c | 175 - trunk/drivers/net/phy/phy.c | 113 +- trunk/drivers/net/phy/phy_device.c | 30 +- trunk/drivers/net/pppoe.c | 2 +- trunk/drivers/net/r8169.c | 22 +- trunk/drivers/net/sk98lin/skethtool.c | 26 - trunk/drivers/net/sk98lin/skge.c | 59 +- trunk/drivers/net/skge.c | 8 +- trunk/drivers/net/sky2.c | 41 +- trunk/drivers/net/sky2.h | 11 +- trunk/drivers/net/spider_net.c | 20 +- trunk/drivers/net/spider_net.h | 8 +- trunk/drivers/net/starfire.c | 1 - trunk/drivers/net/sun3lance.c | 1 - trunk/drivers/net/sundance.c | 58 +- trunk/drivers/net/sungem.c | 3 +- trunk/drivers/net/sunhme.c | 8 +- trunk/drivers/net/tokenring/olympic.c | 2 +- trunk/drivers/net/tsi108_eth.c | 1708 ------- trunk/drivers/net/tsi108_eth.h | 365 -- trunk/drivers/net/tulip/de2104x.c | 4 +- trunk/drivers/net/tulip/dmfe.c | 9 +- trunk/drivers/net/typhoon.c | 2 +- trunk/drivers/net/ucc_geth.c | 6 +- trunk/drivers/net/wan/Kconfig | 76 +- trunk/drivers/net/wireless/atmel.c | 36 +- trunk/drivers/net/wireless/atmel_cs.c | 74 +- trunk/drivers/net/wireless/atmel_pci.c | 10 +- trunk/drivers/net/wireless/bcm43xx/bcm43xx.h | 32 - .../net/wireless/bcm43xx/bcm43xx_main.c | 207 +- .../net/wireless/bcm43xx/bcm43xx_power.c | 28 +- .../drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 4 +- .../net/wireless/bcm43xx/bcm43xx_xmit.c | 18 + .../drivers/net/wireless/hostap/hostap_pci.c | 8 +- trunk/drivers/net/wireless/ipw2100.c | 25 +- trunk/drivers/net/wireless/ipw2200.c | 8 +- trunk/drivers/net/wireless/orinoco_pci.h | 7 +- trunk/drivers/net/wireless/prism54/isl_38xx.c | 17 +- trunk/drivers/net/wireless/prism54/isl_38xx.h | 7 +- .../drivers/net/wireless/prism54/isl_ioctl.c | 61 +- .../drivers/net/wireless/prism54/isl_ioctl.h | 1 + trunk/drivers/net/wireless/prism54/isl_oid.h | 48 +- .../drivers/net/wireless/prism54/islpci_dev.c | 13 +- .../drivers/net/wireless/prism54/islpci_dev.h | 11 +- .../drivers/net/wireless/prism54/islpci_eth.c | 30 +- .../drivers/net/wireless/prism54/islpci_eth.h | 1 + .../net/wireless/prism54/islpci_hotplug.c | 43 +- .../drivers/net/wireless/prism54/islpci_mgt.c | 3 +- .../drivers/net/wireless/prism54/islpci_mgt.h | 5 +- trunk/drivers/net/wireless/prism54/oid_mgt.c | 6 +- .../net/wireless/prism54/prismcompat.h | 4 +- trunk/drivers/net/wireless/zd1211rw/zd_chip.c | 38 +- trunk/drivers/net/wireless/zd1211rw/zd_chip.h | 104 +- trunk/drivers/net/wireless/zd1211rw/zd_def.h | 1 - .../net/wireless/zd1211rw/zd_ieee80211.c | 10 +- .../net/wireless/zd1211rw/zd_ieee80211.h | 3 +- trunk/drivers/net/wireless/zd1211rw/zd_mac.c | 404 +- trunk/drivers/net/wireless/zd1211rw/zd_mac.h | 38 +- .../drivers/net/wireless/zd1211rw/zd_netdev.c | 13 +- trunk/drivers/net/wireless/zd1211rw/zd_usb.c | 45 +- trunk/drivers/net/wireless/zd1211rw/zd_usb.h | 14 +- trunk/drivers/net/zorro8390.c | 24 +- trunk/drivers/pci/access.c | 1 - trunk/drivers/s390/block/dasd.c | 16 +- trunk/drivers/s390/block/dasd_devmap.c | 36 +- trunk/drivers/s390/char/con3215.c | 50 +- trunk/drivers/s390/char/sclp_quiesce.c | 37 +- trunk/drivers/s390/cio/chsc.c | 82 +- trunk/drivers/s390/cio/cio.c | 128 +- trunk/drivers/s390/cio/css.h | 3 - trunk/drivers/s390/cio/device.c | 17 +- trunk/drivers/s390/cio/device_fsm.c | 27 - trunk/drivers/s390/cio/device_id.c | 10 +- trunk/drivers/s390/cio/device_pgid.c | 30 +- trunk/drivers/s390/cio/device_status.c | 3 - trunk/drivers/s390/cio/qdio.c | 8 +- trunk/drivers/s390/cio/qdio.h | 4 +- trunk/drivers/s390/crypto/ap_bus.c | 10 +- trunk/drivers/s390/net/lcs.c | 80 +- trunk/drivers/s390/net/lcs.h | 29 +- trunk/drivers/s390/net/qeth.h | 2 + trunk/drivers/s390/net/qeth_eddp.c | 40 +- trunk/drivers/s390/net/qeth_eddp.h | 2 +- trunk/drivers/s390/net/qeth_main.c | 6 +- trunk/drivers/scsi/scsi_transport_sas.c | 1 - trunk/drivers/spi/spi_butterfly.c | 1 - trunk/drivers/w1/slaves/w1_therm.c | 1 - trunk/fs/9p/conv.c | 1 - trunk/fs/9p/fcall.c | 1 - trunk/fs/9p/fid.c | 1 - trunk/fs/9p/v9fs.c | 1 - trunk/fs/9p/vfs_dir.c | 1 - trunk/fs/9p/vfs_file.c | 1 - trunk/fs/compat.c | 2 - trunk/fs/gfs2/locking/dlm/plock.c | 1 - trunk/fs/inotify.c | 1 - trunk/fs/jffs2/acl.c | 1 - trunk/fs/jffs2/wbuf.c | 1 - trunk/fs/jfs/ioctl.c | 1 - trunk/fs/nfs/nfsroot.c | 13 +- trunk/fs/partitions/mac.c | 2 - trunk/fs/proc/root.c | 1 - trunk/fs/reiserfs/xattr.c | 2 +- trunk/fs/super.c | 18 - trunk/fs/sync.c | 1 - trunk/fs/utimes.c | 1 - trunk/include/asm-alpha/checksum.h | 34 +- trunk/include/asm-arm/checksum.h | 83 +- trunk/include/asm-arm26/checksum.h | 63 +- trunk/include/asm-avr32/checksum.h | 40 +- trunk/include/asm-cris/arch-v10/checksum.h | 10 +- trunk/include/asm-cris/arch-v32/checksum.h | 10 +- trunk/include/asm-cris/checksum.h | 34 +- trunk/include/asm-frv/checksum.h | 41 +- trunk/include/asm-h8300/checksum.h | 31 +- trunk/include/asm-i386/checksum.h | 65 +- trunk/include/asm-ia64/checksum.h | 31 +- trunk/include/asm-m32r/checksum.h | 52 +- trunk/include/asm-m68k/checksum.h | 46 +- trunk/include/asm-m68knommu/checksum.h | 46 +- trunk/include/asm-m68knommu/dma-mapping.h | 3 +- trunk/include/asm-m68knommu/m520xsim.h | 12 +- trunk/include/asm-m68knommu/scatterlist.h | 2 +- trunk/include/asm-mips/checksum.h | 55 +- trunk/include/asm-parisc/checksum.h | 55 +- trunk/include/asm-powerpc/checksum.h | 59 +- trunk/include/asm-s390/checksum.h | 45 +- trunk/include/asm-s390/cio.h | 9 +- trunk/include/asm-s390/cpcmd.h | 10 +- trunk/include/asm-s390/kexec.h | 2 +- trunk/include/asm-s390/lowcore.h | 8 - trunk/include/asm-s390/pgtable.h | 15 +- trunk/include/asm-s390/reset.h | 23 - trunk/include/asm-s390/setup.h | 15 +- trunk/include/asm-s390/smp.h | 8 - trunk/include/asm-s390/system.h | 10 - trunk/include/asm-s390/termios.h | 34 +- trunk/include/asm-s390/uaccess.h | 18 +- trunk/include/asm-s390/zcrypt.h | 91 +- trunk/include/asm-sh/checksum.h | 59 +- trunk/include/asm-sh64/checksum.h | 41 +- trunk/include/asm-sparc/checksum.h | 103 +- trunk/include/asm-sparc64/checksum.h | 77 +- trunk/include/asm-v850/checksum.h | 38 +- trunk/include/asm-x86_64/checksum.h | 54 +- trunk/include/asm-x86_64/elf.h | 1 + trunk/include/asm-x86_64/uaccess.h | 1 + trunk/include/asm-xtensa/checksum.h | 64 +- trunk/include/linux/Kbuild | 5 + trunk/include/linux/acct.h | 1 - trunk/include/linux/atmarp.h | 2 +- trunk/include/linux/atmbr2684.h | 4 +- trunk/include/linux/atmmpc.h | 16 +- trunk/include/linux/dccp.h | 63 +- trunk/include/linux/divert.h | 132 + trunk/include/linux/fib_rules.h | 3 +- trunk/include/linux/fs.h | 37 +- trunk/include/linux/ftape-header-segment.h | 122 + trunk/include/linux/ftape-vendors.h | 137 + trunk/include/linux/ftape.h | 201 + trunk/include/linux/icmp.h | 2 +- trunk/include/linux/icmpv6.h | 12 +- trunk/include/linux/if_packet.h | 6 +- trunk/include/linux/if_tunnel.h | 8 +- trunk/include/linux/igmp.h | 3 +- trunk/include/linux/in.h | 1 - trunk/include/linux/in6.h | 4 +- trunk/include/linux/inet.h | 4 +- trunk/include/linux/inetdevice.h | 14 +- trunk/include/linux/ip.h | 2 +- trunk/include/linux/ip6_tunnel.h | 2 +- trunk/include/linux/ipv6.h | 2 +- trunk/include/linux/kernelcapi.h | 2 - trunk/include/linux/mmc/card.h | 13 - trunk/include/linux/mmc/protocol.h | 74 +- trunk/include/linux/module.h | 13 +- trunk/include/linux/mv643xx.h | 4 +- trunk/include/linux/net.h | 2 +- trunk/include/linux/netdevice.h | 13 +- trunk/include/linux/netfilter.h | 44 +- trunk/include/linux/netfilter/Kbuild | 2 - .../linux/netfilter/nf_conntrack_amanda.h | 10 - .../linux/netfilter/nf_conntrack_ftp.h | 20 +- .../linux/netfilter/nf_conntrack_h323.h | 92 - .../linux/netfilter/nf_conntrack_irc.h | 15 - .../linux/netfilter/nf_conntrack_pptp.h | 321 -- .../linux/netfilter/nf_conntrack_proto_gre.h | 112 - .../linux/netfilter/nf_conntrack_sctp.h | 2 +- .../linux/netfilter/nf_conntrack_sip.h | 41 - .../linux/netfilter/nf_conntrack_tftp.h | 20 - trunk/include/linux/netfilter/nfnetlink.h | 2 +- trunk/include/linux/netfilter/nfnetlink_log.h | 12 +- .../include/linux/netfilter/nfnetlink_queue.h | 19 +- trunk/include/linux/netfilter/xt_NFLOG.h | 18 - trunk/include/linux/netfilter/xt_conntrack.h | 4 +- trunk/include/linux/netfilter/xt_hashlimit.h | 40 - trunk/include/linux/netfilter/xt_policy.h | 2 +- trunk/include/linux/netfilter_bridge.h | 2 +- .../linux/netfilter_bridge/ebt_802_3.h | 10 +- .../linux/netfilter_bridge/ebt_among.h | 2 +- .../include/linux/netfilter_bridge/ebt_arp.h | 14 +- trunk/include/linux/netfilter_bridge/ebt_ip.h | 8 +- .../include/linux/netfilter_bridge/ebt_nat.h | 1 - .../include/linux/netfilter_bridge/ebt_vlan.h | 2 +- .../include/linux/netfilter_bridge/ebtables.h | 25 +- trunk/include/linux/netfilter_ipv4.h | 2 +- trunk/include/linux/netfilter_ipv4/Kbuild | 2 + .../linux/netfilter_ipv4/ip_conntrack.h | 3 +- .../linux/netfilter_ipv4/ip_conntrack_ftp.h | 40 +- .../linux/netfilter_ipv4/ip_conntrack_h323.h | 2 +- .../ip_conntrack_helper_h323_asn1.h} | 10 +- .../ip_conntrack_helper_h323_types.h} | 12 - .../netfilter_ipv4/ip_conntrack_proto_gre.h | 4 +- .../linux/netfilter_ipv4/ip_conntrack_sip.h | 34 +- .../linux/netfilter_ipv4/ip_conntrack_tftp.h | 2 +- trunk/include/linux/netfilter_ipv4/ipt_LOG.h | 2 +- .../linux/netfilter_ipv4/ipt_hashlimit.h | 42 +- trunk/include/linux/netfilter_ipv6.h | 2 +- trunk/include/linux/netfilter_ipv6/ip6t_LOG.h | 2 +- trunk/include/linux/netlink.h | 2 +- trunk/include/linux/netpoll.h | 15 +- trunk/include/linux/nfs_fs.h | 2 +- trunk/include/linux/pci_ids.h | 5 - trunk/include/linux/pfkeyv2.h | 4 +- trunk/include/linux/phy.h | 30 +- trunk/include/linux/poll.h | 3 +- trunk/include/linux/radix-tree.h | 1 + trunk/include/linux/random.h | 20 +- trunk/include/linux/rtnetlink.h | 5 +- trunk/include/linux/sctp.h | 72 +- trunk/include/linux/security.h | 56 +- trunk/include/linux/skbuff.h | 48 +- trunk/include/linux/socket.h | 3 +- trunk/include/linux/sockios.h | 4 +- trunk/include/linux/sunrpc/xdr.h | 2 +- trunk/include/linux/sysctl.h | 12 +- trunk/include/linux/tcp.h | 190 +- trunk/include/linux/tfrc.h | 20 +- trunk/include/linux/tipc_config.h | 32 +- trunk/include/linux/types.h | 4 - trunk/include/linux/udp.h | 14 +- trunk/include/linux/wireless.h | 2 - trunk/include/linux/xfrm.h | 6 +- trunk/include/linux/zftape.h | 87 + trunk/include/net/addrconf.h | 8 +- trunk/include/net/arp.h | 2 +- trunk/include/net/atmclip.h | 2 +- trunk/include/net/bluetooth/rfcomm.h | 4 +- trunk/include/net/checksum.h | 43 +- trunk/include/net/cipso_ipv4.h | 4 +- trunk/include/net/dsfield.h | 10 +- trunk/include/net/fib_rules.h | 10 - trunk/include/net/flow.h | 9 +- trunk/include/net/genetlink.h | 54 +- trunk/include/net/ieee80211.h | 6 - trunk/include/net/if_inet6.h | 1 - trunk/include/net/inet6_connection_sock.h | 4 +- trunk/include/net/inet6_hashtables.h | 16 +- trunk/include/net/inet_connection_sock.h | 8 +- trunk/include/net/inet_ecn.h | 10 +- trunk/include/net/ip.h | 21 +- trunk/include/net/ip6_checksum.h | 76 +- trunk/include/net/ip6_fib.h | 5 - trunk/include/net/ip6_route.h | 2 +- trunk/include/net/ip_fib.h | 2 +- trunk/include/net/ip_mp_alg.h | 4 +- trunk/include/net/ip_vs.h | 16 +- trunk/include/net/ipconfig.h | 8 +- trunk/include/net/ipip.h | 6 +- trunk/include/net/ipv6.h | 62 +- trunk/include/net/irda/irlap_frame.h | 16 +- trunk/include/net/irda/timer.h | 1 - trunk/include/net/llc_pdu.h | 10 +- trunk/include/net/ndisc.h | 4 +- .../net/netfilter/ipv4/nf_conntrack_ipv4.h | 29 +- .../net/netfilter/ipv6/nf_conntrack_ipv6.h | 25 - trunk/include/net/netfilter/nf_conntrack.h | 172 +- .../include/net/netfilter/nf_conntrack_core.h | 16 +- .../net/netfilter/nf_conntrack_ecache.h | 95 - .../net/netfilter/nf_conntrack_expect.h | 80 - .../net/netfilter/nf_conntrack_helper.h | 22 +- .../net/netfilter/nf_conntrack_l3proto.h | 15 +- ...rack_l4proto.h => nf_conntrack_protocol.h} | 49 +- .../net/netfilter/nf_conntrack_tuple.h | 34 +- trunk/include/net/netfilter/nf_nat.h | 77 - trunk/include/net/netfilter/nf_nat_core.h | 27 - trunk/include/net/netfilter/nf_nat_helper.h | 32 - trunk/include/net/netfilter/nf_nat_protocol.h | 70 - trunk/include/net/netfilter/nf_nat_rule.h | 35 - trunk/include/net/netlabel.h | 123 +- trunk/include/net/netlink.h | 22 +- trunk/include/net/protocol.h | 4 +- trunk/include/net/rawv6.h | 2 +- trunk/include/net/request_sock.h | 12 +- trunk/include/net/sch_generic.h | 6 +- trunk/include/net/sctp/command.h | 4 - trunk/include/net/sctp/constants.h | 2 +- trunk/include/net/sctp/sctp.h | 2 +- trunk/include/net/sctp/sm.h | 6 +- trunk/include/net/sctp/structs.h | 21 +- trunk/include/net/sctp/tsnmap.h | 4 +- trunk/include/net/sock.h | 14 +- trunk/include/net/tcp.h | 159 +- trunk/include/net/timewait_sock.h | 3 - trunk/include/net/tipc/tipc_bearer.h | 2 +- trunk/include/net/tipc/tipc_msg.h | 2 +- trunk/include/net/transp_v6.h | 2 - trunk/include/net/udp.h | 97 +- trunk/include/net/udplite.h | 151 - trunk/include/net/xfrm.h | 66 +- trunk/include/scsi/libiscsi.h | 2 - trunk/include/sound/pcm.h | 1 - trunk/kernel/auditsc.c | 1 - trunk/kernel/latency.c | 1 - trunk/kernel/module.c | 15 +- trunk/kernel/taskstats.c | 11 +- trunk/lib/random32.c | 1 - trunk/net/802/hippi.c | 1 + trunk/net/Kconfig | 29 +- trunk/net/appletalk/ddp.c | 1 - trunk/net/atm/Makefile | 3 + trunk/net/atm/br2684.c | 30 +- trunk/net/atm/clip.c | 39 +- trunk/net/atm/ipcommon.c | 63 + trunk/net/atm/ipcommon.h | 22 + trunk/net/atm/lec.c | 16 +- trunk/net/atm/lec.h | 6 +- trunk/net/atm/mpc.c | 29 +- trunk/net/atm/mpc.h | 6 +- trunk/net/atm/mpoa_caches.c | 20 +- trunk/net/atm/mpoa_caches.h | 16 +- trunk/net/atm/mpoa_proc.c | 6 +- trunk/net/ax25/af_ax25.c | 6 +- trunk/net/ax25/ax25_out.c | 4 +- trunk/net/ax25/ax25_route.c | 5 +- trunk/net/ax25/sysctl_net_ax25.c | 5 +- trunk/net/bluetooth/bnep/bnep.h | 4 +- trunk/net/bluetooth/bnep/core.c | 28 +- trunk/net/bluetooth/bnep/netdev.c | 11 +- trunk/net/bluetooth/l2cap.c | 4 +- trunk/net/bluetooth/rfcomm/core.c | 18 +- trunk/net/bridge/br_netfilter.c | 3 +- trunk/net/bridge/br_netlink.c | 113 +- trunk/net/bridge/netfilter/ebt_802_3.c | 2 +- trunk/net/bridge/netfilter/ebt_among.c | 22 +- trunk/net/bridge/netfilter/ebt_arp.c | 6 +- trunk/net/bridge/netfilter/ebt_ip.c | 4 +- trunk/net/bridge/netfilter/ebt_log.c | 6 +- trunk/net/bridge/netfilter/ebt_mark.c | 14 +- trunk/net/bridge/netfilter/ebt_mark_m.c | 4 +- trunk/net/bridge/netfilter/ebt_snat.c | 27 +- trunk/net/bridge/netfilter/ebt_ulog.c | 2 +- trunk/net/bridge/netfilter/ebt_vlan.c | 2 +- trunk/net/bridge/netfilter/ebtable_broute.c | 2 +- trunk/net/bridge/netfilter/ebtable_filter.c | 2 +- trunk/net/bridge/netfilter/ebtable_nat.c | 2 +- trunk/net/bridge/netfilter/ebtables.c | 222 +- trunk/net/core/Makefile | 1 + trunk/net/core/datagram.c | 16 +- trunk/net/core/dev.c | 39 +- trunk/net/core/dv.c | 546 +++ trunk/net/core/fib_rules.c | 71 +- trunk/net/core/filter.c | 6 +- trunk/net/core/iovec.c | 4 +- trunk/net/core/kmap_skb.h | 19 - trunk/net/core/neighbour.c | 24 +- trunk/net/core/netpoll.c | 326 +- trunk/net/core/pktgen.c | 68 +- trunk/net/core/request_sock.c | 35 +- trunk/net/core/rtnetlink.c | 60 +- trunk/net/core/skbuff.c | 29 +- trunk/net/core/sock.c | 14 +- trunk/net/core/sysctl_net_core.c | 14 + trunk/net/core/utils.c | 10 +- trunk/net/dccp/Kconfig | 5 +- trunk/net/dccp/Makefile | 8 +- trunk/net/dccp/ackvec.c | 116 +- trunk/net/dccp/ackvec.h | 20 +- trunk/net/dccp/ccid.h | 12 +- trunk/net/dccp/ccids/Kconfig | 58 +- trunk/net/dccp/ccids/ccid2.c | 45 +- trunk/net/dccp/ccids/ccid2.h | 3 +- trunk/net/dccp/ccids/ccid3.c | 636 +-- trunk/net/dccp/ccids/ccid3.h | 121 +- trunk/net/dccp/ccids/lib/loss_interval.c | 6 +- trunk/net/dccp/ccids/lib/tfrc_equation.c | 223 +- trunk/net/dccp/dccp.h | 110 +- trunk/net/dccp/feat.c | 131 +- trunk/net/dccp/feat.h | 48 +- trunk/net/dccp/input.c | 63 +- trunk/net/dccp/ipv4.c | 537 ++- trunk/net/dccp/ipv6.c | 613 +-- trunk/net/dccp/minisocks.c | 48 +- trunk/net/dccp/options.c | 61 +- trunk/net/dccp/output.c | 84 +- trunk/net/dccp/probe.c | 6 +- trunk/net/dccp/proto.c | 64 +- trunk/net/dccp/sysctl.c | 60 +- trunk/net/dccp/timer.c | 134 +- trunk/net/decnet/Kconfig | 8 + trunk/net/decnet/dn_dev.c | 173 +- trunk/net/decnet/dn_neigh.c | 1 + trunk/net/decnet/dn_nsp_in.c | 2 +- trunk/net/decnet/dn_route.c | 46 +- trunk/net/decnet/dn_rules.c | 43 +- trunk/net/decnet/dn_table.c | 42 +- trunk/net/ethernet/eth.c | 1 + trunk/net/ieee80211/ieee80211_crypt_tkip.c | 1 - trunk/net/ieee80211/ieee80211_crypt_wep.c | 1 - trunk/net/ieee80211/ieee80211_module.c | 25 +- trunk/net/ieee80211/ieee80211_rx.c | 68 +- trunk/net/ieee80211/ieee80211_tx.c | 4 +- .../ieee80211/softmac/ieee80211softmac_auth.c | 24 +- .../ieee80211/softmac/ieee80211softmac_scan.c | 7 +- trunk/net/ipv4/Kconfig | 19 +- trunk/net/ipv4/Makefile | 3 +- trunk/net/ipv4/af_inet.c | 16 +- trunk/net/ipv4/ah4.c | 4 +- trunk/net/ipv4/arp.c | 2 +- trunk/net/ipv4/cipso_ipv4.c | 813 +--- trunk/net/ipv4/devinet.c | 32 +- trunk/net/ipv4/esp4.c | 4 +- trunk/net/ipv4/fib_frontend.c | 5 +- trunk/net/ipv4/fib_rules.c | 53 +- trunk/net/ipv4/fib_semantics.c | 36 +- trunk/net/ipv4/icmp.c | 6 +- trunk/net/ipv4/igmp.c | 2 +- trunk/net/ipv4/inet_connection_sock.c | 2 +- trunk/net/ipv4/ip_gre.c | 56 +- trunk/net/ipv4/ip_output.c | 20 +- trunk/net/ipv4/ip_sockglue.c | 2 +- trunk/net/ipv4/ipconfig.c | 105 +- trunk/net/ipv4/ipip.c | 16 +- trunk/net/ipv4/ipmr.c | 2 +- trunk/net/ipv4/ipvs/ip_vs_app.c | 3 +- trunk/net/ipv4/ipvs/ip_vs_core.c | 4 +- trunk/net/ipv4/ipvs/ip_vs_lblc.c | 1 - trunk/net/ipv4/ipvs/ip_vs_lblcr.c | 1 - trunk/net/ipv4/ipvs/ip_vs_proto.c | 8 +- trunk/net/ipv4/ipvs/ip_vs_proto_tcp.c | 16 +- trunk/net/ipv4/ipvs/ip_vs_proto_udp.c | 22 +- trunk/net/ipv4/netfilter.c | 10 +- trunk/net/ipv4/netfilter/Kconfig | 138 +- trunk/net/ipv4/netfilter/Makefile | 30 +- .../net/ipv4/netfilter/ip_conntrack_amanda.c | 11 +- trunk/net/ipv4/netfilter/ip_conntrack_core.c | 8 +- trunk/net/ipv4/netfilter/ip_conntrack_ftp.c | 8 +- .../ipv4/netfilter/ip_conntrack_helper_h323.c | 168 +- .../ip_conntrack_helper_h323_asn1.c} | 4 +- .../ip_conntrack_helper_h323_types.c} | 7 +- .../ipv4/netfilter/ip_conntrack_helper_pptp.c | 33 +- trunk/net/ipv4/netfilter/ip_conntrack_irc.c | 12 +- .../net/ipv4/netfilter/ip_conntrack_netlink.c | 65 +- .../ipv4/netfilter/ip_conntrack_proto_gre.c | 2 + trunk/net/ipv4/netfilter/ip_conntrack_sip.c | 118 +- .../ipv4/netfilter/ip_conntrack_standalone.c | 6 +- trunk/net/ipv4/netfilter/ip_conntrack_tftp.c | 6 +- trunk/net/ipv4/netfilter/ip_nat_amanda.c | 9 +- trunk/net/ipv4/netfilter/ip_nat_core.c | 6 +- trunk/net/ipv4/netfilter/ip_nat_ftp.c | 9 +- trunk/net/ipv4/netfilter/ip_nat_helper.c | 32 +- trunk/net/ipv4/netfilter/ip_nat_helper_h323.c | 58 +- trunk/net/ipv4/netfilter/ip_nat_helper_pptp.c | 29 +- trunk/net/ipv4/netfilter/ip_nat_irc.c | 9 +- trunk/net/ipv4/netfilter/ip_nat_proto_gre.c | 8 +- trunk/net/ipv4/netfilter/ip_nat_proto_icmp.c | 10 +- trunk/net/ipv4/netfilter/ip_nat_proto_tcp.c | 5 +- trunk/net/ipv4/netfilter/ip_nat_proto_udp.c | 9 +- trunk/net/ipv4/netfilter/ip_nat_sip.c | 199 +- trunk/net/ipv4/netfilter/ip_nat_snmp_basic.c | 85 +- trunk/net/ipv4/netfilter/ip_nat_standalone.c | 6 + trunk/net/ipv4/netfilter/ip_nat_tftp.c | 9 +- trunk/net/ipv4/netfilter/ip_queue.c | 2 +- trunk/net/ipv4/netfilter/ipt_CLUSTERIP.c | 25 +- trunk/net/ipv4/netfilter/ipt_ECN.c | 11 +- trunk/net/ipv4/netfilter/ipt_LOG.c | 20 +- trunk/net/ipv4/netfilter/ipt_MASQUERADE.c | 29 +- trunk/net/ipv4/netfilter/ipt_NETMAP.c | 4 - trunk/net/ipv4/netfilter/ipt_REDIRECT.c | 6 +- trunk/net/ipv4/netfilter/ipt_REJECT.c | 2 +- trunk/net/ipv4/netfilter/ipt_SAME.c | 12 +- trunk/net/ipv4/netfilter/ipt_TCPMSS.c | 24 +- trunk/net/ipv4/netfilter/ipt_TOS.c | 5 +- trunk/net/ipv4/netfilter/ipt_TTL.c | 5 +- trunk/net/ipv4/netfilter/ipt_ULOG.c | 2 +- .../netfilter/ipt_hashlimit.c} | 512 +-- trunk/net/ipv4/netfilter/iptable_mangle.c | 8 +- .../netfilter/nf_conntrack_l3proto_ipv4.c | 137 +- .../nf_conntrack_l3proto_ipv4_compat.c | 412 -- .../ipv4/netfilter/nf_conntrack_proto_icmp.c | 57 +- trunk/net/ipv4/netfilter/nf_nat_amanda.c | 78 - trunk/net/ipv4/netfilter/nf_nat_core.c | 647 --- trunk/net/ipv4/netfilter/nf_nat_ftp.c | 179 - trunk/net/ipv4/netfilter/nf_nat_h323.c | 596 --- trunk/net/ipv4/netfilter/nf_nat_helper.c | 433 -- trunk/net/ipv4/netfilter/nf_nat_irc.c | 101 - trunk/net/ipv4/netfilter/nf_nat_pptp.c | 315 -- trunk/net/ipv4/netfilter/nf_nat_proto_gre.c | 179 - trunk/net/ipv4/netfilter/nf_nat_proto_icmp.c | 86 - trunk/net/ipv4/netfilter/nf_nat_proto_tcp.c | 148 - trunk/net/ipv4/netfilter/nf_nat_proto_udp.c | 138 - .../net/ipv4/netfilter/nf_nat_proto_unknown.c | 54 - trunk/net/ipv4/netfilter/nf_nat_rule.c | 343 -- trunk/net/ipv4/netfilter/nf_nat_sip.c | 283 -- trunk/net/ipv4/netfilter/nf_nat_snmp_basic.c | 1332 ------ trunk/net/ipv4/netfilter/nf_nat_standalone.c | 406 -- trunk/net/ipv4/netfilter/nf_nat_tftp.c | 52 - trunk/net/ipv4/proc.c | 13 - trunk/net/ipv4/raw.c | 4 +- trunk/net/ipv4/route.c | 66 +- trunk/net/ipv4/syncookies.c | 18 +- trunk/net/ipv4/sysctl_net_ipv4.c | 76 - trunk/net/ipv4/tcp.c | 156 +- trunk/net/ipv4/tcp_cong.c | 91 +- trunk/net/ipv4/tcp_htcp.c | 4 +- trunk/net/ipv4/tcp_input.c | 14 +- trunk/net/ipv4/tcp_ipv4.c | 713 +-- trunk/net/ipv4/tcp_minisocks.c | 69 +- trunk/net/ipv4/tcp_output.c | 122 +- trunk/net/ipv4/tcp_timer.c | 2 +- trunk/net/ipv4/tcp_vegas.c | 4 +- trunk/net/ipv4/udp.c | 539 +-- trunk/net/ipv4/udp_impl.h | 38 - trunk/net/ipv4/udplite.c | 119 - trunk/net/ipv4/xfrm4_policy.c | 7 +- trunk/net/ipv6/Kconfig | 7 + trunk/net/ipv6/Makefile | 4 +- trunk/net/ipv6/addrconf.c | 190 +- trunk/net/ipv6/af_inet6.c | 27 +- trunk/net/ipv6/ah6.c | 5 +- trunk/net/ipv6/datagram.c | 16 +- trunk/net/ipv6/esp6.c | 2 +- trunk/net/ipv6/exthdrs.c | 59 +- trunk/net/ipv6/exthdrs_core.c | 2 +- trunk/net/ipv6/fib6_rules.c | 60 +- trunk/net/ipv6/icmp.c | 23 +- trunk/net/ipv6/inet6_connection_sock.c | 17 +- trunk/net/ipv6/inet6_hashtables.c | 6 +- trunk/net/ipv6/ip6_fib.c | 8 +- trunk/net/ipv6/ip6_flowlabel.c | 8 +- trunk/net/ipv6/ip6_input.c | 42 +- trunk/net/ipv6/ip6_output.c | 84 +- trunk/net/ipv6/ip6_tunnel.c | 296 +- trunk/net/ipv6/ipcomp6.c | 2 +- trunk/net/ipv6/ipv6_sockglue.c | 11 +- trunk/net/ipv6/mcast.c | 36 +- trunk/net/ipv6/mip6.c | 4 +- trunk/net/ipv6/ndisc.c | 29 +- trunk/net/ipv6/netfilter.c | 11 +- trunk/net/ipv6/netfilter/Kconfig | 2 +- trunk/net/ipv6/netfilter/ip6_queue.c | 4 +- trunk/net/ipv6/netfilter/ip6_tables.c | 3 +- trunk/net/ipv6/netfilter/ip6t_LOG.c | 23 +- trunk/net/ipv6/netfilter/ip6table_mangle.c | 9 +- .../netfilter/nf_conntrack_l3proto_ipv6.c | 93 +- .../netfilter/nf_conntrack_proto_icmpv6.c | 40 +- trunk/net/ipv6/netfilter/nf_conntrack_reasm.c | 26 +- trunk/net/ipv6/proc.c | 18 - trunk/net/ipv6/raw.c | 25 +- trunk/net/ipv6/reassembly.c | 87 +- trunk/net/ipv6/route.c | 97 +- trunk/net/ipv6/sit.c | 22 +- trunk/net/ipv6/tcp_ipv6.c | 607 +-- trunk/net/ipv6/tunnel6.c | 2 +- trunk/net/ipv6/udp.c | 426 +- trunk/net/ipv6/udp_impl.h | 34 - trunk/net/ipv6/udplite.c | 105 - trunk/net/ipv6/xfrm6_policy.c | 3 +- trunk/net/ipv6/xfrm6_tunnel.c | 8 +- trunk/net/irda/discovery.c | 1 - trunk/net/irda/iriap.c | 12 +- trunk/net/irda/irias_object.c | 4 +- trunk/net/irda/irlan/irlan_common.c | 2 +- trunk/net/irda/irlmp.c | 4 +- trunk/net/irda/irqueue.c | 3 +- trunk/net/irda/irttp.c | 5 +- trunk/net/key/af_key.c | 42 +- trunk/net/llc/af_llc.c | 2 +- trunk/net/llc/llc_input.c | 4 +- trunk/net/netfilter/Kconfig | 193 +- trunk/net/netfilter/Makefile | 17 +- trunk/net/netfilter/core.c | 31 +- trunk/net/netfilter/nf_conntrack_amanda.c | 238 - trunk/net/netfilter/nf_conntrack_core.c | 687 ++- trunk/net/netfilter/nf_conntrack_ecache.c | 93 - trunk/net/netfilter/nf_conntrack_expect.c | 442 -- trunk/net/netfilter/nf_conntrack_ftp.c | 42 +- trunk/net/netfilter/nf_conntrack_h323_main.c | 1856 -------- trunk/net/netfilter/nf_conntrack_helper.c | 155 - trunk/net/netfilter/nf_conntrack_irc.c | 281 -- .../netfilter/nf_conntrack_l3proto_generic.c | 7 +- trunk/net/netfilter/nf_conntrack_netbios_ns.c | 126 - trunk/net/netfilter/nf_conntrack_netlink.c | 207 +- trunk/net/netfilter/nf_conntrack_pptp.c | 607 --- trunk/net/netfilter/nf_conntrack_proto.c | 410 -- .../netfilter/nf_conntrack_proto_generic.c | 47 +- trunk/net/netfilter/nf_conntrack_proto_gre.c | 305 -- trunk/net/netfilter/nf_conntrack_proto_sctp.c | 182 +- trunk/net/netfilter/nf_conntrack_proto_tcp.c | 275 +- trunk/net/netfilter/nf_conntrack_proto_udp.c | 83 +- trunk/net/netfilter/nf_conntrack_sip.c | 531 --- trunk/net/netfilter/nf_conntrack_standalone.c | 444 +- trunk/net/netfilter/nf_conntrack_tftp.c | 160 - trunk/net/netfilter/nf_sysctl.c | 134 - trunk/net/netfilter/nfnetlink_log.c | 45 +- trunk/net/netfilter/nfnetlink_queue.c | 23 +- trunk/net/netfilter/x_tables.c | 1 - trunk/net/netfilter/xt_CONNMARK.c | 13 +- trunk/net/netfilter/xt_MARK.c | 12 +- trunk/net/netfilter/xt_NFLOG.c | 86 - trunk/net/netfilter/xt_mark.c | 2 +- trunk/net/netfilter/xt_multiport.c | 9 +- trunk/net/netfilter/xt_sctp.c | 2 +- trunk/net/netfilter/xt_tcpudp.c | 20 +- trunk/net/netlabel/netlabel_cipso_v4.c | 47 +- trunk/net/netlabel/netlabel_domainhash.c | 48 +- trunk/net/netlabel/netlabel_kapi.c | 212 +- trunk/net/netlabel/netlabel_mgmt.c | 42 +- trunk/net/netlabel/netlabel_unlabeled.c | 48 +- trunk/net/netlabel/netlabel_user.c | 7 - trunk/net/netlabel/netlabel_user.h | 31 + trunk/net/netlink/af_netlink.c | 14 +- trunk/net/netlink/genetlink.c | 70 +- trunk/net/netrom/nr_route.c | 12 +- trunk/net/packet/af_packet.c | 19 +- trunk/net/rose/rose_route.c | 4 +- trunk/net/rxrpc/transport.c | 1 + trunk/net/sched/Kconfig | 6 +- trunk/net/sched/Makefile | 3 +- trunk/net/sched/act_gact.c | 4 +- trunk/net/sched/act_ipt.c | 6 +- trunk/net/sched/act_police.c | 26 +- trunk/net/sched/act_simple.c | 3 +- trunk/net/sched/cls_api.c | 3 +- trunk/net/sched/cls_fw.c | 6 +- trunk/net/sched/cls_rsvp.h | 16 +- trunk/net/sched/cls_u32.c | 2 +- trunk/net/sched/em_meta.c | 13 +- trunk/net/sched/em_nbyte.c | 4 +- trunk/net/sched/ematch.c | 3 +- trunk/net/sched/sch_api.c | 41 +- trunk/net/sched/sch_atm.c | 5 +- trunk/net/sched/sch_cbq.c | 10 +- trunk/net/sched/sch_dsmark.c | 9 +- trunk/net/sched/sch_generic.c | 10 +- trunk/net/sched/sch_hfsc.c | 27 +- trunk/net/sched/sch_htb.c | 36 +- trunk/net/sched/sch_netem.c | 10 +- trunk/net/sched/sch_prio.c | 14 +- trunk/net/sched/sch_red.c | 14 +- trunk/net/sched/sch_sfq.c | 3 - trunk/net/sched/sch_tbf.c | 16 +- trunk/net/sctp/associola.c | 22 +- trunk/net/sctp/bind_addr.c | 4 +- trunk/net/sctp/endpointola.c | 11 +- trunk/net/sctp/input.c | 6 +- trunk/net/sctp/ipv6.c | 24 +- trunk/net/sctp/outqueue.c | 4 +- trunk/net/sctp/proc.c | 6 +- trunk/net/sctp/protocol.c | 24 +- trunk/net/sctp/sm_make_chunk.c | 65 +- trunk/net/sctp/sm_sideeffect.c | 8 +- trunk/net/sctp/sm_statefuns.c | 55 +- trunk/net/sctp/sm_statetable.c | 696 +-- trunk/net/sctp/socket.c | 77 +- trunk/net/sctp/tsnmap.c | 9 +- trunk/net/sctp/ulpevent.c | 2 +- trunk/net/socket.c | 6 + trunk/net/sunrpc/auth_gss/auth_gss.c | 3 +- trunk/net/sunrpc/auth_gss/gss_krb5_mech.c | 3 +- trunk/net/sunrpc/auth_gss/gss_spkm3_mech.c | 3 +- trunk/net/sunrpc/auth_gss/svcauth_gss.c | 7 +- trunk/net/sunrpc/clnt.c | 3 +- trunk/net/sunrpc/socklib.c | 7 +- trunk/net/sunrpc/svcauth_unix.c | 8 +- trunk/net/tipc/bcast.c | 6 +- trunk/net/tipc/config.c | 32 +- trunk/net/tipc/dbg.c | 3 +- trunk/net/tipc/name_distr.c | 10 +- trunk/net/tipc/node.c | 12 +- trunk/net/tipc/subscr.c | 3 +- trunk/net/unix/af_unix.c | 3 +- trunk/net/xfrm/xfrm_policy.c | 38 +- trunk/net/xfrm/xfrm_state.c | 2 +- trunk/net/xfrm/xfrm_user.c | 105 +- trunk/security/dummy.c | 17 +- trunk/security/selinux/hooks.c | 152 +- trunk/security/selinux/include/av_inherit.h | 1 - .../selinux/include/av_perm_to_string.h | 8 - .../security/selinux/include/av_permissions.h | 32 - .../selinux/include/class_to_string.h | 2 - trunk/security/selinux/include/flask.h | 2 - trunk/security/selinux/include/objsec.h | 2 - trunk/security/selinux/include/security.h | 4 - .../selinux/include/selinux_netlabel.h | 43 +- trunk/security/selinux/include/xfrm.h | 28 +- trunk/security/selinux/nlmsgtab.c | 1 + trunk/security/selinux/ss/ebitmap.c | 198 +- trunk/security/selinux/ss/ebitmap.h | 26 +- trunk/security/selinux/ss/mls.c | 156 +- trunk/security/selinux/ss/mls.h | 46 +- trunk/security/selinux/ss/policydb.c | 6 +- trunk/security/selinux/ss/services.c | 234 +- trunk/security/selinux/xfrm.c | 207 +- trunk/sound/oss/cs46xx.c | 1 - trunk/sound/oss/dmabuf.c | 1 - trunk/sound/oss/emu10k1/audio.c | 1 - trunk/sound/oss/es1371.c | 1 - trunk/sound/oss/i810_audio.c | 1 - trunk/sound/oss/soundcard.c | 1 - trunk/sound/oss/sscape.c | 1 - trunk/sound/oss/trident.c | 1 - 972 files changed, 36586 insertions(+), 60538 deletions(-) create mode 100644 trunk/Documentation/ftape.txt delete mode 100644 trunk/Documentation/networking/udplite.txt delete mode 100644 trunk/arch/s390/kernel/reset.S delete mode 100644 trunk/arch/s390/lib/uaccess_pt.c create mode 100644 trunk/drivers/ata/pata_winbond.c create mode 100644 trunk/drivers/char/ftape/Kconfig create mode 100644 trunk/drivers/char/ftape/Makefile create mode 100644 trunk/drivers/char/ftape/README.PCI create mode 100644 trunk/drivers/char/ftape/RELEASE-NOTES create mode 100644 trunk/drivers/char/ftape/compressor/Makefile create mode 100644 trunk/drivers/char/ftape/compressor/lzrw3.c create mode 100644 trunk/drivers/char/ftape/compressor/lzrw3.h create mode 100644 trunk/drivers/char/ftape/compressor/zftape-compress.c create mode 100644 trunk/drivers/char/ftape/compressor/zftape-compress.h create mode 100644 trunk/drivers/char/ftape/lowlevel/Makefile create mode 100644 trunk/drivers/char/ftape/lowlevel/fc-10.c create mode 100644 trunk/drivers/char/ftape/lowlevel/fc-10.h create mode 100644 trunk/drivers/char/ftape/lowlevel/fdc-io.c create mode 100644 trunk/drivers/char/ftape/lowlevel/fdc-io.h create mode 100644 trunk/drivers/char/ftape/lowlevel/fdc-isr.c create mode 100644 trunk/drivers/char/ftape/lowlevel/fdc-isr.h create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-bsm.c create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-bsm.h create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-buffer.c create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-buffer.h create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-calibr.c create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-calibr.h create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-ctl.c create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-ctl.h create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-ecc.c create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-ecc.h create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-format.c create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-format.h create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-init.c create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-init.h create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-io.c create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-io.h create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-proc.c create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-proc.h create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-read.c create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-read.h create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-rw.c create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-rw.h create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-setup.c create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-tracing.c create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-tracing.h create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-write.c create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape-write.h create mode 100644 trunk/drivers/char/ftape/lowlevel/ftape_syms.c create mode 100644 trunk/drivers/char/ftape/zftape/Makefile create mode 100644 trunk/drivers/char/ftape/zftape/zftape-buffers.c create mode 100644 trunk/drivers/char/ftape/zftape/zftape-buffers.h create mode 100644 trunk/drivers/char/ftape/zftape/zftape-ctl.c create mode 100644 trunk/drivers/char/ftape/zftape/zftape-ctl.h create mode 100644 trunk/drivers/char/ftape/zftape/zftape-eof.c create mode 100644 trunk/drivers/char/ftape/zftape/zftape-eof.h create mode 100644 trunk/drivers/char/ftape/zftape/zftape-init.c create mode 100644 trunk/drivers/char/ftape/zftape/zftape-init.h create mode 100644 trunk/drivers/char/ftape/zftape/zftape-read.c create mode 100644 trunk/drivers/char/ftape/zftape/zftape-read.h create mode 100644 trunk/drivers/char/ftape/zftape/zftape-rw.c create mode 100644 trunk/drivers/char/ftape/zftape/zftape-rw.h create mode 100644 trunk/drivers/char/ftape/zftape/zftape-vtbl.c create mode 100644 trunk/drivers/char/ftape/zftape/zftape-vtbl.h create mode 100644 trunk/drivers/char/ftape/zftape/zftape-write.c create mode 100644 trunk/drivers/char/ftape/zftape/zftape-write.h create mode 100644 trunk/drivers/char/ftape/zftape/zftape_syms.c create mode 100644 trunk/drivers/mmc/omap.h delete mode 100644 trunk/drivers/net/bnx2_fw2.h delete mode 100644 trunk/drivers/net/chelsio/fpga_defs.h delete mode 100644 trunk/drivers/net/chelsio/ixf1010.c delete mode 100644 trunk/drivers/net/chelsio/mac.c delete mode 100644 trunk/drivers/net/chelsio/mv88e1xxx.c delete mode 100644 trunk/drivers/net/chelsio/mv88e1xxx.h delete mode 100644 trunk/drivers/net/chelsio/my3126.c delete mode 100644 trunk/drivers/net/chelsio/tp.c delete mode 100644 trunk/drivers/net/chelsio/tp.h delete mode 100644 trunk/drivers/net/chelsio/vsc7326.c delete mode 100644 trunk/drivers/net/chelsio/vsc7326_reg.h delete mode 100644 trunk/drivers/net/chelsio/vsc8244.c delete mode 100644 trunk/drivers/net/chelsio/vsc8244_reg.h delete mode 100644 trunk/drivers/net/lib8390.c delete mode 100644 trunk/drivers/net/macb.c delete mode 100644 trunk/drivers/net/macb.h delete mode 100644 trunk/drivers/net/netxen/Makefile delete mode 100644 trunk/drivers/net/netxen/netxen_nic.h delete mode 100644 trunk/drivers/net/netxen/netxen_nic_ethtool.c delete mode 100644 trunk/drivers/net/netxen/netxen_nic_hdr.h delete mode 100644 trunk/drivers/net/netxen/netxen_nic_hw.c delete mode 100644 trunk/drivers/net/netxen/netxen_nic_hw.h delete mode 100644 trunk/drivers/net/netxen/netxen_nic_init.c delete mode 100644 trunk/drivers/net/netxen/netxen_nic_ioctl.h delete mode 100644 trunk/drivers/net/netxen/netxen_nic_isr.c delete mode 100644 trunk/drivers/net/netxen/netxen_nic_main.c delete mode 100644 trunk/drivers/net/netxen/netxen_nic_niu.c delete mode 100644 trunk/drivers/net/netxen/netxen_nic_phan_reg.h delete mode 100644 trunk/drivers/net/phy/broadcom.c delete mode 100644 trunk/drivers/net/tsi108_eth.c delete mode 100644 trunk/drivers/net/tsi108_eth.h delete mode 100644 trunk/include/asm-s390/reset.h create mode 100644 trunk/include/linux/divert.h create mode 100644 trunk/include/linux/ftape-header-segment.h create mode 100644 trunk/include/linux/ftape-vendors.h create mode 100644 trunk/include/linux/ftape.h delete mode 100644 trunk/include/linux/netfilter/nf_conntrack_amanda.h delete mode 100644 trunk/include/linux/netfilter/nf_conntrack_h323.h delete mode 100644 trunk/include/linux/netfilter/nf_conntrack_irc.h delete mode 100644 trunk/include/linux/netfilter/nf_conntrack_pptp.h delete mode 100644 trunk/include/linux/netfilter/nf_conntrack_proto_gre.h delete mode 100644 trunk/include/linux/netfilter/nf_conntrack_sip.h delete mode 100644 trunk/include/linux/netfilter/nf_conntrack_tftp.h delete mode 100644 trunk/include/linux/netfilter/xt_NFLOG.h delete mode 100644 trunk/include/linux/netfilter/xt_hashlimit.h rename trunk/include/linux/{netfilter/nf_conntrack_h323_asn1.h => netfilter_ipv4/ip_conntrack_helper_h323_asn1.h} (92%) rename trunk/include/linux/{netfilter/nf_conntrack_h323_types.h => netfilter_ipv4/ip_conntrack_helper_h323_types.h} (98%) create mode 100644 trunk/include/linux/zftape.h delete mode 100644 trunk/include/net/netfilter/ipv6/nf_conntrack_ipv6.h delete mode 100644 trunk/include/net/netfilter/nf_conntrack_ecache.h delete mode 100644 trunk/include/net/netfilter/nf_conntrack_expect.h rename trunk/include/net/netfilter/{nf_conntrack_l4proto.h => nf_conntrack_protocol.h} (71%) delete mode 100644 trunk/include/net/netfilter/nf_nat.h delete mode 100644 trunk/include/net/netfilter/nf_nat_core.h delete mode 100644 trunk/include/net/netfilter/nf_nat_helper.h delete mode 100644 trunk/include/net/netfilter/nf_nat_protocol.h delete mode 100644 trunk/include/net/netfilter/nf_nat_rule.h delete mode 100644 trunk/include/net/udplite.h create mode 100644 trunk/net/atm/ipcommon.c create mode 100644 trunk/net/atm/ipcommon.h create mode 100644 trunk/net/core/dv.c delete mode 100644 trunk/net/core/kmap_skb.h rename trunk/net/{netfilter/nf_conntrack_h323_asn1.c => ipv4/netfilter/ip_conntrack_helper_h323_asn1.c} (99%) rename trunk/net/{netfilter/nf_conntrack_h323_types.c => ipv4/netfilter/ip_conntrack_helper_h323_types.c} (99%) rename trunk/net/{netfilter/xt_hashlimit.c => ipv4/netfilter/ipt_hashlimit.c} (55%) delete mode 100644 trunk/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c delete mode 100644 trunk/net/ipv4/netfilter/nf_nat_amanda.c delete mode 100644 trunk/net/ipv4/netfilter/nf_nat_core.c delete mode 100644 trunk/net/ipv4/netfilter/nf_nat_ftp.c delete mode 100644 trunk/net/ipv4/netfilter/nf_nat_h323.c delete mode 100644 trunk/net/ipv4/netfilter/nf_nat_helper.c delete mode 100644 trunk/net/ipv4/netfilter/nf_nat_irc.c delete mode 100644 trunk/net/ipv4/netfilter/nf_nat_pptp.c delete mode 100644 trunk/net/ipv4/netfilter/nf_nat_proto_gre.c delete mode 100644 trunk/net/ipv4/netfilter/nf_nat_proto_icmp.c delete mode 100644 trunk/net/ipv4/netfilter/nf_nat_proto_tcp.c delete mode 100644 trunk/net/ipv4/netfilter/nf_nat_proto_udp.c delete mode 100644 trunk/net/ipv4/netfilter/nf_nat_proto_unknown.c delete mode 100644 trunk/net/ipv4/netfilter/nf_nat_rule.c delete mode 100644 trunk/net/ipv4/netfilter/nf_nat_sip.c delete mode 100644 trunk/net/ipv4/netfilter/nf_nat_snmp_basic.c delete mode 100644 trunk/net/ipv4/netfilter/nf_nat_standalone.c delete mode 100644 trunk/net/ipv4/netfilter/nf_nat_tftp.c delete mode 100644 trunk/net/ipv4/udp_impl.h delete mode 100644 trunk/net/ipv4/udplite.c delete mode 100644 trunk/net/ipv6/udp_impl.h delete mode 100644 trunk/net/ipv6/udplite.c delete mode 100644 trunk/net/netfilter/nf_conntrack_amanda.c delete mode 100644 trunk/net/netfilter/nf_conntrack_ecache.c delete mode 100644 trunk/net/netfilter/nf_conntrack_expect.c delete mode 100644 trunk/net/netfilter/nf_conntrack_h323_main.c delete mode 100644 trunk/net/netfilter/nf_conntrack_helper.c delete mode 100644 trunk/net/netfilter/nf_conntrack_irc.c delete mode 100644 trunk/net/netfilter/nf_conntrack_netbios_ns.c delete mode 100644 trunk/net/netfilter/nf_conntrack_pptp.c delete mode 100644 trunk/net/netfilter/nf_conntrack_proto.c delete mode 100644 trunk/net/netfilter/nf_conntrack_proto_gre.c delete mode 100644 trunk/net/netfilter/nf_conntrack_sip.c delete mode 100644 trunk/net/netfilter/nf_conntrack_tftp.c delete mode 100644 trunk/net/netfilter/nf_sysctl.c delete mode 100644 trunk/net/netfilter/xt_NFLOG.c diff --git a/[refs] b/[refs] index 60a07ecad59e..d1b2a4fa96e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a80958f4849316a18c06f75b9e850ccecbf20df8 +refs/heads/master: 7e45b0e5f6f68d04311ba7813f5f5457c9119640 diff --git a/trunk/CREDITS b/trunk/CREDITS index d0880082c19b..ccd4f9f4dd71 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -2598,9 +2598,6 @@ S: Ucitelska 1576 S: Prague 8 S: 182 00 Czech Republic -N: Rick Payne -D: RFC2385 Support for TCP - N: Barak A. Pearlmutter E: bap@cs.unm.edu W: http://www.cs.unm.edu/~bap/ diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX index f08ca9535733..02457ec9c94f 100644 --- a/trunk/Documentation/00-INDEX +++ b/trunk/Documentation/00-INDEX @@ -104,6 +104,8 @@ firmware_class/ - request_firmware() hotplug interface info. floppy.txt - notes and driver options for the floppy disk driver. +ftape.txt + - notes about the floppy tape device driver. hayes-esp.txt - info on using the Hayes ESP serial driver. highuid.txt diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 226ecf2ffd56..d52c4aaaf17f 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -70,6 +70,18 @@ Who: Dominik Brodowski --------------------------- +What: ip_queue and ip6_queue (old ipv4-only and ipv6-only netfilter queue) +When: December 2005 +Why: This interface has been obsoleted by the new layer3-independent + "nfnetlink_queue". The Kernel interface is compatible, so the old + ip[6]tables "QUEUE" targets still work and will transparently handle + all packets into nfnetlink queue number 0. Userspace users will have + to link against API-compatible library on top of libnfnetlink_queue + instead of the current 'libipq'. +Who: Harald Welte + +--------------------------- + What: remove EXPORT_SYMBOL(kernel_thread) When: August 2006 Files: arch/*/kernel/*_ksyms.c @@ -215,6 +227,21 @@ Who: Patrick McHardy --------------------------- +What: frame diverter +When: November 2006 +Why: The frame diverter is included in most distribution kernels, but is + broken. It does not correctly handle many things: + - IPV6 + - non-linear skb's + - network device RCU on removal + - input frames not correctly checked for protocol errors + It also adds allocation overhead even if not enabled. + It is not clear if anyone is still using it. +Who: Stephen Hemminger + +--------------------------- + + What: PHYSDEVPATH, PHYSDEVBUS, PHYSDEVDRIVER in the uevent environment When: October 2008 Why: The stacking of class devices makes these values misleading and @@ -234,11 +261,10 @@ Who: Jean Delvare --------------------------- -What: IPv4 only connection tracking/NAT/helpers -When: 2.6.22 -Why: The new layer 3 independant connection tracking replaces the old - IPv4 only version. After some stabilization of the new code the - old one will be removed. -Who: Patrick McHardy +What: ftape +When: 2.6.20 +Why: Orphaned for ages. SMP bugs long unfixed. Few users left + in the world. +Who: Jeff Garzik --------------------------- diff --git a/trunk/Documentation/ftape.txt b/trunk/Documentation/ftape.txt new file mode 100644 index 000000000000..7d8bb3384031 --- /dev/null +++ b/trunk/Documentation/ftape.txt @@ -0,0 +1,307 @@ +Intro +===== + +This file describes some issues involved when using the "ftape" +floppy tape device driver that comes with the Linux kernel. + +ftape has a home page at + +http://ftape.dot-heine.de/ + +which contains further information about ftape. Please cross check +this WWW address against the address given (if any) in the MAINTAINERS +file located in the top level directory of the Linux kernel source +tree. + +NOTE: This is an unmaintained set of drivers, and it is not guaranteed to work. +If you are interested in taking over maintenance, contact Claus-Justus Heine +, the former maintainer. + +Contents +======== + +A minus 1: Ftape documentation + +A. Changes + 1. Goal + 2. I/O Block Size + 3. Write Access when not at EOD (End Of Data) or BOT (Begin Of Tape) + 4. Formatting + 5. Interchanging cartridges with other operating systems + +B. Debugging Output + 1. Introduction + 2. Tuning the debugging output + +C. Boot and load time configuration + 1. Setting boot time parameters + 2. Module load time parameters + 3. Ftape boot- and load time options + 4. Example kernel parameter setting + 5. Example module parameter setting + +D. Support and contacts + +******************************************************************************* + +A minus 1. Ftape documentation +============================== + +Unluckily, the ftape-HOWTO is out of date. This really needs to be +changed. Up to date documentation as well as recent development +versions of ftape and useful links to related topics can be found at +the ftape home page at + +http://ftape.dot-heine.de/ + +******************************************************************************* + +A. Changes +========== + +1. Goal + ~~~~ + The goal of all that incompatibilities was to give ftape an interface + that resembles the interface provided by SCSI tape drives as close + as possible. Thus any Unix backup program that is known to work + with SCSI tape drives should also work. + + The concept of a fixed block size for read/write transfers is + rather unrelated to this SCSI tape compatibility at the file system + interface level. It developed out of a feature of zftape, a + block wise user transparent on-the-fly compression. That compression + support will not be dropped in future releases for compatibility + reasons with previous releases of zftape. + +2. I/O Block Size + ~~~~~~~~~~~~~~ + The block size defaults to 10k which is the default block size of + GNU tar. + + The block size can be tuned either during kernel configuration or + at runtime with the MTIOCTOP ioctl using the MTSETBLK operation + (i.e. do "mt -f /dev/qft0" setblk #BLKSZ). A block size of 0 + switches to variable block size mode i.e. "mt setblk 0" switches + off the block size restriction. However, this disables zftape's + built in on-the-fly compression which doesn't work with variable + block size mode. + + The BLKSZ parameter must be given as a byte count and must be a + multiple of 32k or 0, i.e. use "mt setblk 32768" to switch to a + block size of 32k. + + The typical symptom of a block size mismatch is an "invalid + argument" error message. + +3. Write Access when not at EOD (End Of Data) or BOT (Begin Of Tape) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + zftape (the file system interface of ftape-3.x) denies write access + to the tape cartridge when it isn't positioned either at BOT or + EOD. + +4. Formatting + ~~~~~~~~~~ + ftape DOES support formatting of floppy tape cartridges. You need the + `ftformat' program that is shipped with the modules version of ftape. + Please get the latest version of ftape from + + ftp://sunsite.unc.edu/pub/Linux/kernel/tapes + + or from the ftape home page at + + http://ftape.dot-heine.de/ + + `ftformat' is contained in the `./contrib/' subdirectory of that + separate ftape package. + +5. Interchanging cartridges with other operating systems + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + The internal emulation of Unix tape device file marks has changed + completely. ftape now uses the volume table segment as specified + by the QIC-40/80/3010/3020/113 standards to emulate file marks. As + a consequence there is limited support to interchange cartridges + with other operating systems. + + To be more precise: ftape will detect volumes written by other OS's + programs and other OS's programs will detect volumes written by + ftape. + + However, it isn't possible to extract the data dumped to the tape + by some MSDOS program with ftape. This exceeds the scope of a + kernel device driver. If you need such functionality, then go ahead + and write a user space utility that is able to do that. ftape already + provides all kernel level support necessary to do that. + +******************************************************************************* + +B. Debugging Output + ================ + +1. Introduction + ~~~~~~~~~~~~ + The ftape driver can be very noisy in that is can print lots of + debugging messages to the kernel log files and the system console. + While this is useful for debugging it might be annoying during + normal use and enlarges the size of the driver by several kilobytes. + + To reduce the size of the driver you can trim the maximal amount of + debugging information available during kernel configuration. Please + refer to the kernel configuration script and its on-line help + functionality. + + The amount of debugging output maps to the "tracing" boot time + option and the "ft_tracing" modules option as follows: + + 0 bugs + 1 + errors (with call-stack dump) + 2 + warnings + 3 + information + 4 + more information + 5 + program flow + 6 + fdc/dma info + 7 + data flow + 8 + everything else + +2. Tuning the debugging output + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ + To reduce the amount of debugging output printed to the system + console you can + + i) trim the debugging output at run-time with + + mt -f /dev/nqft0 setdensity #DBGLVL + + where "#DBGLVL" is a number between 0 and 9 + + ii) trim the debugging output at module load time with + + modprobe ftape ft_tracing=#DBGLVL + + Of course, this applies only if you have configured ftape to be + compiled as a module. + + iii) trim the debugging output during system boot time. Add the + following to the kernel command line: + + ftape=#DBGLVL,tracing + + Please refer also to the next section if you don't know how to + set boot time parameters. + +******************************************************************************* + +C. Boot and load time configuration + ================================ + +1. Setting boot time parameters + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Assuming that you use lilo, the LI)nux LO)ader, boot time kernel + parameters can be set by adding a line + + append some_kernel_boot_time_parameter + + to `/etc/lilo.conf' or at real boot time by typing in the options + at the prompt provided by LILO. I can't give you advice on how to + specify those parameters with other loaders as I don't use them. + + For ftape, each "some_kernel_boot_time_parameter" looks like + "ftape=value,option". As an example, the debugging output can be + increased with + + ftape=4,tracing + + NOTE: the value precedes the option name. + +2. Module load time parameters + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Module parameters can be specified either directly when invoking + the program 'modprobe' at the shell prompt: + + modprobe ftape ft_tracing=4 + + or by editing the file `/etc/modprobe.conf' in which case they take + effect each time when the module is loaded with `modprobe' (please + refer to the respective manual pages). Thus, you should add a line + + options ftape ft_tracing=4 + + to `/etc/modprobe.conf` if you intend to increase the debugging + output of the driver. + + +3. Ftape boot- and load time options + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + i. Controlling the amount of debugging output + DBGLVL has to be replaced by a number between 0 and 8. + + module | kernel command line + -----------------------|---------------------- + ft_tracing=DBGLVL | ftape=DBGLVL,tracing + + ii. Hardware setup + BASE is the base address of your floppy disk controller, + IRQ and DMA give its interrupt and DMA channel, respectively. + BOOL is an integer, "0" means "no"; any other value means + "yes". You don't need to specify anything if connecting your tape + drive to the standard floppy disk controller. All of these + values have reasonable defaults. The defaults can be modified + during kernel configuration, i.e. while running "make config", + "make menuconfig" or "make xconfig" in the top level directory + of the Linux kernel source tree. Please refer also to the on + line documentation provided during that kernel configuration + process. + + ft_probe_fc10 is set to a non-zero value if you wish for ftape to + probe for a Colorado FC-10 or FC-20 controller. + + ft_mach2 is set to a non-zero value if you wish for ftape to probe + for a Mountain MACH-2 controller. + + module | kernel command line + -----------------------|---------------------- + ft_fdc_base=BASE | ftape=BASE,ioport + ft_fdc_irq=IRQ | ftape=IRQ,irq + ft_fdc_dma=DMA | ftape=DMA,dma + ft_probe_fc10=BOOL | ftape=BOOL,fc10 + ft_mach2=BOOL | ftape=BOOL,mach2 + ft_fdc_threshold=THR | ftape=THR,threshold + ft_fdc_rate_limit=RATE | ftape=RATE,datarate + +4. Example kernel parameter setting + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + To configure ftape to probe for a Colorado FC-10/FC-20 controller + and to increase the amount of debugging output a little bit, add + the following line to `/etc/lilo.conf': + + append ftape=1,fc10 ftape=4,tracing + +5. Example module parameter setting + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + To do the same, but with ftape compiled as a loadable kernel + module, add the following line to `/etc/modprobe.conf': + + options ftape ft_probe_fc10=1 ft_tracing=4 + +******************************************************************************* + +D. Support and contacts + ==================== + + Ftape is distributed under the GNU General Public License. There is + absolutely no warranty for this software. However, you can reach + the current maintainer of the ftape package under the email address + given in the MAINTAINERS file which is located in the top level + directory of the Linux kernel source tree. There you'll find also + the relevant mailing list to use as a discussion forum and the web + page to query for the most recent documentation, related work and + development versions of ftape. + + Changelog: + ========== + +~1996: Original Document + +10-24-2004: General cleanup and updating, noting additional module options. + James Nelson diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 15e4fed127f6..67473849f20e 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -557,6 +557,9 @@ and is between 256 and 4096 characters. It is defined in the file floppy= [HW] See Documentation/floppy.txt. + ftape= [HW] Floppy Tape subsystem debugging options. + See Documentation/ftape.txt. + gamecon.map[2|3]= [HW,JOY] Multisystem joystick and NES/SNES/PSX pad support via parallel port (up to 5 devices per port) diff --git a/trunk/Documentation/networking/dccp.txt b/trunk/Documentation/networking/dccp.txt index dda15886bcb5..74563b38ffd9 100644 --- a/trunk/Documentation/networking/dccp.txt +++ b/trunk/Documentation/networking/dccp.txt @@ -19,17 +19,21 @@ for real time and multimedia traffic. It has a base protocol and pluggable congestion control IDs (CCIDs). -It is at experimental RFC status and the homepage for DCCP as a protocol is at: - http://www.read.cs.ucla.edu/dccp/ +It is at draft RFC status and the homepage for DCCP as a protocol is at: + http://www.icir.org/kohler/dcp/ Missing features ================ The DCCP implementation does not currently have all the features that are in -the RFC. +the draft RFC. -The known bugs are at: - http://linux-net.osdl.org/index.php/TODO#DCCP +In particular the following are missing: +- CCID2 support +- feature negotiation + +When testing against other implementations it appears that elapsed time +options are not coded compliant to the specification. Socket options ============== @@ -43,70 +47,12 @@ the socket will fall back to 0 (which means that no meaningful service code is present). Connecting sockets set at most one service option; for listening sockets, multiple service codes can be specified. -DCCP_SOCKOPT_SEND_CSCOV and DCCP_SOCKOPT_RECV_CSCOV are used for setting the -partial checksum coverage (RFC 4340, sec. 9.2). The default is that checksums -always cover the entire packet and that only fully covered application data is -accepted by the receiver. Hence, when using this feature on the sender, it must -be enabled at the receiver, too with suitable choice of CsCov. - -DCCP_SOCKOPT_SEND_CSCOV sets the sender checksum coverage. Values in the - range 0..15 are acceptable. The default setting is 0 (full coverage), - values between 1..15 indicate partial coverage. -DCCP_SOCKOPT_SEND_CSCOV is for the receiver and has a different meaning: it - sets a threshold, where again values 0..15 are acceptable. The default - of 0 means that all packets with a partial coverage will be discarded. - Values in the range 1..15 indicate that packets with minimally such a - coverage value are also acceptable. The higher the number, the more - restrictive this setting (see [RFC 4340, sec. 9.2.1]). - -Sysctl variables -================ -Several DCCP default parameters can be managed by the following sysctls -(sysctl net.dccp.default or /proc/sys/net/dccp/default): - -request_retries - The number of active connection initiation retries (the number of - Requests minus one) before timing out. In addition, it also governs - the behaviour of the other, passive side: this variable also sets - the number of times DCCP repeats sending a Response when the initial - handshake does not progress from RESPOND to OPEN (i.e. when no Ack - is received after the initial Request). This value should be greater - than 0, suggested is less than 10. Analogue of tcp_syn_retries. - -retries1 - How often a DCCP Response is retransmitted until the listening DCCP - side considers its connecting peer dead. Analogue of tcp_retries1. - -retries2 - The number of times a general DCCP packet is retransmitted. This has - importance for retransmitted acknowledgments and feature negotiation, - data packets are never retransmitted. Analogue of tcp_retries2. - -send_ndp = 1 - Whether or not to send NDP count options (sec. 7.7.2). - -send_ackvec = 1 - Whether or not to send Ack Vector options (sec. 11.5). - -ack_ratio = 2 - The default Ack Ratio (sec. 11.3) to use. - -tx_ccid = 2 - Default CCID for the sender-receiver half-connection. - -rx_ccid = 2 - Default CCID for the receiver-sender half-connection. - -seq_window = 100 - The initial sequence window (sec. 7.5.2). - -tx_qlen = 5 - The size of the transmit buffer in packets. A value of 0 corresponds - to an unbounded transmit buffer. - Notes ===== -DCCP does not travel through NAT successfully at present on many boxes. This is -because the checksum covers the psuedo-header as per TCP and UDP. Linux NAT -support for DCCP has been added. +SELinux does not yet have support for DCCP. You will need to turn it off or +else you will get EACCES. + +DCCP does not travel through NAT successfully at present. This is because +the checksum covers the psuedo-header as per TCP and UDP. It should be +relatively trivial to add Linux NAT support for DCCP. diff --git a/trunk/Documentation/networking/e1000.txt b/trunk/Documentation/networking/e1000.txt index 61b171cf5313..5c0a5cc03998 100644 --- a/trunk/Documentation/networking/e1000.txt +++ b/trunk/Documentation/networking/e1000.txt @@ -1,7 +1,7 @@ Linux* Base Driver for the Intel(R) PRO/1000 Family of Adapters =============================================================== -September 26, 2006 +November 15, 2005 Contents @@ -9,7 +9,6 @@ Contents - In This Release - Identifying Your Adapter -- Building and Installation - Command Line Parameters - Speed and Duplex Configuration - Additional Configurations @@ -42,9 +41,6 @@ or later), lspci, and ifconfig to obtain the same information. Instructions on updating ethtool can be found in the section "Additional Configurations" later in this document. -NOTE: The Intel(R) 82562v 10/100 Network Connection only provides 10/100 -support. - Identifying Your Adapter ======================== @@ -55,27 +51,28 @@ Driver ID Guide at: http://support.intel.com/support/network/adapter/pro100/21397.htm For the latest Intel network drivers for Linux, refer to the following -website. In the search field, enter your adapter name or type, or use the +website. In the search field, enter your adapter name or type, or use the networking link on the left to search for your adapter: http://downloadfinder.intel.com/scripts-df/support_intel.asp -Command Line Parameters -======================= +Command Line Parameters ======================= If the driver is built as a module, the following optional parameters -are used by entering them on the command line with the modprobe command -using this syntax: +are used by entering them on the command line with the modprobe or insmod +command using this syntax: modprobe e1000 [