From cafc7fa49726ef890d12c518eebae1d9207ada6f Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 21 Mar 2006 15:58:17 -0800 Subject: [PATCH] --- yaml --- r: 22417 b: refs/heads/master c: e952f31bce6e9f64db01f607abc46529ba57ac9e h: refs/heads/master i: 22415: cff040d46523452762f9853636d0d42c3dd2bc8a v: v3 --- [refs] | 2 +- trunk/.gitignore | 2 + trunk/CREDITS | 2 + trunk/Documentation/Changes | 18 - trunk/Documentation/DocBook/Makefile | 2 +- trunk/Documentation/DocBook/sis900.tmpl | 585 --- trunk/Documentation/connector/connector.txt | 5 +- trunk/Documentation/dvb/avermedia.txt | 10 +- trunk/Documentation/dvb/bt8xx.txt | 140 +- trunk/Documentation/dvb/get_dvb_firmware | 23 +- trunk/Documentation/dvb/readme.txt | 32 +- .../feature-removal-schedule.txt | 25 + trunk/Documentation/networking/00-INDEX | 2 - trunk/Documentation/networking/README.ipw2100 | 12 +- trunk/Documentation/networking/README.ipw2200 | 44 +- trunk/Documentation/networking/e100.txt | 158 +- trunk/Documentation/networking/e1000.txt | 620 ++- trunk/Documentation/networking/ip-sysctl.txt | 49 +- trunk/Documentation/networking/sis900.txt | 257 - trunk/Documentation/usb/et61x251.txt | 10 +- trunk/Documentation/usb/sn9c102.txt | 11 + trunk/Documentation/usb/zc0301.txt | 254 + trunk/Documentation/video4linux/CARDLIST.cx88 | 2 + .../Documentation/video4linux/CARDLIST.em28xx | 1 + .../video4linux/CARDLIST.saa7134 | 9 + .../Documentation/video4linux/CARDLIST.tuner | 6 +- trunk/Documentation/video4linux/README.cpia2 | 130 + .../video4linux/cpia2_overview.txt | 38 + trunk/MAINTAINERS | 30 +- trunk/README | 2 +- trunk/arch/arm/common/locomo.c | 2 + trunk/arch/arm/common/sa1111.c | 2 + trunk/arch/arm/mach-realview/core.c | 28 +- trunk/arch/i386/defconfig | 1172 +++-- trunk/arch/m68knommu/kernel/vmlinux.lds.S | 10 + trunk/arch/mips/Kconfig | 6 +- trunk/arch/mips/Makefile | 231 +- trunk/arch/mips/au1000/common/cputable.c | 2 +- trunk/arch/mips/au1000/common/dbdma.c | 4 +- trunk/arch/mips/au1000/common/dma.c | 2 +- trunk/arch/mips/au1000/common/platform.c | 8 +- trunk/arch/mips/au1000/common/setup.c | 2 +- trunk/arch/mips/au1000/common/time.c | 2 +- trunk/arch/mips/cobalt/Kconfig | 7 + trunk/arch/mips/cobalt/Makefile | 2 + trunk/arch/mips/cobalt/console.c | 43 + trunk/arch/mips/cobalt/setup.c | 13 +- trunk/arch/mips/configs/atlas_defconfig | 101 +- trunk/arch/mips/configs/bigsur_defconfig | 37 +- trunk/arch/mips/configs/capcella_defconfig | 54 +- trunk/arch/mips/configs/cobalt_defconfig | 78 +- trunk/arch/mips/configs/db1000_defconfig | 52 +- trunk/arch/mips/configs/db1100_defconfig | 52 +- trunk/arch/mips/configs/db1200_defconfig | 51 +- trunk/arch/mips/configs/db1500_defconfig | 99 +- trunk/arch/mips/configs/db1550_defconfig | 56 +- trunk/arch/mips/configs/ddb5476_defconfig | 35 +- trunk/arch/mips/configs/ddb5477_defconfig | 34 +- trunk/arch/mips/configs/decstation_defconfig | 33 +- trunk/arch/mips/configs/e55_defconfig | 50 +- trunk/arch/mips/configs/ev64120_defconfig | 34 +- trunk/arch/mips/configs/ev96100_defconfig | 30 +- trunk/arch/mips/configs/ip22_defconfig | 80 +- trunk/arch/mips/configs/ip27_defconfig | 42 +- trunk/arch/mips/configs/ip32_defconfig | 46 +- trunk/arch/mips/configs/it8172_defconfig | 32 +- trunk/arch/mips/configs/ivr_defconfig | 34 +- trunk/arch/mips/configs/jaguar-atx_defconfig | 26 +- trunk/arch/mips/configs/jmr3927_defconfig | 35 +- trunk/arch/mips/configs/lasat200_defconfig | 35 +- trunk/arch/mips/configs/malta_defconfig | 95 +- trunk/arch/mips/configs/mipssim_defconfig | 31 +- trunk/arch/mips/configs/mpc30x_defconfig | 53 +- trunk/arch/mips/configs/ocelot_3_defconfig | 64 +- trunk/arch/mips/configs/ocelot_c_defconfig | 35 +- trunk/arch/mips/configs/ocelot_defconfig | 30 +- trunk/arch/mips/configs/ocelot_g_defconfig | 35 +- trunk/arch/mips/configs/pb1100_defconfig | 52 +- trunk/arch/mips/configs/pb1500_defconfig | 56 +- trunk/arch/mips/configs/pb1550_defconfig | 56 +- trunk/arch/mips/configs/pnx8550-jbs_defconfig | 48 +- .../arch/mips/configs/pnx8550-v2pci_defconfig | 68 +- trunk/arch/mips/configs/qemu_defconfig | 16 +- trunk/arch/mips/configs/rbhma4500_defconfig | 58 +- trunk/arch/mips/configs/rm200_defconfig | 103 +- .../arch/mips/configs/sb1250-swarm_defconfig | 37 +- trunk/arch/mips/configs/sead_defconfig | 22 +- trunk/arch/mips/configs/tb0226_defconfig | 68 +- trunk/arch/mips/configs/tb0229_defconfig | 56 +- trunk/arch/mips/configs/tb0287_defconfig | 1105 ----- trunk/arch/mips/configs/workpad_defconfig | 50 +- trunk/arch/mips/configs/yosemite_defconfig | 29 +- trunk/arch/mips/dec/prom/memory.c | 2 +- trunk/arch/mips/defconfig | 80 +- trunk/arch/mips/jazz/int-handler.S | 12 +- trunk/arch/mips/kernel/cpu-probe.c | 6 +- trunk/arch/mips/kernel/gdb-low.S | 2 +- trunk/arch/mips/kernel/linux32.c | 180 +- trunk/arch/mips/kernel/proc.c | 1 + trunk/arch/mips/kernel/process.c | 16 - trunk/arch/mips/kernel/setup.c | 11 - trunk/arch/mips/kernel/signal-common.h | 10 +- trunk/arch/mips/kernel/signal.c | 6 +- trunk/arch/mips/kernel/signal32.c | 46 +- trunk/arch/mips/kernel/signal_n32.c | 5 +- trunk/arch/mips/kernel/syscall.c | 7 +- trunk/arch/mips/kernel/traps.c | 2 +- trunk/arch/mips/lasat/image/romscript.normal | 5 +- trunk/arch/mips/mips-boards/generic/mipsIRQ.S | 2 +- trunk/arch/mips/mips-boards/sim/sim_IRQ.c | 2 +- trunk/arch/mips/mips-boards/sim/sim_irq.S | 2 +- trunk/arch/mips/mips-boards/sim/sim_smp.c | 2 +- trunk/arch/mips/mm/Makefile | 2 +- trunk/arch/mips/mm/c-r3k.c | 18 +- trunk/arch/mips/mm/c-r4k.c | 1 + trunk/arch/mips/mm/pg-r4k.c | 10 +- trunk/arch/mips/mm/sc-rm7k.c | 25 +- trunk/arch/mips/mm/tlb-andes.c | 259 - trunk/arch/mips/mm/tlb-r4k.c | 5 + trunk/arch/mips/mm/tlbex.c | 13 - trunk/arch/mips/momentum/jaguar_atx/reset.c | 2 +- trunk/arch/mips/momentum/jaguar_atx/setup.c | 2 +- trunk/arch/mips/momentum/ocelot_3/reset.c | 2 +- trunk/arch/mips/momentum/ocelot_c/reset.c | 2 +- trunk/arch/mips/pci/fixup-vr4133.c | 2 +- trunk/arch/mips/pci/ops-ddb5477.c | 4 +- trunk/arch/mips/pci/ops-tx4938.c | 16 +- trunk/arch/mips/pci/pci-bcm1480.c | 2 +- trunk/arch/mips/pci/pci-bcm1480ht.c | 2 +- trunk/arch/mips/pci/pci-ip27.c | 12 +- trunk/arch/mips/philips/pnx8550/common/int.c | 2 +- trunk/arch/mips/qemu/Makefile | 2 + trunk/arch/mips/qemu/q-smp.c | 48 + trunk/arch/mips/sgi-ip27/ip27-memory.c | 4 +- trunk/arch/mips/sgi-ip32/ip32-setup.c | 2 +- .../toshiba_rbtx4927/toshiba_rbtx4927_prom.c | 4 +- .../arch/mips/tx4938/toshiba_rbtx4938/setup.c | 2 +- trunk/arch/mips/vr41xx/common/bcu.c | 6 +- trunk/arch/ppc/platforms/hdpu.c | 5 +- trunk/arch/sparc/kernel/ioport.c | 40 +- trunk/arch/sparc64/Kconfig | 18 + trunk/arch/sparc64/defconfig | 25 +- trunk/arch/sparc64/kernel/Makefile | 8 +- trunk/arch/sparc64/kernel/binfmt_aout32.c | 14 +- trunk/arch/sparc64/kernel/binfmt_elf32.c | 4 +- trunk/arch/sparc64/kernel/cpu.c | 7 + trunk/arch/sparc64/kernel/devices.c | 189 +- trunk/arch/sparc64/kernel/dtlb_backend.S | 170 - trunk/arch/sparc64/kernel/dtlb_base.S | 109 - trunk/arch/sparc64/kernel/dtlb_miss.S | 39 + trunk/arch/sparc64/kernel/ebus.c | 3 +- trunk/arch/sparc64/kernel/entry.S | 331 +- trunk/arch/sparc64/kernel/etrap.S | 170 +- trunk/arch/sparc64/kernel/head.S | 254 +- trunk/arch/sparc64/kernel/irq.c | 339 +- trunk/arch/sparc64/kernel/itlb_base.S | 79 - trunk/arch/sparc64/kernel/itlb_miss.S | 39 + trunk/arch/sparc64/kernel/ktlb.S | 363 +- trunk/arch/sparc64/kernel/pci.c | 13 + trunk/arch/sparc64/kernel/pci_common.c | 301 +- trunk/arch/sparc64/kernel/pci_iommu.c | 36 +- trunk/arch/sparc64/kernel/pci_psycho.c | 23 +- trunk/arch/sparc64/kernel/pci_sabre.c | 23 +- trunk/arch/sparc64/kernel/pci_schizo.c | 24 +- trunk/arch/sparc64/kernel/pci_sun4v.c | 1147 +++++ trunk/arch/sparc64/kernel/pci_sun4v.h | 31 + trunk/arch/sparc64/kernel/pci_sun4v_asm.S | 95 + trunk/arch/sparc64/kernel/process.c | 133 +- trunk/arch/sparc64/kernel/ptrace.c | 3 + trunk/arch/sparc64/kernel/rtrap.S | 115 +- trunk/arch/sparc64/kernel/sbus.c | 10 +- trunk/arch/sparc64/kernel/setup.c | 409 +- trunk/arch/sparc64/kernel/smp.c | 418 +- trunk/arch/sparc64/kernel/sparc64_ksyms.c | 26 +- trunk/arch/sparc64/kernel/sun4v_ivec.S | 334 ++ trunk/arch/sparc64/kernel/sun4v_tlb_miss.S | 421 ++ trunk/arch/sparc64/kernel/sys_sparc.c | 297 +- trunk/arch/sparc64/kernel/sys_sparc32.c | 9 +- trunk/arch/sparc64/kernel/time.c | 373 +- trunk/arch/sparc64/kernel/trampoline.S | 238 +- trunk/arch/sparc64/kernel/traps.c | 403 +- trunk/arch/sparc64/kernel/tsb.S | 442 ++ trunk/arch/sparc64/kernel/ttable.S | 63 +- trunk/arch/sparc64/kernel/unaligned.c | 45 +- trunk/arch/sparc64/kernel/us2e_cpufreq.c | 11 +- trunk/arch/sparc64/kernel/us3_cpufreq.c | 11 +- trunk/arch/sparc64/kernel/visemul.c | 894 ++++ trunk/arch/sparc64/kernel/vmlinux.lds.S | 16 + trunk/arch/sparc64/kernel/winfixup.S | 480 +- trunk/arch/sparc64/lib/Makefile | 2 + trunk/arch/sparc64/lib/NGbzero.S | 163 + trunk/arch/sparc64/lib/NGcopy_from_user.S | 37 + trunk/arch/sparc64/lib/NGcopy_to_user.S | 40 + trunk/arch/sparc64/lib/NGmemcpy.S | 368 ++ trunk/arch/sparc64/lib/NGpage.S | 96 + trunk/arch/sparc64/lib/NGpatch.S | 33 + trunk/arch/sparc64/lib/U3patch.S | 3 +- trunk/arch/sparc64/lib/bzero.S | 18 +- trunk/arch/sparc64/lib/clear_page.S | 12 +- trunk/arch/sparc64/lib/copy_page.S | 7 +- trunk/arch/sparc64/lib/delay.c | 19 +- trunk/arch/sparc64/lib/xor.S | 300 +- trunk/arch/sparc64/math-emu/math.c | 24 +- trunk/arch/sparc64/mm/Makefile | 2 +- trunk/arch/sparc64/mm/fault.c | 15 +- trunk/arch/sparc64/mm/generic.c | 40 +- trunk/arch/sparc64/mm/hugetlbpage.c | 179 +- trunk/arch/sparc64/mm/init.c | 1447 +++--- trunk/arch/sparc64/mm/tlb.c | 64 +- trunk/arch/sparc64/mm/tsb.c | 440 ++ trunk/arch/sparc64/mm/ultra.S | 374 +- trunk/arch/sparc64/prom/cif.S | 211 +- trunk/arch/sparc64/prom/console.c | 6 + trunk/arch/sparc64/prom/init.c | 60 +- trunk/arch/sparc64/prom/misc.c | 44 +- trunk/arch/sparc64/prom/p1275.c | 11 - trunk/arch/sparc64/prom/tree.c | 9 +- trunk/arch/sparc64/solaris/misc.c | 4 +- trunk/arch/v850/kernel/vmlinux.lds.S | 8 + trunk/arch/x86_64/crypto/aes.c | 7 +- trunk/block/as-iosched.c | 144 +- trunk/block/cfq-iosched.c | 354 +- trunk/block/deadline-iosched.c | 116 +- trunk/block/elevator.c | 171 +- trunk/block/genhd.c | 31 +- trunk/block/ll_rw_blk.c | 105 +- trunk/crypto/aes.c | 7 +- trunk/crypto/api.c | 6 +- trunk/crypto/deflate.c | 3 +- trunk/crypto/des.c | 1 + trunk/crypto/serpent.c | 1 + trunk/crypto/tcrypt.h | 25 +- trunk/crypto/twofish.c | 21 +- trunk/drivers/atm/suni.c | 2 +- trunk/drivers/base/cpu.c | 2 +- trunk/drivers/base/firmware_class.c | 6 +- trunk/drivers/base/map.c | 21 +- trunk/drivers/base/platform.c | 4 +- trunk/drivers/block/loop.c | 4 +- trunk/drivers/block/pktcdvd.c | 4 +- trunk/drivers/block/ub.c | 245 +- trunk/drivers/block/umem.c | 2 +- trunk/drivers/char/Makefile | 2 +- trunk/drivers/char/drm/Kconfig | 4 +- trunk/drivers/char/ip2/Makefile | 8 + trunk/drivers/char/{ip2.c => ip2/ip2base.c} | 6 +- trunk/drivers/char/{ => ip2}/ip2main.c | 20 +- trunk/drivers/char/s3c2410-rtc.c | 4 +- trunk/drivers/char/watchdog/mpcore_wdt.c | 4 + trunk/drivers/connector/connector.c | 7 +- trunk/drivers/crypto/padlock-aes.c | 6 +- trunk/drivers/i2c/busses/i2c-iop3xx.c | 9 +- trunk/drivers/i2c/busses/i2c-mpc.c | 5 + trunk/drivers/i2c/busses/i2c-mv64xxx.c | 4 + trunk/drivers/ide/mips/au1xxx-ide.c | 5 + trunk/drivers/infiniband/core/agent.c | 19 - trunk/drivers/infiniband/core/cm.c | 42 +- trunk/drivers/infiniband/core/fmr_pool.c | 6 +- trunk/drivers/infiniband/core/mad.c | 195 +- trunk/drivers/infiniband/core/mad_priv.h | 16 +- trunk/drivers/infiniband/core/mad_rmpp.c | 148 +- trunk/drivers/infiniband/core/smi.h | 9 +- trunk/drivers/infiniband/core/sysfs.c | 36 +- trunk/drivers/infiniband/core/user_mad.c | 225 +- trunk/drivers/infiniband/core/uverbs.h | 5 +- trunk/drivers/infiniband/core/uverbs_cmd.c | 202 +- trunk/drivers/infiniband/core/uverbs_main.c | 6 +- trunk/drivers/infiniband/core/verbs.c | 259 +- trunk/drivers/infiniband/hw/mthca/mthca_av.c | 33 +- trunk/drivers/infiniband/hw/mthca/mthca_cmd.c | 323 +- trunk/drivers/infiniband/hw/mthca/mthca_cmd.h | 14 +- trunk/drivers/infiniband/hw/mthca/mthca_cq.c | 161 +- trunk/drivers/infiniband/hw/mthca/mthca_dev.h | 33 +- trunk/drivers/infiniband/hw/mthca/mthca_eq.c | 6 +- trunk/drivers/infiniband/hw/mthca/mthca_mad.c | 17 +- .../drivers/infiniband/hw/mthca/mthca_main.c | 23 +- trunk/drivers/infiniband/hw/mthca/mthca_mcg.c | 2 +- .../infiniband/hw/mthca/mthca_memfree.c | 29 +- .../infiniband/hw/mthca/mthca_memfree.h | 10 +- trunk/drivers/infiniband/hw/mthca/mthca_mr.c | 42 +- trunk/drivers/infiniband/hw/mthca/mthca_pd.c | 3 - .../infiniband/hw/mthca/mthca_profile.c | 10 +- .../infiniband/hw/mthca/mthca_provider.c | 170 +- .../infiniband/hw/mthca/mthca_provider.h | 53 +- trunk/drivers/infiniband/hw/mthca/mthca_qp.c | 448 +- trunk/drivers/infiniband/hw/mthca/mthca_srq.c | 43 +- .../drivers/infiniband/hw/mthca/mthca_user.h | 7 +- trunk/drivers/infiniband/ulp/ipoib/ipoib.h | 12 +- trunk/drivers/infiniband/ulp/ipoib/ipoib_ib.c | 10 +- .../drivers/infiniband/ulp/ipoib/ipoib_main.c | 31 +- .../infiniband/ulp/ipoib/ipoib_multicast.c | 25 +- .../infiniband/ulp/ipoib/ipoib_verbs.c | 2 +- trunk/drivers/infiniband/ulp/srp/ib_srp.c | 85 +- trunk/drivers/md/dm.c | 4 +- trunk/drivers/md/md.c | 5 +- trunk/drivers/media/common/Makefile | 1 + trunk/drivers/media/common/ir-common.c | 519 --- trunk/drivers/media/common/ir-functions.c | 272 ++ trunk/drivers/media/common/ir-keymaps.c | 1415 ++++++ trunk/drivers/media/common/saa7146_core.c | 9 +- trunk/drivers/media/common/saa7146_fops.c | 24 +- trunk/drivers/media/common/saa7146_i2c.c | 4 +- trunk/drivers/media/common/saa7146_vbi.c | 2 +- trunk/drivers/media/common/saa7146_video.c | 30 +- trunk/drivers/media/dvb/b2c2/flexcop-common.h | 4 +- trunk/drivers/media/dvb/b2c2/flexcop-i2c.c | 6 +- trunk/drivers/media/dvb/bt8xx/bt878.c | 4 +- trunk/drivers/media/dvb/bt8xx/bt878.h | 4 +- trunk/drivers/media/dvb/bt8xx/dst.c | 14 +- trunk/drivers/media/dvb/bt8xx/dst_ca.c | 6 +- trunk/drivers/media/dvb/bt8xx/dst_common.h | 3 +- trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c | 45 +- trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.h | 3 +- trunk/drivers/media/dvb/cinergyT2/cinergyT2.c | 51 +- trunk/drivers/media/dvb/dvb-core/dmxdev.c | 795 ++-- trunk/drivers/media/dvb/dvb-core/dmxdev.h | 36 +- trunk/drivers/media/dvb/dvb-core/dvb_demux.c | 104 +- trunk/drivers/media/dvb/dvb-core/dvb_demux.h | 4 +- .../drivers/media/dvb/dvb-core/dvb_frontend.c | 21 +- .../drivers/media/dvb/dvb-core/dvb_frontend.h | 1 + trunk/drivers/media/dvb/dvb-core/dvb_net.c | 14 +- .../media/dvb/dvb-core/dvb_ringbuffer.c | 2 + .../media/dvb/dvb-core/dvb_ringbuffer.h | 1 + trunk/drivers/media/dvb/dvb-usb/cxusb.c | 4 +- .../drivers/media/dvb/dvb-usb/dibusb-common.c | 4 +- trunk/drivers/media/dvb/dvb-usb/digitv.c | 4 +- .../drivers/media/dvb/dvb-usb/dvb-usb-init.c | 4 +- trunk/drivers/media/dvb/dvb-usb/dvb-usb-urb.c | 4 +- trunk/drivers/media/dvb/dvb-usb/dvb-usb.h | 9 +- trunk/drivers/media/dvb/dvb-usb/vp702x.c | 4 +- trunk/drivers/media/dvb/dvb-usb/vp7045.c | 4 +- trunk/drivers/media/dvb/frontends/Kconfig | 12 +- trunk/drivers/media/dvb/frontends/Makefile | 1 + trunk/drivers/media/dvb/frontends/bcm3510.c | 9 +- trunk/drivers/media/dvb/frontends/bsbe1.h | 123 + trunk/drivers/media/dvb/frontends/bsru6.h | 140 + trunk/drivers/media/dvb/frontends/cx24110.c | 13 + trunk/drivers/media/dvb/frontends/cx24110.h | 1 + trunk/drivers/media/dvb/frontends/dvb-pll.c | 61 +- trunk/drivers/media/dvb/frontends/dvb-pll.h | 7 +- trunk/drivers/media/dvb/frontends/lnbp21.h | 139 + trunk/drivers/media/dvb/frontends/tda1004x.c | 25 +- trunk/drivers/media/dvb/frontends/tda1004x.h | 3 +- trunk/drivers/media/dvb/frontends/zl10353.c | 311 ++ trunk/drivers/media/dvb/frontends/zl10353.h | 43 + .../media/dvb/frontends/zl10353_priv.h | 42 + trunk/drivers/media/dvb/ttpci/av7110.c | 260 +- trunk/drivers/media/dvb/ttpci/av7110.h | 7 +- trunk/drivers/media/dvb/ttpci/av7110_hw.c | 40 +- trunk/drivers/media/dvb/ttpci/av7110_v4l.c | 11 +- trunk/drivers/media/dvb/ttpci/budget-av.c | 4 + trunk/drivers/media/dvb/ttpci/budget-ci.c | 136 +- trunk/drivers/media/dvb/ttpci/budget-patch.c | 99 +- trunk/drivers/media/dvb/ttpci/budget.c | 250 +- trunk/drivers/media/dvb/ttpci/budget.h | 4 +- .../media/dvb/ttusb-budget/dvb-ttusb-budget.c | 35 +- trunk/drivers/media/dvb/ttusb-dec/ttusb_dec.c | 31 +- .../drivers/media/radio/miropcm20-rds-core.c | 11 +- trunk/drivers/media/radio/radio-aimslab.c | 20 +- trunk/drivers/media/radio/radio-aztech.c | 12 +- trunk/drivers/media/radio/radio-maestro.c | 11 +- trunk/drivers/media/radio/radio-maxiradio.c | 11 +- trunk/drivers/media/radio/radio-sf16fmi.c | 22 +- trunk/drivers/media/radio/radio-sf16fmr2.c | 22 +- trunk/drivers/media/radio/radio-typhoon.c | 12 +- trunk/drivers/media/radio/radio-zoltrix.c | 26 +- trunk/drivers/media/video/Kconfig | 54 +- trunk/drivers/media/video/Makefile | 15 +- trunk/drivers/media/video/arv.c | 16 +- trunk/drivers/media/video/bttv-cards.c | 16 +- trunk/drivers/media/video/bttv-driver.c | 48 +- trunk/drivers/media/video/bttv-input.c | 248 +- trunk/drivers/media/video/bttv-risc.c | 17 +- trunk/drivers/media/video/bw-qcam.c | 16 +- trunk/drivers/media/video/bw-qcam.h | 2 +- trunk/drivers/media/video/c-qcam.c | 19 +- trunk/drivers/media/video/cpia.c | 102 +- trunk/drivers/media/video/cpia.h | 5 +- trunk/drivers/media/video/cpia2/Kconfig | 9 + trunk/drivers/media/video/cpia2/Makefile | 3 + trunk/drivers/media/video/cpia2/cpia2.h | 497 ++ trunk/drivers/media/video/cpia2/cpia2_core.c | 2525 ++++++++++ .../media/video/cpia2/cpia2_registers.h | 476 ++ trunk/drivers/media/video/cpia2/cpia2_usb.c | 907 ++++ trunk/drivers/media/video/cpia2/cpia2_v4l.c | 2079 +++++++++ trunk/drivers/media/video/cpia2/cpia2dev.h | 50 + trunk/drivers/media/video/cpia2/cpia2patch.h | 233 + trunk/drivers/media/video/cx25840/Kconfig | 9 + trunk/drivers/media/video/cx25840/Makefile | 2 +- .../media/video/cx25840/cx25840-core.c | 46 +- .../drivers/media/video/cx25840/cx25840-vbi.c | 6 +- trunk/drivers/media/video/cx25840/cx25840.h | 1 + trunk/drivers/media/video/cx88/Kconfig | 11 + trunk/drivers/media/video/cx88/Makefile | 1 + trunk/drivers/media/video/cx88/cx88-alsa.c | 10 +- trunk/drivers/media/video/cx88/cx88-cards.c | 111 +- trunk/drivers/media/video/cx88/cx88-core.c | 9 +- trunk/drivers/media/video/cx88/cx88-dvb.c | 108 +- trunk/drivers/media/video/cx88/cx88-input.c | 339 +- trunk/drivers/media/video/cx88/cx88-video.c | 57 +- trunk/drivers/media/video/cx88/cx88.h | 8 +- trunk/drivers/media/video/dpc7146.c | 58 +- trunk/drivers/media/video/em28xx/Kconfig | 1 + .../drivers/media/video/em28xx/em28xx-cards.c | 72 +- trunk/drivers/media/video/em28xx/em28xx-i2c.c | 1 - .../drivers/media/video/em28xx/em28xx-input.c | 85 - .../drivers/media/video/em28xx/em28xx-video.c | 1613 +++---- trunk/drivers/media/video/em28xx/em28xx.h | 9 +- trunk/drivers/media/video/hexium_gemini.c | 10 +- trunk/drivers/media/video/hexium_orion.c | 18 +- trunk/drivers/media/video/ir-kbd-i2c.c | 50 +- trunk/drivers/media/video/meye.c | 112 +- trunk/drivers/media/video/meye.h | 4 +- trunk/drivers/media/video/msp3400-driver.c | 76 +- trunk/drivers/media/video/msp3400-kthreads.c | 333 +- trunk/drivers/media/video/msp3400.h | 10 +- trunk/drivers/media/video/mxb.c | 150 +- trunk/drivers/media/video/mxb.h | 2 +- trunk/drivers/media/video/planb.c | 8 +- trunk/drivers/media/video/planb.h | 2 +- trunk/drivers/media/video/pms.c | 28 +- trunk/drivers/media/video/saa5246a.c | 10 +- trunk/drivers/media/video/saa5249.c | 10 +- trunk/drivers/media/video/saa7115.c | 107 +- .../media/video/saa7134/saa7134-alsa.c | 9 +- .../media/video/saa7134/saa7134-cards.c | 294 +- .../media/video/saa7134/saa7134-core.c | 31 +- .../drivers/media/video/saa7134/saa7134-dvb.c | 182 +- .../media/video/saa7134/saa7134-empress.c | 8 +- .../media/video/saa7134/saa7134-input.c | 507 +- .../drivers/media/video/saa7134/saa7134-oss.c | 46 +- .../media/video/saa7134/saa7134-tvaudio.c | 14 + .../media/video/saa7134/saa7134-video.c | 70 +- trunk/drivers/media/video/saa7134/saa7134.h | 16 +- trunk/drivers/media/video/tda8290.c | 8 +- trunk/drivers/media/video/tda9840.c | 3 +- trunk/drivers/media/video/tea6415c.c | 5 +- trunk/drivers/media/video/tea6420.c | 5 +- trunk/drivers/media/video/tuner-core.c | 69 +- trunk/drivers/media/video/tuner-simple.c | 166 +- trunk/drivers/media/video/tuner-types.c | 599 ++- trunk/drivers/media/video/tvaudio.c | 26 +- trunk/drivers/media/video/tvp5150.c | 681 +-- trunk/drivers/media/video/tvp5150_reg.h | 125 +- trunk/drivers/media/video/v4l2-common.c | 558 ++- trunk/drivers/media/video/video-buf-dvb.c | 10 +- trunk/drivers/media/video/video-buf.c | 59 +- trunk/drivers/media/video/videodev.c | 22 +- trunk/drivers/media/video/vino.c | 33 +- trunk/drivers/mmc/pxamci.c | 2 +- trunk/drivers/net/3c509.c | 70 +- trunk/drivers/net/3c523.c | 9 +- trunk/drivers/net/3c59x.c | 7 +- trunk/drivers/net/7990.c | 2 +- trunk/drivers/net/8139cp.c | 2 +- trunk/drivers/net/8139too.c | 6 +- trunk/drivers/net/82596.c | 2 +- trunk/drivers/net/Kconfig | 29 +- trunk/drivers/net/apne.c | 7 +- trunk/drivers/net/arcnet/Kconfig | 4 +- trunk/drivers/net/arcnet/arc-rawmode.c | 2 +- trunk/drivers/net/arcnet/arc-rimi.c | 68 +- trunk/drivers/net/arcnet/arcnet.c | 20 +- trunk/drivers/net/arcnet/com90xx.c | 132 +- trunk/drivers/net/arcnet/rfc1051.c | 2 +- trunk/drivers/net/arcnet/rfc1201.c | 2 +- trunk/drivers/net/arm/am79c961a.c | 4 +- trunk/drivers/net/arm/etherh.c | 3 +- trunk/drivers/net/bnx2.c | 487 +- trunk/drivers/net/bnx2.h | 37 +- trunk/drivers/net/bnx2_fw.h | 84 +- trunk/drivers/net/bonding/bond_alb.c | 2 +- trunk/drivers/net/bonding/bond_main.c | 45 +- trunk/drivers/net/bonding/bond_sysfs.c | 6 + trunk/drivers/net/bonding/bonding.h | 33 +- trunk/drivers/net/cassini.c | 40 +- trunk/drivers/net/cassini.h | 2 +- trunk/drivers/net/chelsio/espi.c | 14 +- trunk/drivers/net/chelsio/subr.c | 2 +- trunk/drivers/net/dgrs.c | 2 +- trunk/drivers/net/dgrs_firmware.c | 4 +- trunk/drivers/net/dl2k.c | 4 +- trunk/drivers/net/e100.c | 6 +- trunk/drivers/net/e1000/e1000.h | 68 +- trunk/drivers/net/e1000/e1000_ethtool.c | 110 +- trunk/drivers/net/e1000/e1000_hw.c | 734 ++- trunk/drivers/net/e1000/e1000_hw.h | 319 +- trunk/drivers/net/e1000/e1000_main.c | 611 ++- trunk/drivers/net/e1000/e1000_param.c | 2 +- trunk/drivers/net/eepro100.c | 4 +- trunk/drivers/net/epic100.c | 4 +- trunk/drivers/net/eth16i.c | 11 +- trunk/drivers/net/fealnx.c | 2 +- trunk/drivers/net/forcedeth.c | 593 ++- trunk/drivers/net/fs_enet/mac-fcc.c | 2 + trunk/drivers/net/fs_enet/mac-fec.c | 2 + trunk/drivers/net/fs_enet/mac-scc.c | 2 + trunk/drivers/net/gianfar.c | 4 + trunk/drivers/net/hamachi.c | 2 +- trunk/drivers/net/hamradio/baycom_epp.c | 2 +- trunk/drivers/net/hp100.c | 35 +- trunk/drivers/net/ibm_emac/ibm_emac_core.c | 40 +- trunk/drivers/net/ibm_emac/ibm_emac_core.h | 2 +- trunk/drivers/net/ibm_emac/ibm_emac_debug.c | 2 +- trunk/drivers/net/ibm_emac/ibm_emac_rgmii.h | 2 +- trunk/drivers/net/ibm_emac/ibm_emac_zmii.c | 7 +- trunk/drivers/net/ibm_emac/ibm_emac_zmii.h | 2 +- trunk/drivers/net/irda/Kconfig | 12 +- trunk/drivers/net/irda/Makefile | 1 + trunk/drivers/net/irda/donauboe.c | 2 +- trunk/drivers/net/irda/ep7211_ir.c | 11 +- trunk/drivers/net/irda/irda-usb.c | 5 +- trunk/drivers/net/irda/irtty-sir.c | 19 +- trunk/drivers/net/irda/nsc-ircc.c | 320 +- trunk/drivers/net/irda/nsc-ircc.h | 2 +- trunk/drivers/net/irda/sir_dongle.c | 19 +- trunk/drivers/net/irda/toim3232-sir.c | 375 ++ trunk/drivers/net/irda/vlsi_ir.c | 2 +- trunk/drivers/net/macsonic.c | 2 +- trunk/drivers/net/mv643xx_eth.c | 1558 +++---- trunk/drivers/net/mv643xx_eth.h | 256 +- trunk/drivers/net/natsemi.c | 192 +- trunk/drivers/net/ne-h8300.c | 5 +- trunk/drivers/net/ne.c | 7 +- trunk/drivers/net/ne2.c | 7 +- trunk/drivers/net/ne2k-pci.c | 2 +- trunk/drivers/net/ns83820.c | 7 +- trunk/drivers/net/oaknet.c | 3 +- trunk/drivers/net/pcmcia/3c574_cs.c | 2 +- trunk/drivers/net/pcmcia/3c589_cs.c | 5 +- trunk/drivers/net/pcmcia/fmvj18x_cs.c | 2 +- trunk/drivers/net/pcmcia/nmclan_cs.c | 2 +- trunk/drivers/net/pcmcia/pcnet_cs.c | 3 +- trunk/drivers/net/pcmcia/smc91c92_cs.c | 4 +- trunk/drivers/net/pcmcia/xirc2ps_cs.c | 2 +- trunk/drivers/net/pcnet32.c | 4145 +++++++++-------- trunk/drivers/net/phy/phy.c | 2 +- trunk/drivers/net/plip.c | 4 +- trunk/drivers/net/ppp_async.c | 3 +- trunk/drivers/net/ppp_generic.c | 4 +- trunk/drivers/net/ppp_synctty.c | 2 +- trunk/drivers/net/pppoe.c | 3 +- trunk/drivers/net/r8169.c | 4 +- trunk/drivers/net/s2io.c | 619 ++- trunk/drivers/net/s2io.h | 55 +- trunk/drivers/net/sb1000.c | 2 +- trunk/drivers/net/sb1250-mac.c | 109 +- trunk/drivers/net/seeq8005.c | 5 +- trunk/drivers/net/sgiseeq.c | 17 +- trunk/drivers/net/shaper.c | 3 +- trunk/drivers/net/sis190.c | 2 +- trunk/drivers/net/sis900.c | 8 +- trunk/drivers/net/sk98lin/h/skaddr.h | 48 - trunk/drivers/net/sk98lin/h/skcsum.h | 6 - trunk/drivers/net/sk98lin/h/skgeinit.h | 56 - trunk/drivers/net/sk98lin/h/skgepnmi.h | 4 - trunk/drivers/net/sk98lin/h/skgesirq.h | 1 - trunk/drivers/net/sk98lin/h/ski2c.h | 3 - trunk/drivers/net/sk98lin/h/skvpd.h | 15 - trunk/drivers/net/sk98lin/skaddr.c | 35 +- trunk/drivers/net/sk98lin/skgeinit.c | 148 +- trunk/drivers/net/sk98lin/skgemib.c | 7 - trunk/drivers/net/sk98lin/skgepnmi.c | 153 +- trunk/drivers/net/sk98lin/skgesirq.c | 24 +- trunk/drivers/net/sk98lin/ski2c.c | 6 +- trunk/drivers/net/sk98lin/sklm80.c | 72 - trunk/drivers/net/sk98lin/skrlmt.c | 1 - trunk/drivers/net/sk98lin/skvpd.c | 108 +- trunk/drivers/net/sk98lin/skxmac2.c | 461 +- trunk/drivers/net/skfp/fplustm.c | 26 +- trunk/drivers/net/skfp/pcmplc.c | 4 +- trunk/drivers/net/skfp/skfddi.c | 2 +- trunk/drivers/net/skge.c | 275 +- trunk/drivers/net/skge.h | 1 - trunk/drivers/net/sky2.c | 583 ++- trunk/drivers/net/sky2.h | 22 +- trunk/drivers/net/smc91x.c | 57 +- trunk/drivers/net/smc91x.h | 474 +- trunk/drivers/net/starfire.c | 40 +- trunk/drivers/net/sundance.c | 10 +- trunk/drivers/net/sungem.c | 37 +- trunk/drivers/net/sungem.h | 6 +- trunk/drivers/net/sungem_phy.c | 2 +- trunk/drivers/net/tg3.c | 652 ++- trunk/drivers/net/tg3.h | 19 +- trunk/drivers/net/tokenring/lanstreamer.c | 3 +- trunk/drivers/net/tokenring/olympic.c | 9 +- trunk/drivers/net/tulip/de2104x.c | 18 +- trunk/drivers/net/tulip/pnic.c | 3 +- trunk/drivers/net/tulip/winbond-840.c | 2 +- trunk/drivers/net/tulip/xircom_cb.c | 9 +- trunk/drivers/net/typhoon.c | 2 +- trunk/drivers/net/wan/Kconfig | 2 +- trunk/drivers/net/wan/hostess_sv11.c | 1 + trunk/drivers/net/wan/sbni.c | 3 +- trunk/drivers/net/wan/sealevel.c | 1 + trunk/drivers/net/wireless/Kconfig | 32 +- trunk/drivers/net/wireless/airo.c | 338 +- trunk/drivers/net/wireless/atmel.c | 110 +- trunk/drivers/net/wireless/ipw2100.c | 266 +- trunk/drivers/net/wireless/ipw2100.h | 17 +- trunk/drivers/net/wireless/ipw2200.c | 1239 +++-- trunk/drivers/net/wireless/ipw2200.h | 103 +- trunk/drivers/net/wireless/netwave_cs.c | 2 - trunk/drivers/net/wireless/strip.c | 4 +- trunk/drivers/net/wireless/wavelan.p.h | 6 +- trunk/drivers/net/wireless/wavelan_cs.p.h | 9 +- trunk/drivers/net/yellowfin.c | 6 +- trunk/drivers/net/zorro8390.c | 7 +- trunk/drivers/pcmcia/omap_cf.c | 2 +- trunk/drivers/s390/block/dcssblk.c | 8 +- trunk/drivers/sbus/char/bbc_i2c.c | 4 +- trunk/drivers/scsi/Kconfig | 8 + trunk/drivers/scsi/Makefile | 2 +- trunk/drivers/scsi/ahci.c | 197 +- trunk/drivers/scsi/ata_piix.c | 392 +- trunk/drivers/scsi/libata-bmdma.c | 703 +++ trunk/drivers/scsi/libata-core.c | 2966 ++++++------ trunk/drivers/scsi/libata-scsi.c | 240 +- trunk/drivers/scsi/libata.h | 3 +- trunk/drivers/scsi/pdc_adma.c | 6 +- trunk/drivers/scsi/sata_mv.c | 281 +- trunk/drivers/scsi/sata_nv.c | 2 +- trunk/drivers/scsi/sata_promise.c | 129 +- trunk/drivers/scsi/sata_qstor.c | 10 +- trunk/drivers/scsi/sata_sil.c | 126 +- trunk/drivers/scsi/sata_sil24.c | 102 +- trunk/drivers/scsi/sata_sis.c | 2 +- trunk/drivers/scsi/sata_svw.c | 2 +- trunk/drivers/scsi/sata_sx4.c | 25 +- trunk/drivers/scsi/sata_uli.c | 2 +- trunk/drivers/scsi/sata_via.c | 2 +- trunk/drivers/scsi/sata_vsc.c | 2 +- trunk/drivers/scsi/scsi_error.c | 7 +- trunk/drivers/serial/Kconfig | 7 + trunk/drivers/serial/Makefile | 1 + trunk/drivers/serial/s3c2410.c | 2 + trunk/drivers/serial/sunhv.c | 550 +++ trunk/drivers/serial/sunsab.c | 19 +- trunk/drivers/serial/sunsu.c | 26 +- trunk/drivers/serial/sunzilog.c | 35 +- trunk/drivers/usb/Kconfig | 9 + trunk/drivers/usb/Makefile | 4 +- trunk/drivers/usb/class/Kconfig | 47 - trunk/drivers/usb/class/Makefile | 2 - trunk/drivers/usb/class/audio.c | 3869 --------------- trunk/drivers/usb/class/audio.h | 110 - trunk/drivers/usb/class/cdc-acm.c | 23 +- trunk/drivers/usb/class/usb-midi.c | 2153 --------- trunk/drivers/usb/class/usb-midi.h | 164 - trunk/drivers/usb/class/usblp.c | 15 +- trunk/drivers/usb/core/devices.c | 7 +- trunk/drivers/usb/core/devio.c | 24 +- trunk/drivers/usb/core/driver.c | 6 +- trunk/drivers/usb/core/hcd-pci.c | 11 +- trunk/drivers/usb/core/hcd.c | 153 +- trunk/drivers/usb/core/hcd.h | 4 +- trunk/drivers/usb/core/hub.c | 45 +- trunk/drivers/usb/core/message.c | 17 +- trunk/drivers/usb/core/notify.c | 15 +- trunk/drivers/usb/core/usb.c | 5 +- trunk/drivers/usb/gadget/Kconfig | 17 + trunk/drivers/usb/gadget/Makefile | 1 + trunk/drivers/usb/gadget/at91_udc.c | 1773 +++++++ trunk/drivers/usb/gadget/at91_udc.h | 181 + trunk/drivers/usb/gadget/dummy_hcd.c | 3 +- trunk/drivers/usb/gadget/ether.c | 53 +- trunk/drivers/usb/gadget/file_storage.c | 4 +- trunk/drivers/usb/gadget/gadget_chips.h | 30 +- trunk/drivers/usb/gadget/goku_udc.c | 3 +- trunk/drivers/usb/gadget/inode.c | 6 +- trunk/drivers/usb/gadget/lh7a40x_udc.c | 3 +- trunk/drivers/usb/gadget/net2280.c | 3 +- trunk/drivers/usb/gadget/omap_udc.c | 6 +- trunk/drivers/usb/gadget/pxa2xx_udc.c | 3 +- trunk/drivers/usb/gadget/serial.c | 9 +- trunk/drivers/usb/gadget/zero.c | 15 +- trunk/drivers/usb/host/Kconfig | 2 +- trunk/drivers/usb/host/ehci-au1xxx.c | 297 ++ trunk/drivers/usb/host/ehci-fsl.c | 366 ++ trunk/drivers/usb/host/ehci-fsl.h | 37 + trunk/drivers/usb/host/ehci-hcd.c | 13 +- trunk/drivers/usb/host/ehci-hub.c | 4 + trunk/drivers/usb/host/ehci-mem.c | 11 +- trunk/drivers/usb/host/ehci-pci.c | 25 +- trunk/drivers/usb/host/ehci-q.c | 17 +- trunk/drivers/usb/host/ehci-sched.c | 20 +- trunk/drivers/usb/host/ehci.h | 18 +- trunk/drivers/usb/host/hc_crisv10.c | 12 +- trunk/drivers/usb/host/isp116x-hcd.c | 5 +- trunk/drivers/usb/host/ohci-at91.c | 306 ++ trunk/drivers/usb/host/ohci-au1xxx.c | 102 +- trunk/drivers/usb/host/ohci-hcd.c | 54 +- trunk/drivers/usb/host/ohci-hub.c | 12 +- trunk/drivers/usb/host/ohci-omap.c | 9 +- trunk/drivers/usb/host/ohci-pci.c | 15 +- trunk/drivers/usb/host/sl811-hcd.c | 3 +- trunk/drivers/usb/host/uhci-debug.c | 356 +- trunk/drivers/usb/host/uhci-hcd.c | 127 +- trunk/drivers/usb/host/uhci-hcd.h | 188 +- trunk/drivers/usb/host/uhci-hub.c | 21 + trunk/drivers/usb/host/uhci-q.c | 1294 +++-- trunk/drivers/usb/image/mdc800.c | 67 +- trunk/drivers/usb/input/ati_remote.c | 2 - trunk/drivers/usb/input/hid-core.c | 175 +- trunk/drivers/usb/input/hid-lgff.c | 6 +- trunk/drivers/usb/input/hid-tmff.c | 3 +- trunk/drivers/usb/input/hid.h | 10 + trunk/drivers/usb/input/hiddev.c | 6 +- trunk/drivers/usb/media/Kconfig | 15 + trunk/drivers/usb/media/Makefile | 7 +- trunk/drivers/usb/media/dabusb.c | 36 +- trunk/drivers/usb/media/dabusb.h | 2 +- trunk/drivers/usb/media/et61x251.h | 28 +- trunk/drivers/usb/media/et61x251_core.c | 321 +- trunk/drivers/usb/media/et61x251_sensor.h | 5 +- trunk/drivers/usb/media/et61x251_tas5130d1b.c | 10 +- trunk/drivers/usb/media/ov511.c | 97 +- trunk/drivers/usb/media/ov511.h | 11 +- trunk/drivers/usb/media/pwc/pwc-ctrl.c | 1 - trunk/drivers/usb/media/pwc/pwc-if.c | 9 +- trunk/drivers/usb/media/se401.c | 16 +- trunk/drivers/usb/media/se401.h | 3 +- trunk/drivers/usb/media/sn9c102.h | 28 +- trunk/drivers/usb/media/sn9c102_core.c | 326 +- trunk/drivers/usb/media/sn9c102_ov7630.c | 33 +- trunk/drivers/usb/media/sn9c102_pas202bca.c | 238 + trunk/drivers/usb/media/sn9c102_pas202bcb.c | 2 +- trunk/drivers/usb/media/sn9c102_sensor.h | 15 +- trunk/drivers/usb/media/sn9c102_tas5110c1b.c | 14 +- trunk/drivers/usb/media/sn9c102_tas5130d1b.c | 12 +- trunk/drivers/usb/media/stv680.c | 20 +- trunk/drivers/usb/media/stv680.h | 2 +- trunk/drivers/usb/media/usbvideo.c | 31 +- trunk/drivers/usb/media/usbvideo.h | 5 +- trunk/drivers/usb/media/vicam.c | 22 +- trunk/drivers/usb/media/w9968cf.c | 88 +- trunk/drivers/usb/media/w9968cf.h | 14 +- trunk/drivers/usb/media/zc0301.h | 192 + trunk/drivers/usb/media/zc0301_core.c | 2055 ++++++++ trunk/drivers/usb/media/zc0301_pas202bcb.c | 361 ++ trunk/drivers/usb/media/zc0301_sensor.h | 103 + trunk/drivers/usb/misc/auerswald.c | 6 +- trunk/drivers/usb/misc/cytherm.c | 3 +- trunk/drivers/usb/misc/idmouse.c | 28 +- trunk/drivers/usb/misc/ldusb.c | 14 +- trunk/drivers/usb/misc/legousbtower.c | 11 +- trunk/drivers/usb/misc/phidgetkit.c | 9 +- trunk/drivers/usb/misc/phidgetservo.c | 3 +- trunk/drivers/usb/misc/sisusbvga/sisusb.c | 5 +- trunk/drivers/usb/misc/sisusbvga/sisusb.h | 8 - trunk/drivers/usb/misc/usblcd.c | 3 +- trunk/drivers/usb/misc/usbled.c | 3 +- trunk/drivers/usb/misc/usbtest.c | 9 +- trunk/drivers/usb/mon/mon_main.c | 22 +- trunk/drivers/usb/mon/mon_text.c | 24 +- trunk/drivers/usb/mon/usb_mon.h | 2 +- trunk/drivers/usb/net/pegasus.c | 1 + trunk/drivers/usb/net/pegasus.h | 26 +- trunk/drivers/usb/net/rtl8150.c | 4 +- trunk/drivers/usb/net/zd1201.c | 9 +- trunk/drivers/usb/serial/Kconfig | 7 + trunk/drivers/usb/serial/Makefile | 1 + trunk/drivers/usb/serial/cp2101.c | 7 +- trunk/drivers/usb/serial/cypress_m8.c | 73 +- trunk/drivers/usb/serial/cypress_m8.h | 5 + trunk/drivers/usb/serial/ftdi_sio.c | 4 +- trunk/drivers/usb/serial/ftdi_sio.h | 7 + trunk/drivers/usb/serial/garmin_gps.c | 3 +- trunk/drivers/usb/serial/io_edgeport.c | 3 +- trunk/drivers/usb/serial/io_ti.c | 6 +- trunk/drivers/usb/serial/ir-usb.c | 3 +- trunk/drivers/usb/serial/keyspan.c | 6 +- trunk/drivers/usb/serial/kobil_sct.c | 16 +- trunk/drivers/usb/serial/mct_u232.c | 3 +- trunk/drivers/usb/serial/navman.c | 157 + trunk/drivers/usb/serial/omninet.c | 10 +- trunk/drivers/usb/serial/option.c | 3 +- trunk/drivers/usb/serial/pl2303.c | 8 +- trunk/drivers/usb/serial/pl2303.h | 4 + trunk/drivers/usb/serial/ti_usb_3410_5052.c | 3 +- trunk/drivers/usb/serial/usb-serial.c | 6 +- trunk/drivers/usb/serial/visor.c | 3 +- trunk/drivers/usb/storage/datafab.c | 3 +- trunk/drivers/usb/storage/isd200.c | 10 +- trunk/drivers/usb/storage/jumpshot.c | 3 +- trunk/drivers/usb/storage/scsiglue.c | 9 +- trunk/drivers/usb/storage/sddr55.c | 3 +- trunk/drivers/usb/storage/shuttle_usbat.c | 3 +- trunk/drivers/usb/storage/unusual_devs.h | 32 +- trunk/drivers/usb/storage/usb.c | 25 +- trunk/drivers/usb/storage/usb.h | 5 +- trunk/drivers/video/Kconfig | 2 - trunk/drivers/video/epson1355fb.c | 1 + trunk/drivers/video/sa1100fb.c | 2 +- trunk/drivers/video/vfb.c | 1 + trunk/fs/char_dev.c | 17 +- trunk/fs/debugfs/file.c | 46 + trunk/fs/jfs/Makefile | 3 +- trunk/fs/jfs/acl.c | 7 +- trunk/fs/jfs/file.c | 1 + trunk/fs/jfs/inode.c | 15 +- trunk/fs/jfs/ioctl.c | 107 + trunk/fs/jfs/jfs_dinode.h | 31 +- trunk/fs/jfs/jfs_dmap.c | 8 +- trunk/fs/jfs/jfs_dmap.h | 2 +- trunk/fs/jfs/jfs_dtree.c | 13 +- trunk/fs/jfs/jfs_extent.c | 20 +- trunk/fs/jfs/jfs_imap.c | 72 +- trunk/fs/jfs/jfs_imap.h | 4 +- trunk/fs/jfs/jfs_incore.h | 10 +- trunk/fs/jfs/jfs_inode.c | 46 +- trunk/fs/jfs/jfs_inode.h | 3 + trunk/fs/jfs/jfs_lock.h | 1 + trunk/fs/jfs/jfs_logmgr.c | 35 +- trunk/fs/jfs/jfs_logmgr.h | 2 +- trunk/fs/jfs/jfs_metapage.c | 3 +- trunk/fs/jfs/jfs_superblock.h | 9 +- trunk/fs/jfs/jfs_txnmgr.c | 36 +- trunk/fs/jfs/namei.c | 99 +- trunk/fs/jfs/super.c | 98 +- trunk/fs/jfs/xattr.c | 8 +- trunk/fs/sysfs/dir.c | 37 +- trunk/fs/sysfs/file.c | 9 +- trunk/fs/sysfs/inode.c | 9 +- trunk/fs/sysfs/symlink.c | 6 +- trunk/fs/sysfs/sysfs.h | 1 + trunk/include/asm-arm/irq.h | 2 +- trunk/include/asm-generic/vmlinux.lds.h | 14 + trunk/include/asm-mips/byteorder.h | 18 + trunk/include/asm-mips/compat.h | 8 +- trunk/include/asm-mips/io.h | 69 +- trunk/include/asm-mips/mach-cobalt/cobalt.h | 2 + .../asm-mips/mach-generic/mangle-port.h | 36 + .../include/asm-mips/mach-ip27/mangle-port.h | 9 + .../include/asm-mips/mach-ip32/mangle-port.h | 9 + .../mach-mips/cpu-feature-overrides.h | 4 + trunk/include/asm-mips/mmu_context.h | 7 +- trunk/include/asm-mips/pgtable-32.h | 2 +- trunk/include/asm-mips/r4kcache.h | 1 + trunk/include/asm-mips/signal.h | 20 +- trunk/include/asm-mips/sn/klconfig.h | 2 +- trunk/include/asm-mips/sn/mapped_kernel.h | 4 - trunk/include/asm-mips/sn/sn0/hubio.h | 12 +- trunk/include/asm-mips/stackframe.h | 20 +- trunk/include/asm-mips/system.h | 8 +- trunk/include/asm-mips/thread_info.h | 2 +- trunk/include/asm-sparc/idprom.h | 26 +- trunk/include/asm-sparc/oplib.h | 2 + trunk/include/asm-sparc/socket.h | 2 +- trunk/include/asm-sparc/uaccess.h | 47 - trunk/include/asm-sparc64/a.out.h | 6 +- trunk/include/asm-sparc64/asi.h | 18 +- trunk/include/asm-sparc64/cpudata.h | 203 +- trunk/include/asm-sparc64/elf.h | 22 +- trunk/include/asm-sparc64/head.h | 15 + trunk/include/asm-sparc64/hypervisor.h | 2128 +++++++++ trunk/include/asm-sparc64/idprom.h | 12 +- trunk/include/asm-sparc64/intr_queue.h | 15 + trunk/include/asm-sparc64/irq.h | 4 + trunk/include/asm-sparc64/mmu.h | 36 +- trunk/include/asm-sparc64/mmu_context.h | 162 +- trunk/include/asm-sparc64/numnodes.h | 6 + trunk/include/asm-sparc64/oplib.h | 43 +- trunk/include/asm-sparc64/page.h | 13 +- trunk/include/asm-sparc64/pbm.h | 3 + trunk/include/asm-sparc64/pci.h | 56 +- trunk/include/asm-sparc64/pgalloc.h | 166 +- trunk/include/asm-sparc64/pgtable.h | 704 ++- trunk/include/asm-sparc64/pil.h | 4 +- trunk/include/asm-sparc64/processor.h | 23 +- trunk/include/asm-sparc64/pstate.h | 9 +- trunk/include/asm-sparc64/scratchpad.h | 14 + trunk/include/asm-sparc64/smp.h | 30 +- trunk/include/asm-sparc64/sparsemem.h | 12 + trunk/include/asm-sparc64/spitfire.h | 1 + trunk/include/asm-sparc64/system.h | 7 +- trunk/include/asm-sparc64/thread_info.h | 9 +- trunk/include/asm-sparc64/timex.h | 6 + trunk/include/asm-sparc64/tlbflush.h | 25 +- trunk/include/asm-sparc64/tsb.h | 281 ++ trunk/include/asm-sparc64/ttable.h | 272 +- trunk/include/asm-sparc64/uaccess.h | 46 +- trunk/include/asm-sparc64/vdev.h | 16 + trunk/include/asm-sparc64/xor.h | 34 +- trunk/include/linux/amba/clcd.h | 12 +- trunk/include/linux/arcdevice.h | 9 - trunk/include/linux/ata.h | 22 + trunk/include/linux/blkdev.h | 10 +- trunk/include/linux/cpu.h | 2 +- trunk/include/linux/crypto.h | 10 +- trunk/include/linux/dccp.h | 132 +- trunk/include/linux/debugfs.h | 15 + trunk/include/linux/device.h | 2 + trunk/include/linux/dn.h | 44 +- trunk/include/linux/dvb/audio.h | 13 + trunk/include/linux/dvb/video.h | 13 + trunk/include/linux/elevator.h | 10 +- trunk/include/linux/fsl_devices.h | 27 + trunk/include/linux/icmpv6.h | 11 +- trunk/include/linux/if.h | 29 +- trunk/include/linux/if_ether.h | 1 + trunk/include/linux/in.h | 1 + trunk/include/linux/inetdevice.h | 1 + trunk/include/linux/ipv6.h | 14 + trunk/include/linux/ipv6_route.h | 10 + trunk/include/linux/irda.h | 1 + trunk/include/linux/kobj_map.h | 4 +- trunk/include/linux/kobject.h | 4 +- trunk/include/linux/libata.h | 180 +- trunk/include/linux/list.h | 24 + trunk/include/linux/module.h | 10 + trunk/include/linux/mv643xx.h | 27 +- trunk/include/linux/net.h | 4 + trunk/include/linux/netdevice.h | 41 +- trunk/include/linux/netfilter.h | 9 + trunk/include/linux/netfilter/nfnetlink.h | 1 + trunk/include/linux/netfilter/nfnetlink_log.h | 6 + trunk/include/linux/netfilter/x_tables.h | 37 +- trunk/include/linux/netfilter/xt_policy.h | 58 + trunk/include/linux/netfilter_bridge.h | 27 - .../linux/netfilter_ipv4/ip_conntrack.h | 2 + .../linux/netfilter_ipv4/ip_conntrack_h323.h | 30 + trunk/include/linux/netfilter_ipv4/ip_nat.h | 2 +- .../include/linux/netfilter_ipv4/ipt_policy.h | 69 +- .../linux/netfilter_ipv6/ip6t_policy.h | 69 +- trunk/include/linux/netlink.h | 1 + trunk/include/linux/pci_ids.h | 6 + trunk/include/linux/rtnetlink.h | 23 +- trunk/include/linux/security.h | 25 +- trunk/include/linux/serial_core.h | 3 + trunk/include/linux/skbuff.h | 47 +- trunk/include/linux/socket.h | 1 + trunk/include/linux/sunrpc/svcsock.h | 2 +- trunk/include/linux/sysctl.h | 27 + trunk/include/linux/tcp.h | 6 + trunk/include/linux/usb.h | 2 - trunk/include/linux/usb_gadget.h | 7 +- trunk/include/linux/videodev2.h | 84 +- trunk/include/linux/xfrm.h | 30 + trunk/include/media/ir-common.h | 40 +- trunk/include/media/saa7146.h | 21 +- trunk/include/media/tuner-types.h | 3 +- trunk/include/media/tuner.h | 6 +- trunk/include/media/v4l2-common.h | 62 +- trunk/include/media/video-buf-dvb.h | 2 +- trunk/include/media/video-buf.h | 2 +- trunk/include/net/af_unix.h | 3 +- trunk/include/net/dn.h | 105 +- trunk/include/net/dn_dev.h | 88 +- trunk/include/net/dn_fib.h | 22 +- trunk/include/net/dn_neigh.h | 4 +- trunk/include/net/dn_nsp.h | 72 +- trunk/include/net/dn_route.h | 12 +- trunk/include/net/flow.h | 8 +- trunk/include/net/ieee80211.h | 177 +- trunk/include/net/ieee80211_crypt.h | 3 +- trunk/include/net/if_inet6.h | 3 - trunk/include/net/inet_connection_sock.h | 26 + trunk/include/net/ip.h | 4 + trunk/include/net/ip6_route.h | 24 +- trunk/include/net/ipv6.h | 22 + trunk/include/net/llc.h | 2 +- trunk/include/net/ndisc.h | 2 + trunk/include/net/neighbour.h | 2 +- trunk/include/net/netfilter/nf_conntrack.h | 56 +- trunk/include/net/scm.h | 10 +- trunk/include/net/sctp/structs.h | 10 + trunk/include/net/sock.h | 12 + trunk/include/net/tcp.h | 16 + trunk/include/net/xfrm.h | 62 +- trunk/include/rdma/ib_fmr_pool.h | 2 + trunk/include/rdma/ib_mad.h | 48 +- trunk/include/rdma/ib_user_verbs.h | 79 +- trunk/include/rdma/ib_verbs.h | 38 +- trunk/include/scsi/scsi_eh.h | 3 + trunk/kernel/exit.c | 7 +- trunk/kernel/ksysfs.c | 3 - trunk/kernel/module.c | 199 +- trunk/kernel/params.c | 10 - trunk/kernel/rcupdate.c | 6 +- trunk/lib/kobject.c | 60 +- trunk/lib/kobject_uevent.c | 2 + trunk/lib/kref.c | 7 +- trunk/net/802/psnap.c | 4 +- trunk/net/8021q/vlan.c | 43 +- trunk/net/8021q/vlan_dev.c | 6 +- trunk/net/Kconfig | 3 + trunk/net/atm/clip.c | 2 +- trunk/net/atm/common.c | 4 +- trunk/net/atm/ioctl.c | 15 +- trunk/net/atm/resources.c | 32 +- trunk/net/atm/resources.h | 3 +- trunk/net/bluetooth/rfcomm/core.c | 8 +- trunk/net/bridge/Kconfig | 1 + trunk/net/bridge/br.c | 12 + trunk/net/bridge/br_device.c | 3 +- trunk/net/bridge/br_fdb.c | 6 +- trunk/net/bridge/br_if.c | 9 +- trunk/net/bridge/br_input.c | 43 +- trunk/net/bridge/br_netfilter.c | 225 +- trunk/net/bridge/br_private.h | 6 +- trunk/net/bridge/br_stp_bpdu.c | 196 +- trunk/net/bridge/br_stp_timer.c | 47 +- trunk/net/bridge/br_sysfs_br.c | 49 + trunk/net/bridge/netfilter/ebtables.c | 101 +- trunk/net/compat.c | 95 +- trunk/net/core/Makefile | 2 +- trunk/net/core/dev.c | 68 +- trunk/net/core/flow.c | 7 +- trunk/net/core/link_watch.c | 44 +- trunk/net/core/neighbour.c | 12 +- trunk/net/core/net-sysfs.c | 41 + trunk/net/core/netpoll.c | 6 +- trunk/net/core/pktgen.c | 2842 +++++------ trunk/net/core/rtnetlink.c | 78 +- trunk/net/core/skbuff.c | 42 + trunk/net/core/sock.c | 30 +- trunk/net/core/sysctl_net_core.c | 23 + trunk/net/dccp/Kconfig | 13 +- trunk/net/dccp/Makefile | 9 +- trunk/net/dccp/ackvec.c | 296 +- trunk/net/dccp/ackvec.h | 53 +- trunk/net/dccp/ccid.c | 189 +- trunk/net/dccp/ccid.h | 129 +- trunk/net/dccp/ccids/Kconfig | 43 +- trunk/net/dccp/ccids/Makefile | 4 + trunk/net/dccp/ccids/ccid2.c | 779 ++++ trunk/net/dccp/ccids/ccid2.h | 85 + trunk/net/dccp/ccids/ccid3.c | 112 +- trunk/net/dccp/ccids/ccid3.h | 5 +- trunk/net/dccp/dccp.h | 133 +- trunk/net/dccp/diag.c | 2 +- trunk/net/dccp/feat.c | 586 +++ trunk/net/dccp/feat.h | 29 + trunk/net/dccp/input.c | 28 +- trunk/net/dccp/ipv4.c | 333 +- trunk/net/dccp/ipv6.c | 371 +- trunk/net/dccp/minisocks.c | 37 +- trunk/net/dccp/options.c | 291 +- trunk/net/dccp/output.c | 88 +- trunk/net/dccp/proto.c | 440 +- trunk/net/dccp/sysctl.c | 124 + trunk/net/dccp/timer.c | 14 +- trunk/net/decnet/af_decnet.c | 18 +- trunk/net/decnet/dn_dev.c | 34 +- trunk/net/decnet/dn_fib.c | 8 +- trunk/net/decnet/dn_neigh.c | 24 +- trunk/net/decnet/dn_nsp_in.c | 28 +- trunk/net/decnet/dn_nsp_out.c | 38 +- trunk/net/decnet/dn_route.c | 60 +- trunk/net/decnet/dn_rules.c | 115 +- trunk/net/decnet/dn_table.c | 12 +- trunk/net/decnet/sysctl_net_decnet.c | 12 +- trunk/net/ieee80211/ieee80211_crypt.c | 11 +- trunk/net/ieee80211/ieee80211_crypt_ccmp.c | 8 +- trunk/net/ieee80211/ieee80211_crypt_tkip.c | 56 +- trunk/net/ieee80211/ieee80211_crypt_wep.c | 5 +- trunk/net/ieee80211/ieee80211_geo.c | 48 +- trunk/net/ieee80211/ieee80211_module.c | 20 +- trunk/net/ieee80211/ieee80211_rx.c | 167 +- trunk/net/ieee80211/ieee80211_tx.c | 30 +- trunk/net/ieee80211/ieee80211_wx.c | 152 +- trunk/net/ipv4/af_inet.c | 120 +- trunk/net/ipv4/ah4.c | 1 + trunk/net/ipv4/arp.c | 20 +- trunk/net/ipv4/devinet.c | 8 + trunk/net/ipv4/esp4.c | 1 + trunk/net/ipv4/fib_rules.c | 113 +- trunk/net/ipv4/fib_trie.c | 24 +- trunk/net/ipv4/igmp.c | 26 +- trunk/net/ipv4/inet_connection_sock.c | 49 + trunk/net/ipv4/ip_sockglue.c | 170 +- trunk/net/ipv4/ipcomp.c | 17 +- trunk/net/ipv4/ipconfig.c | 10 +- trunk/net/ipv4/ipmr.c | 4 +- trunk/net/ipv4/ipvs/ip_vs_app.c | 19 +- trunk/net/ipv4/netfilter/Kconfig | 36 +- trunk/net/ipv4/netfilter/Makefile | 6 +- trunk/net/ipv4/netfilter/arp_tables.c | 21 +- trunk/net/ipv4/netfilter/arpt_mangle.c | 23 +- .../ipv4/netfilter/ip_conntrack_helper_h323.c | 1731 +++++++ .../netfilter/ip_conntrack_helper_h323_asn1.c | 870 ++++ .../netfilter/ip_conntrack_helper_h323_asn1.h | 98 + .../ip_conntrack_helper_h323_types.c | 1926 ++++++++ .../ip_conntrack_helper_h323_types.h | 938 ++++ .../net/ipv4/netfilter/ip_conntrack_netlink.c | 7 +- trunk/net/ipv4/netfilter/ip_nat_helper_h323.c | 605 +++ trunk/net/ipv4/netfilter/ip_nat_helper_pptp.c | 8 +- trunk/net/ipv4/netfilter/ip_nat_rule.c | 45 +- trunk/net/ipv4/netfilter/ip_nat_snmp_basic.c | 5 +- trunk/net/ipv4/netfilter/ip_queue.c | 11 +- trunk/net/ipv4/netfilter/ip_tables.c | 69 +- trunk/net/ipv4/netfilter/ipt_CLUSTERIP.c | 27 +- trunk/net/ipv4/netfilter/ipt_DSCP.c | 17 +- trunk/net/ipv4/netfilter/ipt_ECN.c | 18 +- trunk/net/ipv4/netfilter/ipt_LOG.c | 11 +- trunk/net/ipv4/netfilter/ipt_MASQUERADE.c | 18 +- trunk/net/ipv4/netfilter/ipt_NETMAP.c | 19 +- trunk/net/ipv4/netfilter/ipt_REDIRECT.c | 17 +- trunk/net/ipv4/netfilter/ipt_REJECT.c | 28 +- trunk/net/ipv4/netfilter/ipt_SAME.c | 19 +- trunk/net/ipv4/netfilter/ipt_TCPMSS.c | 16 +- trunk/net/ipv4/netfilter/ipt_TOS.c | 17 +- trunk/net/ipv4/netfilter/ipt_TTL.c | 25 +- trunk/net/ipv4/netfilter/ipt_ULOG.c | 12 +- trunk/net/ipv4/netfilter/ipt_addrtype.c | 20 +- trunk/net/ipv4/netfilter/ipt_ah.c | 25 +- trunk/net/ipv4/netfilter/ipt_dscp.c | 19 +- trunk/net/ipv4/netfilter/ipt_ecn.c | 14 +- trunk/net/ipv4/netfilter/ipt_esp.c | 25 +- trunk/net/ipv4/netfilter/ipt_hashlimit.c | 21 +- trunk/net/ipv4/netfilter/ipt_iprange.c | 28 +- trunk/net/ipv4/netfilter/ipt_multiport.c | 31 +- trunk/net/ipv4/netfilter/ipt_owner.c | 21 +- trunk/net/ipv4/netfilter/ipt_policy.c | 176 - trunk/net/ipv4/netfilter/ipt_recent.c | 22 +- trunk/net/ipv4/netfilter/ipt_tos.c | 18 +- trunk/net/ipv4/netfilter/ipt_ttl.c | 19 +- .../netfilter/nf_conntrack_l3proto_ipv4.c | 22 +- trunk/net/ipv4/raw.c | 80 +- trunk/net/ipv4/sysctl_net_ipv4.c | 25 +- trunk/net/ipv4/tcp.c | 63 +- trunk/net/ipv4/tcp_htcp.c | 66 +- trunk/net/ipv4/tcp_input.c | 49 + trunk/net/ipv4/tcp_ipv4.c | 44 +- trunk/net/ipv4/tcp_output.c | 259 +- trunk/net/ipv4/tcp_timer.c | 36 +- trunk/net/ipv4/udp.c | 83 +- trunk/net/ipv4/xfrm4_tunnel.c | 11 +- trunk/net/ipv6/Kconfig | 26 +- trunk/net/ipv6/addrconf.c | 346 +- trunk/net/ipv6/af_inet6.c | 120 +- trunk/net/ipv6/ah6.c | 5 +- trunk/net/ipv6/anycast.c | 7 +- trunk/net/ipv6/esp6.c | 5 +- trunk/net/ipv6/ip6_fib.c | 1 - trunk/net/ipv6/ip6_flowlabel.c | 6 +- trunk/net/ipv6/ip6_output.c | 43 +- trunk/net/ipv6/ipcomp6.c | 22 +- trunk/net/ipv6/ipv6_sockglue.c | 163 +- trunk/net/ipv6/mcast.c | 17 +- trunk/net/ipv6/ndisc.c | 49 +- trunk/net/ipv6/netfilter/Kconfig | 10 - trunk/net/ipv6/netfilter/Makefile | 1 - trunk/net/ipv6/netfilter/ip6_queue.c | 11 +- trunk/net/ipv6/netfilter/ip6_tables.c | 87 +- trunk/net/ipv6/netfilter/ip6t_HL.c | 19 +- trunk/net/ipv6/netfilter/ip6t_LOG.c | 11 +- trunk/net/ipv6/netfilter/ip6t_REJECT.c | 25 +- trunk/net/ipv6/netfilter/ip6t_ah.c | 12 +- trunk/net/ipv6/netfilter/ip6t_dst.c | 13 +- trunk/net/ipv6/netfilter/ip6t_esp.c | 12 +- trunk/net/ipv6/netfilter/ip6t_eui64.c | 27 +- trunk/net/ipv6/netfilter/ip6t_frag.c | 13 +- trunk/net/ipv6/netfilter/ip6t_hbh.c | 13 +- trunk/net/ipv6/netfilter/ip6t_hl.c | 22 +- trunk/net/ipv6/netfilter/ip6t_ipv6header.c | 8 +- trunk/net/ipv6/netfilter/ip6t_multiport.c | 11 +- trunk/net/ipv6/netfilter/ip6t_owner.c | 18 +- trunk/net/ipv6/netfilter/ip6t_policy.c | 176 - trunk/net/ipv6/netfilter/ip6t_rt.c | 12 +- .../netfilter/nf_conntrack_l3proto_ipv6.c | 39 +- trunk/net/ipv6/netfilter/nf_conntrack_reasm.c | 8 +- trunk/net/ipv6/raw.c | 145 +- trunk/net/ipv6/reassembly.c | 35 +- trunk/net/ipv6/route.c | 680 +-- trunk/net/ipv6/tcp_ipv6.c | 74 +- trunk/net/ipv6/udp.c | 84 +- trunk/net/ipv6/xfrm6_tunnel.c | 11 +- trunk/net/key/af_key.c | 6 +- trunk/net/llc/af_llc.c | 15 +- trunk/net/llc/llc_c_ac.c | 1 - trunk/net/llc/llc_core.c | 1 - trunk/net/llc/llc_output.c | 3 +- trunk/net/llc/llc_output.h | 20 - trunk/net/llc/llc_s_ac.c | 2 +- trunk/net/netfilter/Kconfig | 10 + trunk/net/netfilter/Makefile | 1 + trunk/net/netfilter/nf_conntrack_core.c | 135 +- trunk/net/netfilter/nf_conntrack_ftp.c | 2 +- trunk/net/netfilter/nf_conntrack_netlink.c | 46 +- trunk/net/netfilter/nf_conntrack_standalone.c | 1 - trunk/net/netfilter/nf_sockopt.c | 94 +- trunk/net/netfilter/nfnetlink.c | 6 + trunk/net/netfilter/nfnetlink_log.c | 46 + trunk/net/netfilter/x_tables.c | 72 +- trunk/net/netfilter/xt_CLASSIFY.c | 42 +- trunk/net/netfilter/xt_CONNMARK.c | 27 +- trunk/net/netfilter/xt_MARK.c | 37 +- trunk/net/netfilter/xt_NFQUEUE.c | 24 +- trunk/net/netfilter/xt_NOTRACK.c | 45 +- trunk/net/netfilter/xt_comment.c | 18 +- trunk/net/netfilter/xt_connbytes.c | 15 +- trunk/net/netfilter/xt_connmark.c | 28 +- trunk/net/netfilter/xt_conntrack.c | 18 +- trunk/net/netfilter/xt_dccp.c | 45 +- trunk/net/netfilter/xt_helper.c | 26 +- trunk/net/netfilter/xt_length.c | 24 +- trunk/net/netfilter/xt_limit.c | 7 +- trunk/net/netfilter/xt_mac.c | 34 +- trunk/net/netfilter/xt_mark.c | 16 +- trunk/net/netfilter/xt_physdev.c | 14 +- trunk/net/netfilter/xt_pkttype.c | 23 +- trunk/net/netfilter/xt_policy.c | 209 + trunk/net/netfilter/xt_realm.c | 27 +- trunk/net/netfilter/xt_sctp.c | 66 +- trunk/net/netfilter/xt_state.c | 21 +- trunk/net/netfilter/xt_string.c | 10 +- trunk/net/netfilter/xt_tcpmss.c | 52 +- trunk/net/netfilter/xt_tcpudp.c | 112 +- trunk/net/netlink/af_netlink.c | 52 +- trunk/net/sched/Kconfig | 1 - trunk/net/sched/act_ipt.c | 10 +- trunk/net/sched/sch_atm.c | 1 + trunk/net/sched/sch_dsmark.c | 1 + trunk/net/sched/sch_generic.c | 2 +- trunk/net/sched/sch_netem.c | 4 +- trunk/net/sched/sch_prio.c | 2 +- trunk/net/sched/sch_red.c | 179 +- trunk/net/sched/sch_sfq.c | 5 + trunk/net/sched/sch_tbf.c | 9 +- trunk/net/sctp/ipv6.c | 92 +- trunk/net/sctp/protocol.c | 94 +- trunk/net/socket.c | 341 +- trunk/net/sunrpc/cache.c | 17 +- trunk/net/sunrpc/sched.c | 11 +- trunk/net/sunrpc/svcsock.c | 8 +- trunk/net/tipc/bcast.c | 58 +- trunk/net/tipc/bearer.c | 20 +- trunk/net/tipc/cluster.c | 22 +- trunk/net/tipc/cluster.h | 2 +- trunk/net/tipc/config.c | 4 +- trunk/net/tipc/dbg.c | 4 +- trunk/net/tipc/discover.c | 8 +- trunk/net/tipc/eth_media.c | 4 +- trunk/net/tipc/link.c | 89 +- trunk/net/tipc/name_distr.c | 6 +- trunk/net/tipc/name_table.c | 62 +- trunk/net/tipc/net.c | 7 +- trunk/net/tipc/node.c | 20 +- trunk/net/tipc/node.h | 2 +- trunk/net/tipc/node_subscr.c | 2 +- trunk/net/tipc/port.c | 57 +- trunk/net/tipc/ref.c | 8 +- trunk/net/tipc/ref.h | 4 +- trunk/net/tipc/socket.c | 28 +- trunk/net/tipc/subscr.c | 30 +- trunk/net/tipc/user_reg.c | 4 +- trunk/net/tipc/zone.c | 12 +- trunk/net/unix/af_unix.c | 32 +- trunk/net/unix/garbage.c | 7 +- trunk/net/xfrm/xfrm_policy.c | 9 +- trunk/net/xfrm/xfrm_state.c | 108 +- trunk/net/xfrm/xfrm_user.c | 397 +- trunk/scripts/genksyms/keywords.c_shipped | 91 +- trunk/scripts/genksyms/keywords.gperf | 1 + trunk/security/dummy.c | 13 +- trunk/security/selinux/hooks.c | 46 +- trunk/security/selinux/include/xfrm.h | 12 + trunk/security/selinux/nlmsgtab.c | 7 + trunk/security/selinux/xfrm.c | 68 + 1262 files changed, 75558 insertions(+), 41128 deletions(-) delete mode 100644 trunk/Documentation/DocBook/sis900.tmpl delete mode 100644 trunk/Documentation/networking/sis900.txt create mode 100644 trunk/Documentation/usb/zc0301.txt create mode 100644 trunk/Documentation/video4linux/README.cpia2 create mode 100644 trunk/Documentation/video4linux/cpia2_overview.txt create mode 100644 trunk/arch/mips/cobalt/Kconfig create mode 100644 trunk/arch/mips/cobalt/console.c delete mode 100644 trunk/arch/mips/configs/tb0287_defconfig delete mode 100644 trunk/arch/mips/mm/tlb-andes.c create mode 100644 trunk/arch/mips/qemu/q-smp.c delete mode 100644 trunk/arch/sparc64/kernel/dtlb_backend.S delete mode 100644 trunk/arch/sparc64/kernel/dtlb_base.S create mode 100644 trunk/arch/sparc64/kernel/dtlb_miss.S delete mode 100644 trunk/arch/sparc64/kernel/itlb_base.S create mode 100644 trunk/arch/sparc64/kernel/itlb_miss.S create mode 100644 trunk/arch/sparc64/kernel/pci_sun4v.c create mode 100644 trunk/arch/sparc64/kernel/pci_sun4v.h create mode 100644 trunk/arch/sparc64/kernel/pci_sun4v_asm.S create mode 100644 trunk/arch/sparc64/kernel/sun4v_ivec.S create mode 100644 trunk/arch/sparc64/kernel/sun4v_tlb_miss.S create mode 100644 trunk/arch/sparc64/kernel/tsb.S create mode 100644 trunk/arch/sparc64/kernel/visemul.c create mode 100644 trunk/arch/sparc64/lib/NGbzero.S create mode 100644 trunk/arch/sparc64/lib/NGcopy_from_user.S create mode 100644 trunk/arch/sparc64/lib/NGcopy_to_user.S create mode 100644 trunk/arch/sparc64/lib/NGmemcpy.S create mode 100644 trunk/arch/sparc64/lib/NGpage.S create mode 100644 trunk/arch/sparc64/lib/NGpatch.S create mode 100644 trunk/arch/sparc64/mm/tsb.c create mode 100644 trunk/drivers/char/ip2/Makefile rename trunk/drivers/char/{ip2.c => ip2/ip2base.c} (95%) rename trunk/drivers/char/{ => ip2}/ip2main.c (99%) delete mode 100644 trunk/drivers/media/common/ir-common.c create mode 100644 trunk/drivers/media/common/ir-functions.c create mode 100644 trunk/drivers/media/common/ir-keymaps.c create mode 100644 trunk/drivers/media/dvb/frontends/bsbe1.h create mode 100644 trunk/drivers/media/dvb/frontends/bsru6.h create mode 100644 trunk/drivers/media/dvb/frontends/lnbp21.h create mode 100644 trunk/drivers/media/dvb/frontends/zl10353.c create mode 100644 trunk/drivers/media/dvb/frontends/zl10353.h create mode 100644 trunk/drivers/media/dvb/frontends/zl10353_priv.h create mode 100644 trunk/drivers/media/video/cpia2/Kconfig create mode 100644 trunk/drivers/media/video/cpia2/Makefile create mode 100644 trunk/drivers/media/video/cpia2/cpia2.h create mode 100644 trunk/drivers/media/video/cpia2/cpia2_core.c create mode 100644 trunk/drivers/media/video/cpia2/cpia2_registers.h create mode 100644 trunk/drivers/media/video/cpia2/cpia2_usb.c create mode 100644 trunk/drivers/media/video/cpia2/cpia2_v4l.c create mode 100644 trunk/drivers/media/video/cpia2/cpia2dev.h create mode 100644 trunk/drivers/media/video/cpia2/cpia2patch.h create mode 100644 trunk/drivers/media/video/cx25840/Kconfig create mode 100644 trunk/drivers/net/irda/toim3232-sir.c create mode 100644 trunk/drivers/scsi/libata-bmdma.c create mode 100644 trunk/drivers/serial/sunhv.c delete mode 100644 trunk/drivers/usb/class/audio.c delete mode 100644 trunk/drivers/usb/class/audio.h delete mode 100644 trunk/drivers/usb/class/usb-midi.c delete mode 100644 trunk/drivers/usb/class/usb-midi.h create mode 100644 trunk/drivers/usb/gadget/at91_udc.c create mode 100644 trunk/drivers/usb/gadget/at91_udc.h create mode 100644 trunk/drivers/usb/host/ehci-au1xxx.c create mode 100644 trunk/drivers/usb/host/ehci-fsl.c create mode 100644 trunk/drivers/usb/host/ehci-fsl.h create mode 100644 trunk/drivers/usb/host/ohci-at91.c create mode 100644 trunk/drivers/usb/media/sn9c102_pas202bca.c create mode 100644 trunk/drivers/usb/media/zc0301.h create mode 100644 trunk/drivers/usb/media/zc0301_core.c create mode 100644 trunk/drivers/usb/media/zc0301_pas202bcb.c create mode 100644 trunk/drivers/usb/media/zc0301_sensor.h create mode 100644 trunk/drivers/usb/serial/navman.c create mode 100644 trunk/fs/jfs/ioctl.c create mode 100644 trunk/include/asm-sparc64/hypervisor.h create mode 100644 trunk/include/asm-sparc64/intr_queue.h create mode 100644 trunk/include/asm-sparc64/numnodes.h create mode 100644 trunk/include/asm-sparc64/scratchpad.h create mode 100644 trunk/include/asm-sparc64/sparsemem.h create mode 100644 trunk/include/asm-sparc64/tsb.h create mode 100644 trunk/include/asm-sparc64/vdev.h create mode 100644 trunk/include/linux/netfilter/xt_policy.h create mode 100644 trunk/include/linux/netfilter_ipv4/ip_conntrack_h323.h create mode 100644 trunk/net/dccp/ccids/ccid2.c create mode 100644 trunk/net/dccp/ccids/ccid2.h create mode 100644 trunk/net/dccp/feat.c create mode 100644 trunk/net/dccp/feat.h create mode 100644 trunk/net/dccp/sysctl.c create mode 100644 trunk/net/ipv4/netfilter/ip_conntrack_helper_h323.c create mode 100644 trunk/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c create mode 100644 trunk/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.h create mode 100644 trunk/net/ipv4/netfilter/ip_conntrack_helper_h323_types.c create mode 100644 trunk/net/ipv4/netfilter/ip_conntrack_helper_h323_types.h create mode 100644 trunk/net/ipv4/netfilter/ip_nat_helper_h323.c delete mode 100644 trunk/net/ipv4/netfilter/ipt_policy.c delete mode 100644 trunk/net/ipv6/netfilter/ip6t_policy.c delete mode 100644 trunk/net/llc/llc_output.h create mode 100644 trunk/net/netfilter/xt_policy.c diff --git a/[refs] b/[refs] index 079c9e0f5ffe..095491fc6ce7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 133a58c1fd97022690d53dd58df56579193cbc1d +refs/heads/master: e952f31bce6e9f64db01f607abc46529ba57ac9e diff --git a/trunk/.gitignore b/trunk/.gitignore index 3f8fb686b59c..53e53f2791f8 100644 --- a/trunk/.gitignore +++ b/trunk/.gitignore @@ -30,3 +30,5 @@ include/linux/autoconf.h include/linux/compile.h include/linux/version.h +# stgit generated dirs +patches-* diff --git a/trunk/CREDITS b/trunk/CREDITS index 1f171f1033bd..af70678a0afd 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -2813,6 +2813,8 @@ E: luca.risolia@studio.unibo.it P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958 5D40 99DA 5D2A FCE6 35A4 D: V4L driver for W996[87]CF JPEG USB Dual Mode Camera Chips D: V4L2 driver for SN9C10x PC Camera Controllers +D: V4L2 driver for ET61X151 and ET61X251 PC Camera Controllers +D: V4L2 driver for ZC0301 Image Processor and Control Chip S: Via Liberta' 41/A S: Osio Sotto, 24046, Bergamo S: Italy diff --git a/trunk/Documentation/Changes b/trunk/Documentation/Changes index fe5ae0f55020..b02f476c2973 100644 --- a/trunk/Documentation/Changes +++ b/trunk/Documentation/Changes @@ -15,24 +15,6 @@ and therefore owes credit to the same people as that file (Jared Mauch, Axel Boldt, Alessandro Sigala, and countless other users all over the 'net). -The latest revision of this document, in various formats, can always -be found at . - -Feel free to translate this document. If you do so, please send me a -URL to your translation for inclusion in future revisions of this -document. - -Smotrite file , yavlyaushisya -russkim perevodom dannogo documenta. - -Visite para obtener la traducción -al español de este documento en varios formatos. - -Eine deutsche Version dieser Datei finden Sie unter -. - -Chris Ricker (kaboom@gatech.edu or chris.ricker@genetics.utah.edu). - Current Minimal Requirements ============================ diff --git a/trunk/Documentation/DocBook/Makefile b/trunk/Documentation/DocBook/Makefile index 1c955883cf58..2975291e296a 100644 --- a/trunk/Documentation/DocBook/Makefile +++ b/trunk/Documentation/DocBook/Makefile @@ -9,7 +9,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \ kernel-hacking.xml kernel-locking.xml deviceiobook.xml \ procfs-guide.xml writing_usb_driver.xml \ - sis900.xml kernel-api.xml journal-api.xml lsm.xml usb.xml \ + kernel-api.xml journal-api.xml lsm.xml usb.xml \ gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml ### diff --git a/trunk/Documentation/DocBook/sis900.tmpl b/trunk/Documentation/DocBook/sis900.tmpl deleted file mode 100644 index 6c2cbac93c3f..000000000000 --- a/trunk/Documentation/DocBook/sis900.tmpl +++ /dev/null @@ -1,585 +0,0 @@ - - - - - - - -SiS 900/7016 Fast Ethernet Device Driver - - - -Ollie -Lho - - - -Lei Chun -Chang - - - -Document Revision: 0.3 for SiS900 driver v1.06 & v1.07 -November 16, 2000 - - - 1999 - Silicon Integrated System Corp. - - - - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - - - - -This document gives some information on installation and usage of SiS 900/7016 -device driver under Linux. - - - - - - - - - Introduction - - -This document describes the revision 1.06 and 1.07 of SiS 900/7016 Fast Ethernet -device driver under Linux. The driver is developed by Silicon Integrated -System Corp. and distributed freely under the GNU General Public License (GPL). -The driver can be compiled as a loadable module and used under Linux kernel -version 2.2.x. (rev. 1.06) -With minimal changes, the driver can also be used under 2.3.x and 2.4.x kernel -(rev. 1.07), please see -. If you are intended to -use the driver for earlier kernels, you are on your own. - - - -The driver is tested with usual TCP/IP applications including -FTP, Telnet, Netscape etc. and is used constantly by the developers. - - - -Please send all comments/fixes/questions to -Lei-Chun Chang. - - - - - Changes - - -Changes made in Revision 1.07 - - - - -Separation of sis900.c and sis900.h in order to move most -constant definition to sis900.h (many of those constants were -corrected) - - - - - -Clean up PCI detection, the pci-scan from Donald Becker were not used, -just simple pci_find_*. - - - - - -MII detection is modified to support multiple mii transceiver. - - - - - -Bugs in read_eeprom, mdio_* were removed. - - - - - -Lot of sis900 irrelevant comments were removed/changed and -more comments were added to reflect the real situation. - - - - - -Clean up of physical/virtual address space mess in buffer -descriptors. - - - - - -Better transmit/receive error handling. - - - - - -The driver now uses zero-copy single buffer management -scheme to improve performance. - - - - - -Names of variables were changed to be more consistent. - - - - - -Clean up of auo-negotiation and timer code. - - - - - -Automatic detection and change of PHY on the fly. - - - - - -Bug in mac probing fixed. - - - - - -Fix 630E equalier problem by modifying the equalizer workaround rule. - - - - - -Support for ICS1893 10/100 Interated PHYceiver. - - - - - -Support for media select by ifconfig. - - - - - -Added kernel-doc extratable documentation. - - - - - - - - - Tested Environment - - -This driver is developed on the following hardware - - - - - -Intel Celeron 500 with SiS 630 (rev 02) chipset - - - - - -SiS 900 (rev 01) and SiS 7016/7014 Fast Ethernet Card - - - - - -and tested with these software environments - - - - - -Red Hat Linux version 6.2 - - - - - -Linux kernel version 2.4.0 - - - - - -Netscape version 4.6 - - - - - -NcFTP 3.0.0 beta 18 - - - - - -Samba version 2.0.3 - - - - - - - - - - -Files in This Package - - -In the package you can find these files: - - - - - - -sis900.c - - -Driver source file in C - - - - - -sis900.h - - -Header file for sis900.c - - - - - -sis900.sgml - - -DocBook SGML source of the document - - - - - -sis900.txt - - -Driver document in plain text - - - - - - - - - - Installation - - -Silicon Integrated System Corp. is cooperating closely with core Linux Kernel -developers. The revisions of SiS 900 driver are distributed by the usuall channels -for kernel tar files and patches. Those kernel tar files for official kernel and -patches for kernel pre-release can be download at -official kernel ftp site -and its mirrors. -The 1.06 revision can be found in kernel version later than 2.3.15 and pre-2.2.14, -and 1.07 revision can be found in kernel version 2.4.0. -If you have no prior experience in networking under Linux, please read -Ethernet HOWTO and -Networking HOWTO available from -Linux Documentation Project (LDP). - - - -The driver is bundled in release later than 2.2.11 and 2.3.15 so this -is the most easy case. -Be sure you have the appropriate packages for compiling kernel source. -Those packages are listed in Document/Changes in kernel source -distribution. If you have to install the driver other than those bundled -in kernel release, you should have your driver file -sis900.c and sis900.h -copied into /usr/src/linux/drivers/net/ first. -There are two alternative ways to install the driver - - - -Building the driver as loadable module - - -To build the driver as a loadable kernel module you have to reconfigure -the kernel to activate network support by - - - -make menuconfig - - - -Choose Loadable module support --->, -then select Enable loadable module support. - - - -Choose Network Device Support --->, select -Ethernet (10 or 100Mbit). -Then select EISA, VLB, PCI and on board controllers, -and choose SiS 900/7016 PCI Fast Ethernet Adapter support -to M. - - - -After reconfiguring the kernel, you can make the driver module by - - - -make modules - - - -The driver should be compiled with no errors. After compiling the driver, -the driver can be installed to proper place by - - - -make modules_install - - - -Load the driver into kernel by - - - -insmod sis900 - - - -When loading the driver into memory, some information message can be view by - - - - -dmesg - - -or - - -cat /var/log/message - - - - -If the driver is loaded properly you will have messages similar to this: - - - -sis900.c: v1.07.06 11/07/2000 -eth0: SiS 900 PCI Fast Ethernet at 0xd000, IRQ 10, 00:00:e8:83:7f:a4. -eth0: SiS 900 Internal MII PHY transceiver found at address 1. -eth0: Using SiS 900 Internal MII PHY as default - - - -showing the version of the driver and the results of probing routine. - - - -Once the driver is loaded, network can be brought up by - - - -/sbin/ifconfig eth0 IPADDR broadcast BROADCAST netmask NETMASK media TYPE - - - -where IPADDR, BROADCAST, NETMASK are your IP address, broadcast address and -netmask respectively. TYPE is used to set medium type used by the device. -Typical values are "10baseT"(twisted-pair 10Mbps Ethernet) or "100baseT" -(twisted-pair 100Mbps Ethernet). For more information on how to configure -network interface, please refer to -Networking HOWTO. - - - -The link status is also shown by kernel messages. For example, after the -network interface is activated, you may have the message: - - - -eth0: Media Link On 100mbps full-duplex - - - -If you try to unplug the twist pair (TP) cable you will get - - - -eth0: Media Link Off - - - -indicating that the link is failed. - - - - -Building the driver into kernel - - -If you want to make the driver into kernel, choose Y -rather than M on -SiS 900/7016 PCI Fast Ethernet Adapter support -when configuring the kernel. Build the kernel image in the usual way - - - -make clean - -make bzlilo - - - -Next time the system reboot, you have the driver in memory. - - - - - - - Known Problems and Bugs - - -There are some known problems and bugs. If you find any other bugs please -mail to lcchang@sis.com.tw - - - - - -AM79C901 HomePNA PHY is not thoroughly tested, there may be some -bugs in the on the fly change of transceiver. - - - - - -A bug is hidden somewhere in the receive buffer management code, -the bug causes NULL pointer reference in the kernel. This fault is -caught before bad things happen and reported with the message: - - -eth0: NULL pointer encountered in Rx ring, skipping - - -which can be viewed with dmesg or -cat /var/log/message. - - - - - -The media type change from 10Mbps to 100Mbps twisted-pair ethernet -by ifconfig causes the media link down. - - - - - - - - - Revision History - - - - - - -November 13, 2000, Revision 1.07, seventh release, 630E problem fixed -and further clean up. - - - - - -November 4, 1999, Revision 1.06, Second release, lots of clean up -and optimization. - - - - - -August 8, 1999, Revision 1.05, Initial Public Release - - - - - - - - - Acknowledgements - - -This driver was originally derived form -Donald Becker's -pci-skeleton and -rtl8139 drivers. Donald also provided various suggestion -regarded with improvements made in revision 1.06. - - - -The 1.05 revision was created by -Jim Huang, AMD 79c901 -support was added by Chin-Shan Li. - - - - -List of Functions -!Idrivers/net/sis900.c - - - diff --git a/trunk/Documentation/connector/connector.txt b/trunk/Documentation/connector/connector.txt index 57a314b14cf8..ad6e0ba7b38c 100644 --- a/trunk/Documentation/connector/connector.txt +++ b/trunk/Documentation/connector/connector.txt @@ -69,10 +69,11 @@ Unregisters new callback with connector core. struct cb_id *id - unique connector's user identifier. -void cn_netlink_send(struct cn_msg *msg, u32 __groups, int gfp_mask); +int cn_netlink_send(struct cn_msg *msg, u32 __groups, int gfp_mask); Sends message to the specified groups. It can be safely called from -any context, but may silently fail under strong memory pressure. +softirq context, but may silently fail under strong memory pressure. +If there are no listeners for given group -ESRCH can be returned. struct cn_msg * - message header(with attached data). u32 __group - destination group. diff --git a/trunk/Documentation/dvb/avermedia.txt b/trunk/Documentation/dvb/avermedia.txt index 068070ff13cd..8bab8461a4af 100644 --- a/trunk/Documentation/dvb/avermedia.txt +++ b/trunk/Documentation/dvb/avermedia.txt @@ -1,4 +1,3 @@ - HOWTO: Get An Avermedia DVB-T working under Linux ______________________________________________ @@ -137,11 +136,8 @@ Getting the card going To power up the card, load the following modules in the following order: - * insmod dvb-core.o - * modprobe bttv.o - * insmod bt878.o - * insmod dvb-bt8xx.o - * insmod sp887x.o + * modprobe bttv (normally loaded automatically) + * modprobe dvb-bt8xx (or place dvb-bt8xx in /etc/modules) Insertion of these modules into the running kernel will activate the appropriate DVB device nodes. It is then possible @@ -302,4 +298,4 @@ Further Update Many thanks to Nigel Pearson for the updates to this document since the recent revision of the driver. - January 29th 2004 + February 14th 2006 diff --git a/trunk/Documentation/dvb/bt8xx.txt b/trunk/Documentation/dvb/bt8xx.txt index 52ed462061df..4e7614e606c5 100644 --- a/trunk/Documentation/dvb/bt8xx.txt +++ b/trunk/Documentation/dvb/bt8xx.txt @@ -1,118 +1,78 @@ -How to get the Nebula, PCTV, FusionHDTV Lite and Twinhan DST cards working -========================================================================== +How to get the bt8xx cards working +================================== -This class of cards has a bt878a as the PCI interface, and -require the bttv driver. +1) General information +====================== -Please pay close attention to the warning about the bttv module -options below for the DST card. +This class of cards has a bt878a as the PCI interface, and require the bttv driver +for accessing the i2c bus and the gpio pins of the bt8xx chipset. +Please see Documentation/dvb/cards.txt => o Cards based on the Conexant Bt8xx PCI bridge: -1) General informations -======================= - -These drivers require the bttv driver to provide the means to access -the i2c bus and the gpio pins of the bt8xx chipset. - -Because of this, you need to enable -"Device drivers" => "Multimedia devices" - => "Video For Linux" => "BT848 Video For Linux" - -Furthermore you need to enable -"Device drivers" => "Multimedia devices" => "Digital Video Broadcasting Devices" - => "DVB for Linux" "DVB Core Support" "BT8xx based PCI cards" +Compiling kernel please enable: +a.)"Device drivers" => "Multimedia devices" => "Video For Linux" => "BT848 Video For Linux" +b.)"Device drivers" => "Multimedia devices" => "Digital Video Broadcasting Devices" + => "DVB for Linux" "DVB Core Support" "Bt8xx based PCI Cards" 2) Loading Modules ================== -In general you need to load the bttv driver, which will handle the gpio and -i2c communication for us, plus the common dvb-bt8xx device driver. -The frontends for Nebula (nxt6000), Pinnacle PCTV (cx24110), TwinHan (dst), -FusionHDTV DVB-T Lite (mt352) and FusionHDTV5 Lite (lgdt330x) are loaded -automatically by the dvb-bt8xx device driver. - -3a) Nebula / Pinnacle PCTV / FusionHDTV Lite ---------------------------------------------- - - $ modprobe bttv (normally bttv is being loaded automatically by kmod) - $ modprobe dvb-bt8xx - -(or just place dvb-bt8xx in /etc/modules for automatic loading) - - -3b) TwinHan and Clones --------------------------- +In default cases bttv is loaded automatically. +To load the backend either place dvb-bt8xx in etc/modules, or apply manually: - $ modprobe bttv card=0x71 - $ modprobe dvb-bt8xx - $ modprobe dst + $ modprobe dvb-bt8xx -The value 0x71 will override the PCI type detection for dvb-bt8xx, -which is necessary for TwinHan cards. Omission of this parameter might result -in a system lockup. +All frontends will be loaded automatically. +People running udev please see Documentation/dvb/udev.txt. -If you're having an older card (blue color PCB) and card=0x71 locks up -your machine, try using 0x68, too. If that does not work, ask on the -mailing list. +In the following cases overriding the PCI type detection for dvb-bt8xx might be necessary: -The DST module takes a couple of useful parameters. +2a) Running TwinHan and Clones +------------------------------ -verbose takes values 0 to 4. These values control the verbosity level, -and can be used to debug also. + $ modprobe bttv card=113 + $ modprobe dvb-bt8xx + $ modprobe dst -verbose=0 means complete disabling of messages - 1 only error messages are displayed - 2 notifications are also displayed - 3 informational messages are also displayed - 4 debug setting +Useful parameters for verbosity level and debugging the dst module: -dst_addons takes values 0 and 0x20. A value of 0 means it is a FTA card. -0x20 means it has a Conditional Access slot. +verbose=0: messages are disabled + 1: only error messages are displayed + 2: notifications are displayed + 3: other useful messages are displayed + 4: debug setting +dst_addons=0: card is a free to air (FTA) card only + 0x20: card has a conditional access slot for scrambled channels -The autodetected values are determined by the cards 'response string' -which you can see in your logs e.g. +The autodetected values are determined by the cards' "response string". +In your logs see f. ex.: dst_get_device_id: Recognize [DSTMCI]. +For bug reports please send in a complete log with verbose=4 activated. +Please also see Documentation/dvb/ci.txt. -dst_get_device_id: Recognise [DSTMCI] - -If you need to sent in bug reports on the dst, please do send in a complete -log with the verbose=4 module parameter. For general usage, the default setting -of verbose=1 is ideal. - - -4) Multiple cards +2b) Running multiple cards -------------------------- -If you happen to be running multiple cards, it would be advisable to load -the bttv module with the card id. This would help to solve any module loading -problems that you might face. - -For example, if you have a Twinhan and Clones card along with a FusionHDTV5 Lite +Examples of card ID's: - $ modprobe bttv card=0x71 card=0x87 - -Here the order of the card id is important and should be the same as that of the -physical order of the cards. Here card=0x71 represents the Twinhan and clones -and card=0x87 represents Fusion HDTV5 Lite. These arguments can also be -specified in decimal, rather than hex: +Pinnacle PCTV Sat: 94 +Nebula Electronics Digi TV: 104 +pcHDTV HD-2000 TV: 112 +Twinhan DST and clones: 113 +Avermedia AverTV DVB-T 771: 123 +Avermedia AverTV DVB-T 761: 124 +DViCO FusionHDTV DVB-T Lite: 128 +DViCO FusionHDTV 5 Lite: 135 +Notice: The order of the card ID should be uprising: +Example: $ modprobe bttv card=113 card=135 + $ modprobe dvb-bt8xx -Some examples of card-id's - -Pinnacle Sat 0x5e (94) -Nebula Digi TV 0x68 (104) -PC HDTV 0x70 (112) -Twinhan 0x71 (113) -FusionHDTV DVB-T Lite 0x80 (128) -FusionHDTV5 Lite 0x87 (135) - -For a full list of card-id's, see the V4L Documentation within the kernel -source: linux/Documentation/video4linux/CARDLIST.bttv - -If you have problems with this please do ask on the mailing list. +For a full list of card ID's please see Documentation/video4linux/CARDLIST.bttv. +In case of further problems send questions to the mailing list: www.linuxdvb.org. --- Authors: Richard Walker, Jamie Honan, Michael Hunold, Manu Abraham, + Uwe Bugla, Michael Krufky diff --git a/trunk/Documentation/dvb/get_dvb_firmware b/trunk/Documentation/dvb/get_dvb_firmware index 75c28a174092..bb55f49f2745 100644 --- a/trunk/Documentation/dvb/get_dvb_firmware +++ b/trunk/Documentation/dvb/get_dvb_firmware @@ -21,8 +21,9 @@ use File::Temp qw/ tempdir /; use IO::Handle; -@components = ( "sp8870", "sp887x", "tda10045", "tda10046", "av7110", "dec2000t", - "dec2540t", "dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004", +@components = ( "sp8870", "sp887x", "tda10045", "tda10046", + "tda10046lifeview", "av7110", "dec2000t", "dec2540t", + "dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004", "or51211", "or51132_qam", "or51132_vsb", "bluebird"); # Check args @@ -126,6 +127,24 @@ sub tda10046 { $outfile; } +sub tda10046lifeview { + my $sourcefile = "Drv_2.11.02.zip"; + my $url = "http://www.lifeview.com.tw/drivers/pci_card/FlyDVB-T/$sourcefile"; + my $hash = "1ea24dee4eea8fe971686981f34fd2e0"; + my $outfile = "dvb-fe-tda10046.fw"; + my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1); + + checkstandard(); + + wgetfile($sourcefile, $url); + unzip($sourcefile, $tmpdir); + extract("$tmpdir/LVHybrid.sys", 0x8b088, 24602, "$tmpdir/fwtmp"); + verify("$tmpdir/fwtmp", $hash); + copy("$tmpdir/fwtmp", $outfile); + + $outfile; +} + sub av7110 { my $sourcefile = "dvb-ttpci-01.fw-261d"; my $url = "http://www.linuxtv.org/downloads/firmware/$sourcefile"; diff --git a/trunk/Documentation/dvb/readme.txt b/trunk/Documentation/dvb/readme.txt index f5c50b22de3b..0b0380c91990 100644 --- a/trunk/Documentation/dvb/readme.txt +++ b/trunk/Documentation/dvb/readme.txt @@ -20,11 +20,23 @@ http://linuxtv.org/downloads/ What's inside this directory: +"avermedia.txt" +contains detailed information about the +Avermedia DVB-T cards. See also "bt8xx.txt". + +"bt8xx.txt" +contains detailed information about the +various bt8xx based "budget" DVB cards. + "cards.txt" contains a list of supported hardware. +"ci.txt" +contains detailed information about the +CI module as part from TwinHan cards and Clones. + "contributors.txt" -is the who-is-who of DVB development +is the who-is-who of DVB development. "faq.txt" contains frequently asked questions and their answers. @@ -34,19 +46,17 @@ script to download and extract firmware for those devices that require it. "ttusb-dec.txt" -contains detailed informations about the +contains detailed information about the TT DEC2000/DEC3000 USB DVB hardware. -"bt8xx.txt" -contains detailed installation instructions for the -various bt8xx based "budget" DVB cards -(Nebula, Pinnacle PCTV, Twinhan DST) - -"README.dibusb" -contains detailed information about adapters -based on DiBcom reference design. - "udev.txt" how to get DVB and udev up and running. +"README.dvb-usb" +contains detailed information about the DVB USB cards. + +"README.flexcop" +contains detailed information about the +Technisat- and Flexcop B2C2 drivers. + Good luck and have fun! diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 81bc51369f59..afeaf6218ea2 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -151,6 +151,13 @@ Who: Ralf Baechle --------------------------- +What: eepro100 network driver +When: January 2007 +Why: replaced by the e100 driver +Who: Adrian Bunk + +--------------------------- + What: Legacy /proc/pci interface (PCI_LEGACY_PROC) When: March 2006 Why: deprecated since 2.5.53 in favor of lspci(8) @@ -189,3 +196,21 @@ Why: Board specific code doesn't build anymore since ~2.6.0 and no users have complained indicating there is no more need for these boards. This should really be considered a last call. Who: Ralf Baechle + +--------------------------- + +What: USB driver API moves to EXPORT_SYMBOL_GPL +When: Febuary 2008 +Files: include/linux/usb.h, drivers/usb/core/driver.c +Why: The USB subsystem has changed a lot over time, and it has been + possible to create userspace USB drivers using usbfs/libusb/gadgetfs + that operate as fast as the USB bus allows. Because of this, the USB + subsystem will not be allowing closed source kernel drivers to + register with it, after this grace period is over. If anyone needs + any help in converting their closed source drivers over to use the + userspace filesystems, please contact the + linux-usb-devel@lists.sourceforge.net mailing list, and the developers + there will be glad to help you out. +Who: Greg Kroah-Hartman + +--------------------------- diff --git a/trunk/Documentation/networking/00-INDEX b/trunk/Documentation/networking/00-INDEX index 5b01d5cc4e95..b1181ce232d9 100644 --- a/trunk/Documentation/networking/00-INDEX +++ b/trunk/Documentation/networking/00-INDEX @@ -92,8 +92,6 @@ routing.txt - the new routing mechanism shaper.txt - info on the module that can shape/limit transmitted traffic. -sis900.txt - - SiS 900/7016 Fast Ethernet device driver info. sk98lin.txt - Marvell Yukon Chipset / SysKonnect SK-98xx compliant Gigabit Ethernet Adapter family driver info diff --git a/trunk/Documentation/networking/README.ipw2100 b/trunk/Documentation/networking/README.ipw2100 index 3ab40379d1cf..f3fcaa41f774 100644 --- a/trunk/Documentation/networking/README.ipw2100 +++ b/trunk/Documentation/networking/README.ipw2100 @@ -3,18 +3,18 @@ Intel(R) PRO/Wireless 2100 Driver for Linux in support of: Intel(R) PRO/Wireless 2100 Network Connection -Copyright (C) 2003-2005, Intel Corporation +Copyright (C) 2003-2006, Intel Corporation README.ipw2100 -Version: 1.1.3 -Date : October 17, 2005 +Version: git-1.1.5 +Date : January 25, 2006 Index ----------------------------------------------- 0. IMPORTANT INFORMATION BEFORE USING THIS DRIVER 1. Introduction -2. Release 1.1.3 Current Features +2. Release git-1.1.5 Current Features 3. Command Line Parameters 4. Sysfs Helper Files 5. Radio Kill Switch @@ -89,7 +89,7 @@ potential fixes and patches, as well as links to the development mailing list for the driver project. -2. Release 1.1.3 Current Supported Features +2. Release git-1.1.5 Current Supported Features ----------------------------------------------- - Managed (BSS) and Ad-Hoc (IBSS) - WEP (shared key and open) @@ -270,7 +270,7 @@ For installation support on the ipw2100 1.1.0 driver on Linux kernels 9. License ----------------------------------------------- - Copyright(c) 2003 - 2005 Intel Corporation. All rights reserved. + Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License (version 2) as diff --git a/trunk/Documentation/networking/README.ipw2200 b/trunk/Documentation/networking/README.ipw2200 index c6492d3839fa..acb30c5dcff3 100644 --- a/trunk/Documentation/networking/README.ipw2200 +++ b/trunk/Documentation/networking/README.ipw2200 @@ -10,7 +10,7 @@ both hardware adapters listed above. In this document the Intel(R) PRO/Wireless 2915ABG Driver for Linux will be used to reference the unified driver. -Copyright (C) 2004-2005, Intel Corporation +Copyright (C) 2004-2006, Intel Corporation README.ipw2200 @@ -26,9 +26,11 @@ Index 1.2. Module parameters 1.3. Wireless Extension Private Methods 1.4. Sysfs Helper Files +1.5. Supported channels 2. Ad-Hoc Networking 3. Interacting with Wireless Tools 3.1. iwconfig mode +3.2. iwconfig sens 4. About the Version Numbers 5. Firmware installation 6. Support @@ -314,6 +316,35 @@ For the device level files, see /sys/bus/pci/drivers/ipw2200: running ifconfig and is therefore disabled by default. +1.5. Supported channels +----------------------------------------------- + +Upon loading the Intel(R) PRO/Wireless 2915ABG Driver for Linux, a +message stating the detected geography code and the number of 802.11 +channels supported by the card will be displayed in the log. + +The geography code corresponds to a regulatory domain as shown in the +table below. + + Supported channels +Code Geography 802.11bg 802.11a + +--- Restricted 11 0 +ZZF Custom US/Canada 11 8 +ZZD Rest of World 13 0 +ZZA Custom USA & Europe & High 11 13 +ZZB Custom NA & Europe 11 13 +ZZC Custom Japan 11 4 +ZZM Custom 11 0 +ZZE Europe 13 19 +ZZJ Custom Japan 14 4 +ZZR Rest of World 14 0 +ZZH High Band 13 4 +ZZG Custom Europe 13 4 +ZZK Europe 13 24 +ZZL Europe 11 13 + + 2. Ad-Hoc Networking ----------------------------------------------- @@ -353,6 +384,15 @@ When configuring the mode of the adapter, all run-time configured parameters are reset to the value used when the module was loaded. This includes channels, rates, ESSID, etc. +3.2 iwconfig sens +----------------------------------------------- + +The 'iwconfig ethX sens XX' command will not set the signal sensitivity +threshold, as described in iwconfig documentation, but rather the number +of consecutive missed beacons that will trigger handover, i.e. roaming +to another access point. At the same time, it will set the disassociation +threshold to 3 times the given value. + 4. About the Version Numbers ----------------------------------------------- @@ -408,7 +448,7 @@ For general information and support, go to: 7. License ----------------------------------------------- - Copyright(c) 2003 - 2005 Intel Corporation. All rights reserved. + Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as diff --git a/trunk/Documentation/networking/e100.txt b/trunk/Documentation/networking/e100.txt index 4ef9f7cd5dc3..944aa55e79f8 100644 --- a/trunk/Documentation/networking/e100.txt +++ b/trunk/Documentation/networking/e100.txt @@ -1,16 +1,17 @@ Linux* Base Driver for the Intel(R) PRO/100 Family of Adapters ============================================================== -November 17, 2004 - +November 15, 2005 Contents ======== - In This Release - Identifying Your Adapter +- Building and Installation - Driver Configuration Parameters - Additional Configurations +- Known Issues - Support @@ -18,18 +19,30 @@ In This Release =============== This file describes the Linux* Base Driver for the Intel(R) PRO/100 Family of -Adapters, version 3.3.x. This driver supports 2.4.x and 2.6.x kernels. +Adapters. This driver includes support for Itanium(R)2-based systems. + +For questions related to hardware requirements, refer to the documentation +supplied with your Intel PRO/100 adapter. + +The following features are now available in supported kernels: + - Native VLANs + - Channel Bonding (teaming) + - SNMP + +Channel Bonding documentation can be found in the Linux kernel source: +/Documentation/networking/bonding.txt + Identifying Your Adapter ======================== -For more information on how to identify your adapter, go to the Adapter & +For more information on how to identify your adapter, go to the Adapter & 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 +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 networking link on the left to search for your adapter: http://downloadfinder.intel.com/scripts-df/support_intel.asp @@ -40,73 +53,75 @@ Driver Configuration Parameters The default value for each parameter is generally the recommended setting, unless otherwise noted. -Rx Descriptors: Number of receive descriptors. A receive descriptor is a data - structure that describes a receive buffer and its attributes to the network - controller. The data in the descriptor is used by the controller to write - data from the controller to host memory. In the 3.0.x driver the valid - range for this parameter is 64-256. The default value is 64. This parameter - can be changed using the command - +Rx Descriptors: Number of receive descriptors. A receive descriptor is a data + structure that describes a receive buffer and its attributes to the network + controller. The data in the descriptor is used by the controller to write + data from the controller to host memory. In the 3.x.x driver the valid range + for this parameter is 64-256. The default value is 64. This parameter can be + changed using the command: + ethtool -G eth? rx n, where n is the number of desired rx descriptors. -Tx Descriptors: Number of transmit descriptors. A transmit descriptor is a - data structure that describes a transmit buffer and its attributes to the - network controller. The data in the descriptor is used by the controller to - read data from the host memory to the controller. In the 3.0.x driver the - valid range for this parameter is 64-256. The default value is 64. This - parameter can be changed using the command +Tx Descriptors: Number of transmit descriptors. A transmit descriptor is a data + structure that describes a transmit buffer and its attributes to the network + controller. The data in the descriptor is used by the controller to read + data from the host memory to the controller. In the 3.x.x driver the valid + range for this parameter is 64-256. The default value is 64. This parameter + can be changed using the command: ethtool -G eth? tx n, where n is the number of desired tx descriptors. -Speed/Duplex: The driver auto-negotiates the link speed and duplex settings by - default. Ethtool can be used as follows to force speed/duplex. +Speed/Duplex: The driver auto-negotiates the link speed and duplex settings by + default. Ethtool can be used as follows to force speed/duplex. ethtool -s eth? autoneg off speed {10|100} duplex {full|half} NOTE: setting the speed/duplex to incorrect values will cause the link to fail. -Event Log Message Level: The driver uses the message level flag to log events - to syslog. The message level can be set at driver load time. It can also be - set using the command +Event Log Message Level: The driver uses the message level flag to log events + to syslog. The message level can be set at driver load time. It can also be + set using the command: ethtool -s eth? msglvl n + Additional Configurations ========================= Configuring the Driver on Different Distributions ------------------------------------------------- - Configuring a network driver to load properly when the system is started is - distribution dependent. Typically, the configuration process involves adding - an alias line to /etc/modules.conf as well as editing other system startup - scripts and/or configuration files. Many popular Linux distributions ship - with tools to make these changes for you. To learn the proper way to - configure a network device for your system, refer to your distribution - documentation. If during this process you are asked for the driver or module - name, the name for the Linux Base Driver for the Intel PRO/100 Family of - Adapters is e100. + Configuring a network driver to load properly when the system is started is + distribution dependent. Typically, the configuration process involves adding + an alias line to /etc/modules.conf or /etc/modprobe.conf as well as editing + other system startup scripts and/or configuration files. Many popular Linux + distributions ship with tools to make these changes for you. To learn the + proper way to configure a network device for your system, refer to your + distribution documentation. If during this process you are asked for the + driver or module name, the name for the Linux Base Driver for the Intel + PRO/100 Family of Adapters is e100. - As an example, if you install the e100 driver for two PRO/100 adapters - (eth0 and eth1), add the following to modules.conf: + As an example, if you install the e100 driver for two PRO/100 adapters + (eth0 and eth1), add the following to modules.conf or modprobe.conf: alias eth0 e100 alias eth1 e100 Viewing Link Messages --------------------- - In order to see link messages and other Intel driver information on your - console, you must set the dmesg level up to six. This can be done by - entering the following on the command line before loading the e100 driver: + In order to see link messages and other Intel driver information on your + console, you must set the dmesg level up to six. This can be done by + entering the following on the command line before loading the e100 driver: dmesg -n 8 - If you wish to see all messages issued by the driver, including debug + If you wish to see all messages issued by the driver, including debug messages, set the dmesg level to eight. NOTE: This setting is not saved across reboots. + Ethtool ------- @@ -114,29 +129,27 @@ Additional Configurations diagnostics, as well as displaying statistical information. Ethtool version 1.6 or later is required for this functionality. - The latest release of ethtool can be found at: - http://sf.net/projects/gkernel. + The latest release of ethtool can be found from + http://sourceforge.net/projects/gkernel. - NOTE: This driver uses mii support from the kernel. As a result, when - there is no link, ethtool will report speed/duplex to be 10/half. + NOTE: Ethtool 1.6 only supports a limited set of ethtool options. Support + for a more complete ethtool feature set can be enabled by upgrading + ethtool to ethtool-1.8.1. - NOTE: Ethtool 1.6 only supports a limited set of ethtool options. Support - for a more complete ethtool feature set can be enabled by upgrading - ethtool to ethtool-1.8.1. Enabling Wake on LAN* (WoL) --------------------------- - WoL is provided through the Ethtool* utility. Ethtool is included with Red - Hat* 8.0. For other Linux distributions, download and install Ethtool from - the following website: http://sourceforge.net/projects/gkernel. + WoL is provided through the Ethtool* utility. Ethtool is included with Red + Hat* 8.0. For other Linux distributions, download and install Ethtool from + the following website: http://sourceforge.net/projects/gkernel. - For instructions on enabling WoL with Ethtool, refer to the Ethtool man - page. + For instructions on enabling WoL with Ethtool, refer to the Ethtool man page. WoL will be enabled on the system during the next shut down or reboot. For - this driver version, in order to enable WoL, the e100 driver must be + this driver version, in order to enable WoL, the e100 driver must be loaded when shutting down or rebooting the system. + NAPI ---- @@ -144,6 +157,25 @@ Additional Configurations See www.cyberus.ca/~hadi/usenix-paper.tgz for more information on NAPI. + Multiple Interfaces on Same Ethernet Broadcast Network + ------------------------------------------------------ + + Due to the default ARP behavior on Linux, it is not possible to have + one system on two IP networks in the same Ethernet broadcast domain + (non-partitioned switch) behave as expected. All Ethernet interfaces + will respond to IP traffic for any IP address assigned to the system. + This results in unbalanced receive traffic. + + If you have multiple interfaces in a server, either turn on ARP + filtering by + + (1) entering: echo 1 > /proc/sys/net/ipv4/conf/all/arp_filter + (this only works if your kernel's version is higher than 2.4.5), or + + (2) installing the interfaces in separate broadcast domains (either + in different switches or in a switch partitioned to VLANs). + + Support ======= @@ -151,20 +183,24 @@ For general information, go to the Intel support website at: http://support.intel.com + or the Intel Wired Networking project hosted by Sourceforge at: + + http://sourceforge.net/projects/e1000 + If an issue is identified with the released source code on the supported -kernel with a supported adapter, email the specific information related to -the issue to linux.nics@intel.com. +kernel with a supported adapter, email the specific information related to the +issue to e1000-devel@lists.sourceforge.net. License ======= -This software program is released under the terms of a license agreement -between you ('Licensee') and Intel. Do not use or load this software or any -associated materials (collectively, the 'Software') until you have carefully -read the full terms and conditions of the LICENSE located in this software -package. By loading or using the Software, you agree to the terms of this -Agreement. If you do not agree with the terms of this Agreement, do not -install or use the Software. +This software program is released under the terms of a license agreement +between you ('Licensee') and Intel. Do not use or load this software or any +associated materials (collectively, the 'Software') until you have carefully +read the full terms and conditions of the file COPYING located in this software +package. By loading or using the Software, you agree to the terms of this +Agreement. If you do not agree with the terms of this Agreement, do not install +or use the Software. * Other names and brands may be claimed as the property of others. diff --git a/trunk/Documentation/networking/e1000.txt b/trunk/Documentation/networking/e1000.txt index 2ebd4058d46d..71fe15af356c 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 =============================================================== -November 17, 2004 +November 15, 2005 Contents @@ -20,254 +20,316 @@ In This Release =============== This file describes the Linux* Base Driver for the Intel(R) PRO/1000 Family -of Adapters, version 5.x.x. +of Adapters. This driver includes support for Itanium(R)2-based systems. -For questions related to hardware requirements, refer to the documentation -supplied with your Intel PRO/1000 adapter. All hardware requirements listed +For questions related to hardware requirements, refer to the documentation +supplied with your Intel PRO/1000 adapter. All hardware requirements listed apply to use with Linux. -Native VLANs are now available with supported kernels. +The following features are now available in supported kernels: + - Native VLANs + - Channel Bonding (teaming) + - SNMP + +Channel Bonding documentation can be found in the Linux kernel source: +/Documentation/networking/bonding.txt + +The driver information previously displayed in the /proc filesystem is not +supported in this release. Alternatively, you can use ethtool (version 1.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. + Identifying Your Adapter ======================== -For more information on how to identify your adapter, go to the Adapter & +For more information on how to identify your adapter, go to the Adapter & 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 +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 networking link on the left to search for your adapter: http://downloadfinder.intel.com/scripts-df/support_intel.asp -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 or insmod command -using this syntax: +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 or insmod +command using this syntax: modprobe e1000 [