From 59da9a049309c136a0ff39da7a99f9a542d026d8 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 21 Jul 2008 11:02:45 +0200 Subject: [PATCH] --- yaml --- r: 104309 b: refs/heads/master c: e27772b48df91a954a74b1411b57d83b945a58c7 h: refs/heads/master i: 104307: 9e320e97b778702254cf5ddf30154d97bbeb75ff v: v3 --- [refs] | 2 +- .../feature-removal-schedule.txt | 22 + .../filesystems/configfs/configfs.txt | 10 +- .../filesystems/configfs/configfs_example.c | 14 +- trunk/Documentation/filesystems/nfs-rdma.txt | 103 +- trunk/Documentation/networking/bonding.txt | 110 +- trunk/Documentation/networking/dm9000.txt | 167 + trunk/Documentation/networking/ip-sysctl.txt | 21 +- trunk/Documentation/networking/ixgb.txt | 419 +- .../networking/mac80211_hwsim/README | 67 + .../networking/mac80211_hwsim/hostapd.conf | 11 + .../mac80211_hwsim/wpa_supplicant.conf | 10 + trunk/Documentation/networking/multiqueue.txt | 90 +- trunk/Documentation/networking/s2io.txt | 7 +- .../powerpc/booting-without-of.txt | 78 +- trunk/Documentation/rfkill.txt | 547 +- trunk/Documentation/serial/driver | 11 + .../video4linux/CARDLIST.cx23885 | 1 + .../Documentation/video4linux/CARDLIST.em28xx | 5 +- .../video4linux/CARDLIST.saa7134 | 8 +- trunk/Documentation/video4linux/cx18.txt | 36 +- trunk/Documentation/video4linux/gspca.txt | 243 + trunk/MAINTAINERS | 18 +- trunk/arch/blackfin/mach-bf527/boards/ezkit.c | 7 +- trunk/arch/blackfin/mach-bf533/boards/H8606.c | 7 +- .../mach-bf537/boards/generic_board.c | 7 +- trunk/arch/cris/arch-v10/boot/Makefile | 1 - .../cris/arch-v10/boot/compressed/Makefile | 14 +- .../arch-v10/boot/compressed/decompress.ld | 3 +- .../arch/cris/arch-v10/boot/compressed/head.S | 98 +- .../arch/cris/arch-v10/boot/compressed/misc.c | 144 +- trunk/arch/cris/arch-v10/boot/rescue/Makefile | 9 +- trunk/arch/cris/arch-v10/drivers/pcf8563.c | 2 +- trunk/arch/cris/arch-v10/kernel/debugport.c | 20 +- trunk/arch/cris/arch-v32/boot/Makefile | 1 - .../cris/arch-v32/boot/compressed/Makefile | 6 +- trunk/arch/cris/arch-v32/boot/rescue/Makefile | 3 +- trunk/arch/cris/arch-v32/drivers/pcf8563.c | 2 +- trunk/arch/ia64/hp/sim/simserial.c | 46 +- trunk/arch/ia64/kvm/Makefile | 3 +- trunk/arch/ia64/kvm/kvm-ia64.c | 20 +- trunk/arch/m68k/Kconfig | 36 +- trunk/arch/m68k/Makefile | 2 +- trunk/arch/m68k/amiga/config.c | 22 +- trunk/arch/m68k/atari/debug.c | 37 +- trunk/arch/m68k/fpsp040/Makefile | 1 - trunk/arch/m68k/ifpsp060/Makefile | 1 - trunk/arch/m68k/kernel/Makefile | 2 - trunk/arch/m68k/kernel/setup.c | 9 + trunk/arch/m68k/kernel/vmlinux-std.lds | 3 +- trunk/arch/m68k/kernel/vmlinux-sun3.lds | 7 +- trunk/arch/m68k/lib/Makefile | 2 - trunk/arch/m68k/mac/Makefile | 2 +- trunk/arch/m68k/mac/baboon.c | 26 +- trunk/arch/m68k/mac/bootparse.c | 122 - trunk/arch/m68k/mac/config.c | 11 +- trunk/arch/m68k/mac/debug.c | 41 +- trunk/arch/m68k/mac/oss.c | 8 +- trunk/arch/m68k/mac/psc.c | 4 +- trunk/arch/m68k/mac/via.c | 2 +- trunk/arch/m68k/math-emu/Makefile | 2 - trunk/arch/m68k/mm/motorola.c | 1 - trunk/arch/m68k/mm/sun3mmu.c | 1 - trunk/arch/m68k/q40/config.c | 26 +- trunk/arch/m68k/sun3/Makefile | 2 +- trunk/arch/m68k/sun3/config.c | 7 +- trunk/arch/m68k/sun3/dvma.c | 2 +- trunk/arch/m68k/sun3/idprom.c | 4 +- trunk/arch/m68k/sun3/mmu_emu.c | 2 +- trunk/arch/m68k/sun3/prom/Makefile | 1 - trunk/arch/m68k/sun3/prom/console.c | 6 +- trunk/arch/m68k/sun3/prom/init.c | 11 +- trunk/arch/m68k/sun3/prom/misc.c | 2 +- trunk/arch/m68k/sun3/prom/printf.c | 7 +- trunk/arch/m68k/sun3/sbus.c | 27 - trunk/arch/m68k/sun3/sun3dvma.c | 2 +- trunk/arch/m68k/sun3/sun3ints.c | 2 +- trunk/arch/mips/Kconfig | 22 +- trunk/arch/mips/Makefile | 7 + trunk/arch/mips/cobalt/setup.c | 4 +- trunk/arch/mips/configs/rb532_defconfig | 1314 ++ trunk/arch/mips/kernel/linux32.c | 17 - trunk/arch/mips/kernel/scall32-o32.S | 2 +- trunk/arch/mips/kernel/scall64-64.S | 2 +- trunk/arch/mips/kernel/scall64-n32.S | 2 +- trunk/arch/mips/kernel/scall64-o32.S | 2 +- trunk/arch/mips/kernel/syscall.c | 9 +- trunk/arch/mips/math-emu/kernel_linkage.c | 1 + trunk/arch/mips/pci/Makefile | 1 + trunk/arch/mips/pci/fixup-rc32434.c | 69 + trunk/arch/mips/pci/ops-rc32434.c | 207 + trunk/arch/mips/pci/pci-rc32434.c | 221 + trunk/arch/mips/pci/pci.c | 2 +- trunk/arch/mips/rb532/Makefile | 7 + trunk/arch/mips/rb532/devices.c | 331 + trunk/arch/mips/rb532/gpio.c | 220 + trunk/arch/mips/rb532/irq.c | 209 + trunk/arch/mips/rb532/prom.c | 158 + trunk/arch/mips/rb532/serial.c | 53 + trunk/arch/mips/rb532/setup.c | 79 + trunk/arch/mips/rb532/time.c | 67 + trunk/arch/mips/sgi-ip22/ip22-platform.c | 3 +- trunk/arch/mips/sgi-ip22/ip28-berr.c | 4 +- trunk/arch/mips/sgi-ip32/ip32-platform.c | 13 +- trunk/arch/mips/txx9/Kconfig | 2 + trunk/arch/mips/txx9/generic/Makefile | 4 +- trunk/arch/mips/txx9/generic/irq_tx4927.c | 2 +- trunk/arch/mips/txx9/generic/irq_tx4938.c | 2 +- trunk/arch/mips/txx9/generic/mem_tx4927.c | 94 +- trunk/arch/mips/txx9/generic/mem_tx4938.c | 124 - trunk/arch/mips/txx9/generic/setup.c | 38 +- trunk/arch/mips/txx9/generic/setup_tx4927.c | 194 + trunk/arch/mips/txx9/generic/setup_tx4938.c | 259 + trunk/arch/mips/txx9/jmr3927/setup.c | 8 - trunk/arch/mips/txx9/rbtx4927/irq.c | 12 +- trunk/arch/mips/txx9/rbtx4927/prom.c | 6 +- trunk/arch/mips/txx9/rbtx4927/setup.c | 89 +- trunk/arch/mips/txx9/rbtx4938/prom.c | 6 +- trunk/arch/mips/txx9/rbtx4938/setup.c | 231 +- trunk/arch/mn10300/kernel/mn10300-serial.c | 2 +- trunk/arch/powerpc/kvm/Makefile | 2 +- trunk/arch/powerpc/kvm/powerpc.c | 11 +- trunk/arch/s390/kvm/interrupt.c | 32 +- trunk/arch/s390/kvm/kvm-s390.c | 21 +- trunk/arch/s390/kvm/priv.c | 2 +- trunk/arch/s390/kvm/sigp.c | 20 +- trunk/arch/x86/kernel/kvmclock.c | 2 +- trunk/arch/x86/kvm/Makefile | 3 +- trunk/arch/x86/kvm/i8254.c | 24 +- trunk/arch/x86/kvm/i8259.c | 9 +- trunk/arch/x86/kvm/irq.h | 2 + trunk/arch/x86/kvm/lapic.c | 14 +- trunk/arch/x86/kvm/lapic.h | 1 + trunk/arch/x86/kvm/mmu.c | 62 +- trunk/arch/x86/kvm/mmu.h | 3 +- trunk/arch/x86/kvm/paging_tmpl.h | 28 +- trunk/arch/x86/kvm/svm.c | 131 +- trunk/arch/x86/kvm/vmx.c | 230 +- trunk/arch/x86/kvm/vmx.h | 12 +- trunk/arch/x86/kvm/x86.c | 299 +- trunk/arch/x86/kvm/x86_emulate.c | 257 +- trunk/drivers/Makefile | 4 +- trunk/drivers/acpi/bay.c | 3 - trunk/drivers/acpi/dock.c | 3 - trunk/drivers/acpi/glue.c | 3 - trunk/drivers/atm/Kconfig | 79 +- trunk/drivers/atm/Makefile | 39 - trunk/drivers/atm/fore200e.c | 130 +- trunk/drivers/atm/fore200e.h | 3 - trunk/drivers/atm/fore200e_firmware_copyright | 31 - trunk/drivers/atm/fore200e_mkfirm.c | 154 - trunk/drivers/atm/he.c | 152 - trunk/drivers/atm/he.h | 26 - trunk/drivers/atm/iphase.c | 30 +- trunk/drivers/atm/pca200e.data | 850 - trunk/drivers/atm/pca200e_ecd.data | 906 - trunk/drivers/atm/sba200e_ecd.data | 928 - trunk/drivers/atm/suni.c | 130 +- trunk/drivers/atm/suni.h | 40 +- trunk/drivers/block/ataflop.c | 4 +- trunk/drivers/bluetooth/Kconfig | 1 + trunk/drivers/bluetooth/hci_bcsp.c | 44 +- trunk/drivers/bluetooth/hci_ldisc.c | 6 +- trunk/drivers/char/cyclades.c | 342 +- trunk/drivers/char/epca.c | 110 +- trunk/drivers/char/epca.h | 7 +- trunk/drivers/char/esp.c | 272 +- trunk/drivers/char/generic_serial.c | 158 +- trunk/drivers/char/ip2/i2lib.c | 4 +- trunk/drivers/char/ip2/ip2main.c | 7 +- trunk/drivers/char/isicom.c | 215 +- trunk/drivers/char/istallion.c | 116 +- trunk/drivers/char/moxa.c | 93 +- trunk/drivers/char/mxser.c | 284 +- trunk/drivers/char/n_hdlc.c | 6 +- trunk/drivers/char/n_r3964.c | 2 +- trunk/drivers/char/n_tty.c | 2 +- trunk/drivers/char/nvram.c | 2 +- trunk/drivers/char/pcmcia/synclink_cs.c | 32 +- trunk/drivers/char/pty.c | 10 +- trunk/drivers/char/rio/cirrus.h | 3 - trunk/drivers/char/rio/cmdblk.h | 6 - trunk/drivers/char/rio/cmdpkt.h | 6 - trunk/drivers/char/rio/daemon.h | 6 - trunk/drivers/char/rio/errors.h | 6 - trunk/drivers/char/rio/func.h | 6 - trunk/drivers/char/rio/map.h | 4 - trunk/drivers/char/rio/param.h | 5 - trunk/drivers/char/rio/parmmap.h | 7 - trunk/drivers/char/rio/pci.h | 4 - trunk/drivers/char/rio/protsts.h | 7 - trunk/drivers/char/rio/rio_linux.c | 25 +- trunk/drivers/char/rio/rioboard.h | 6 - trunk/drivers/char/rio/riocmd.c | 13 +- trunk/drivers/char/rio/rioctrl.c | 4 - trunk/drivers/char/rio/riodrvr.h | 4 - trunk/drivers/char/rio/rioinfo.h | 4 - trunk/drivers/char/rio/rioinit.c | 3 - trunk/drivers/char/rio/riointr.c | 14 +- trunk/drivers/char/rio/rioparam.c | 6 +- trunk/drivers/char/rio/rioroute.c | 3 - trunk/drivers/char/rio/riospace.h | 4 - trunk/drivers/char/rio/riotable.c | 3 - trunk/drivers/char/rio/riotty.c | 20 +- trunk/drivers/char/rio/route.h | 6 - trunk/drivers/char/rio/unixrup.h | 4 - trunk/drivers/char/riscom8.c | 187 +- trunk/drivers/char/riscom8.h | 10 +- trunk/drivers/char/rocket.c | 139 +- trunk/drivers/char/rocket.h | 4 +- trunk/drivers/char/rocket_int.h | 11 +- trunk/drivers/char/selection.c | 3 +- trunk/drivers/char/specialix.c | 153 +- trunk/drivers/char/specialix_io8.h | 8 +- trunk/drivers/char/stallion.c | 160 +- trunk/drivers/char/sx.c | 115 +- trunk/drivers/char/synclink.c | 246 +- trunk/drivers/char/synclink_gt.c | 247 +- trunk/drivers/char/synclinkmp.c | 250 +- trunk/drivers/char/tty_io.c | 420 +- trunk/drivers/char/tty_ioctl.c | 16 +- trunk/drivers/dio/dio-driver.c | 14 +- .../infiniband/ulp/ipoib/ipoib_multicast.c | 4 +- trunk/drivers/input/keyboard/atakbd.c | 2 +- trunk/drivers/input/serio/serport.c | 2 +- trunk/drivers/isdn/capi/capi.c | 4 +- trunk/drivers/isdn/gigaset/ser-gigaset.c | 2 +- trunk/drivers/isdn/i4l/isdn_net.c | 2 +- trunk/drivers/media/Kconfig | 5 +- trunk/drivers/media/common/ir-functions.c | 26 +- trunk/drivers/media/common/saa7146_core.c | 4 +- trunk/drivers/media/common/saa7146_hlp.c | 2 +- trunk/drivers/media/common/saa7146_i2c.c | 34 +- trunk/drivers/media/common/saa7146_video.c | 4 +- trunk/drivers/media/common/tuners/Kconfig | 1 + .../media/common/tuners/tda18271-maps.c | 2 +- .../media/common/tuners/tuner-xc2028.c | 25 +- trunk/drivers/media/common/tuners/xc5000.c | 7 + trunk/drivers/media/dvb/Kconfig | 1 + trunk/drivers/media/dvb/Makefile | 2 +- trunk/drivers/media/dvb/bt8xx/bt878.h | 2 +- trunk/drivers/media/dvb/dvb-core/demux.h | 2 +- trunk/drivers/media/dvb/dvb-core/dmxdev.c | 2 +- .../media/dvb/dvb-core/dvb_ca_en50221.c | 8 +- trunk/drivers/media/dvb/dvb-core/dvb_demux.c | 17 +- trunk/drivers/media/dvb/dvb-core/dvb_net.c | 6 +- .../media/dvb/dvb-core/dvb_ringbuffer.c | 78 +- .../media/dvb/dvb-core/dvb_ringbuffer.h | 12 +- trunk/drivers/media/dvb/dvb-usb/Kconfig | 15 + trunk/drivers/media/dvb/dvb-usb/Makefile | 3 + trunk/drivers/media/dvb/dvb-usb/anysee.c | 553 + trunk/drivers/media/dvb/dvb-usb/anysee.h | 304 + trunk/drivers/media/dvb/dvb-usb/au6610.c | 83 +- trunk/drivers/media/dvb/dvb-usb/au6610.h | 22 +- trunk/drivers/media/dvb/dvb-usb/cxusb.c | 146 +- trunk/drivers/media/dvb/dvb-usb/cxusb.h | 3 + .../media/dvb/dvb-usb/dib0700_devices.c | 7 +- trunk/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c | 4 - trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 8 + trunk/drivers/media/dvb/dvb-usb/gl861.c | 38 +- trunk/drivers/media/dvb/dvb-usb/gl861.h | 2 +- trunk/drivers/media/dvb/frontends/au8522.c | 1 - trunk/drivers/media/dvb/frontends/dvb-pll.c | 47 + trunk/drivers/media/dvb/frontends/dvb-pll.h | 1 + trunk/drivers/media/dvb/frontends/lgdt330x.c | 24 +- trunk/drivers/media/dvb/frontends/s5h1409.c | 1 - trunk/drivers/media/dvb/frontends/s5h1411.c | 1 - trunk/drivers/media/dvb/frontends/tda10023.c | 197 +- trunk/drivers/media/dvb/frontends/tda1002x.h | 41 +- trunk/drivers/media/dvb/pluto2/pluto2.c | 2 +- trunk/drivers/media/dvb/siano/Kconfig | 26 + trunk/drivers/media/dvb/siano/Makefile | 8 + trunk/drivers/media/dvb/siano/sms-cards.c | 102 + trunk/drivers/media/dvb/siano/sms-cards.h | 45 + trunk/drivers/media/dvb/siano/smscoreapi.c | 1251 + trunk/drivers/media/dvb/siano/smscoreapi.h | 434 + trunk/drivers/media/dvb/siano/smsdvb.c | 449 + trunk/drivers/media/dvb/siano/smsusb.c | 459 + trunk/drivers/media/dvb/ttpci/Kconfig | 2 + trunk/drivers/media/dvb/ttpci/Makefile | 7 +- trunk/drivers/media/dvb/ttpci/av7110.c | 47 +- trunk/drivers/media/dvb/ttpci/av7110.h | 1 - trunk/drivers/media/dvb/ttpci/av7110_av.c | 2 +- trunk/drivers/media/dvb/ttpci/av7110_ca.c | 2 +- trunk/drivers/media/dvb/ttpci/av7110_hw.h | 3 - trunk/drivers/media/dvb/ttpci/budget-av.c | 12 +- trunk/drivers/media/dvb/ttpci/budget-ci.c | 24 + trunk/drivers/media/dvb/ttpci/budget-core.c | 4 - trunk/drivers/media/dvb/ttpci/budget-patch.c | 44 +- .../media/dvb/ttusb-budget/dvb-ttusb-budget.c | 22 +- trunk/drivers/media/radio/radio-si470x.c | 483 +- trunk/drivers/media/video/Kconfig | 99 +- trunk/drivers/media/video/Makefile | 5 + trunk/drivers/media/video/bt819.c | 2 +- trunk/drivers/media/video/bt8xx/bt832.c | 1 - trunk/drivers/media/video/bt8xx/bttv-driver.c | 51 +- trunk/drivers/media/video/bt8xx/bttv-i2c.c | 49 +- trunk/drivers/media/video/bt8xx/bttv-vbi.c | 6 +- trunk/drivers/media/video/bt8xx/bttv.h | 1 - trunk/drivers/media/video/bt8xx/bttvp.h | 9 +- trunk/drivers/media/video/cafe_ccic.c | 18 +- trunk/drivers/media/video/compat_ioctl32.c | 1 + trunk/drivers/media/video/cs5345.c | 1 - trunk/drivers/media/video/cs53l32a.c | 2 - trunk/drivers/media/video/cx18/cx18-audio.c | 15 +- .../drivers/media/video/cx18/cx18-av-audio.c | 12 +- trunk/drivers/media/video/cx18/cx18-av-core.c | 225 +- trunk/drivers/media/video/cx18/cx18-av-core.h | 16 +- .../media/video/cx18/cx18-av-firmware.c | 72 +- trunk/drivers/media/video/cx18/cx18-av-vbi.c | 152 +- trunk/drivers/media/video/cx18/cx18-cards.c | 89 +- trunk/drivers/media/video/cx18/cx18-cards.h | 9 + .../drivers/media/video/cx18/cx18-controls.c | 216 +- .../drivers/media/video/cx18/cx18-controls.h | 7 +- trunk/drivers/media/video/cx18/cx18-driver.c | 21 +- trunk/drivers/media/video/cx18/cx18-driver.h | 7 +- .../drivers/media/video/cx18/cx18-firmware.c | 10 +- trunk/drivers/media/video/cx18/cx18-gpio.c | 90 +- trunk/drivers/media/video/cx18/cx18-gpio.h | 2 + trunk/drivers/media/video/cx18/cx18-i2c.c | 25 +- trunk/drivers/media/video/cx18/cx18-ioctl.c | 1179 +- trunk/drivers/media/video/cx18/cx18-ioctl.h | 6 +- trunk/drivers/media/video/cx18/cx18-mailbox.c | 1 + trunk/drivers/media/video/cx18/cx18-streams.c | 12 +- trunk/drivers/media/video/cx18/cx23418.h | 5 + trunk/drivers/media/video/cx2341x.c | 180 +- trunk/drivers/media/video/cx23885/Kconfig | 2 + .../drivers/media/video/cx23885/cx23885-417.c | 701 +- .../media/video/cx23885/cx23885-cards.c | 13 + .../media/video/cx23885/cx23885-core.c | 10 +- .../drivers/media/video/cx23885/cx23885-dvb.c | 42 + .../media/video/cx23885/cx23885-video.c | 24 +- trunk/drivers/media/video/cx23885/cx23885.h | 1 + .../media/video/cx25840/cx25840-core.c | 158 +- .../media/video/cx25840/cx25840-core.h | 3 +- .../drivers/media/video/cx25840/cx25840-vbi.c | 152 +- trunk/drivers/media/video/cx88/cx88-alsa.c | 1 - .../drivers/media/video/cx88/cx88-blackbird.c | 19 +- trunk/drivers/media/video/cx88/cx88-i2c.c | 1 - trunk/drivers/media/video/cx88/cx88-video.c | 24 +- .../media/video/cx88/cx88-vp3054-i2c.c | 1 - .../drivers/media/video/em28xx/em28xx-cards.c | 74 +- trunk/drivers/media/video/em28xx/em28xx-dvb.c | 25 + trunk/drivers/media/video/em28xx/em28xx-i2c.c | 1 - .../drivers/media/video/em28xx/em28xx-input.c | 87 + .../drivers/media/video/em28xx/em28xx-video.c | 32 +- trunk/drivers/media/video/em28xx/em28xx.h | 12 + trunk/drivers/media/video/gspca/Kconfig | 13 + trunk/drivers/media/video/gspca/Makefile | 29 + trunk/drivers/media/video/gspca/conex.c | 1051 + trunk/drivers/media/video/gspca/etoms.c | 956 + trunk/drivers/media/video/gspca/gspca.c | 1905 ++ trunk/drivers/media/video/gspca/gspca.h | 176 + trunk/drivers/media/video/gspca/jpeg.h | 301 + trunk/drivers/media/video/gspca/mars.c | 464 + trunk/drivers/media/video/gspca/ov519.c | 2186 ++ trunk/drivers/media/video/gspca/pac207.c | 622 + trunk/drivers/media/video/gspca/pac7311.c | 760 + trunk/drivers/media/video/gspca/sonixb.c | 1477 ++ trunk/drivers/media/video/gspca/sonixj.c | 1671 ++ trunk/drivers/media/video/gspca/spca500.c | 1216 + trunk/drivers/media/video/gspca/spca501.c | 2229 ++ trunk/drivers/media/video/gspca/spca505.c | 951 + trunk/drivers/media/video/gspca/spca506.c | 847 + trunk/drivers/media/video/gspca/spca508.c | 1791 ++ trunk/drivers/media/video/gspca/spca561.c | 1052 + trunk/drivers/media/video/gspca/stk014.c | 592 + trunk/drivers/media/video/gspca/sunplus.c | 1677 ++ trunk/drivers/media/video/gspca/t613.c | 1038 + trunk/drivers/media/video/gspca/tv8532.c | 670 + trunk/drivers/media/video/gspca/vc032x.c | 1818 ++ trunk/drivers/media/video/gspca/zc3xx-reg.h | 261 + trunk/drivers/media/video/gspca/zc3xx.c | 7623 ++++++ trunk/drivers/media/video/ir-kbd-i2c.c | 82 - trunk/drivers/media/video/ivtv/ivtv-cards.c | 75 +- trunk/drivers/media/video/ivtv/ivtv-cards.h | 3 +- .../drivers/media/video/ivtv/ivtv-controls.c | 225 +- .../drivers/media/video/ivtv/ivtv-controls.h | 6 +- trunk/drivers/media/video/ivtv/ivtv-driver.c | 19 +- trunk/drivers/media/video/ivtv/ivtv-driver.h | 1 - trunk/drivers/media/video/ivtv/ivtv-fileops.c | 25 +- trunk/drivers/media/video/ivtv/ivtv-gpio.c | 11 +- trunk/drivers/media/video/ivtv/ivtv-i2c.c | 6 +- trunk/drivers/media/video/ivtv/ivtv-ioctl.c | 2196 +- trunk/drivers/media/video/ivtv/ivtv-ioctl.h | 9 +- trunk/drivers/media/video/ivtv/ivtv-streams.c | 3 +- trunk/drivers/media/video/ivtv/ivtvfb.c | 86 + trunk/drivers/media/video/m52790.c | 1 - trunk/drivers/media/video/meye.c | 18 +- trunk/drivers/media/video/msp3400-driver.c | 3 +- trunk/drivers/media/video/msp3400-kthreads.c | 1 - trunk/drivers/media/video/mt9v022.c | 1 - trunk/drivers/media/video/ov7670.c | 28 +- .../media/video/ovcamchip/ovcamchip_core.c | 1 - .../media/video/pvrusb2/pvrusb2-audio.c | 1 - .../media/video/pvrusb2/pvrusb2-audio.h | 1 - .../media/video/pvrusb2/pvrusb2-context.c | 1 - .../media/video/pvrusb2/pvrusb2-context.h | 1 - .../media/video/pvrusb2/pvrusb2-ctrl.c | 1 - .../media/video/pvrusb2/pvrusb2-ctrl.h | 1 - .../media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 1 - .../media/video/pvrusb2/pvrusb2-cx2584x-v4l.h | 1 - .../media/video/pvrusb2/pvrusb2-debug.h | 1 - .../media/video/pvrusb2/pvrusb2-debugifc.c | 1 - .../media/video/pvrusb2/pvrusb2-debugifc.h | 1 - .../media/video/pvrusb2/pvrusb2-devattr.c | 11 +- .../media/video/pvrusb2/pvrusb2-devattr.h | 1 - .../media/video/pvrusb2/pvrusb2-eeprom.c | 1 - .../media/video/pvrusb2/pvrusb2-eeprom.h | 1 - .../media/video/pvrusb2/pvrusb2-encoder.c | 1 - .../media/video/pvrusb2/pvrusb2-encoder.h | 1 - .../media/video/pvrusb2/pvrusb2-fx2-cmd.h | 1 - .../video/pvrusb2/pvrusb2-hdw-internal.h | 1 - .../drivers/media/video/pvrusb2/pvrusb2-hdw.c | 75 +- .../drivers/media/video/pvrusb2/pvrusb2-hdw.h | 1 - .../video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 1 - .../video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | 1 - .../video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h | 1 - .../media/video/pvrusb2/pvrusb2-i2c-core.c | 1 - .../media/video/pvrusb2/pvrusb2-i2c-core.h | 1 - .../drivers/media/video/pvrusb2/pvrusb2-io.c | 1 - .../drivers/media/video/pvrusb2/pvrusb2-io.h | 1 - .../media/video/pvrusb2/pvrusb2-ioread.c | 1 - .../media/video/pvrusb2/pvrusb2-ioread.h | 1 - .../media/video/pvrusb2/pvrusb2-main.c | 1 - .../drivers/media/video/pvrusb2/pvrusb2-std.c | 1 - .../drivers/media/video/pvrusb2/pvrusb2-std.h | 1 - .../media/video/pvrusb2/pvrusb2-sysfs.c | 461 +- .../media/video/pvrusb2/pvrusb2-sysfs.h | 1 - .../media/video/pvrusb2/pvrusb2-tuner.c | 1 - .../media/video/pvrusb2/pvrusb2-tuner.h | 1 - .../media/video/pvrusb2/pvrusb2-util.h | 1 - .../media/video/pvrusb2/pvrusb2-v4l2.c | 1 - .../media/video/pvrusb2/pvrusb2-v4l2.h | 1 - .../media/video/pvrusb2/pvrusb2-video-v4l.c | 1 - .../media/video/pvrusb2/pvrusb2-video-v4l.h | 1 - .../media/video/pvrusb2/pvrusb2-wm8775.c | 1 - .../media/video/pvrusb2/pvrusb2-wm8775.h | 1 - trunk/drivers/media/video/pvrusb2/pvrusb2.h | 1 - trunk/drivers/media/video/pwc/pwc-ctrl.c | 2 - trunk/drivers/media/video/pwc/pwc-ioctl.h | 1 - trunk/drivers/media/video/pxa_camera.c | 27 +- trunk/drivers/media/video/s2255drv.c | 2495 ++ trunk/drivers/media/video/saa5246a.c | 1 + trunk/drivers/media/video/saa5249.c | 1 + trunk/drivers/media/video/saa6588.c | 1 - trunk/drivers/media/video/saa7115.c | 4 +- trunk/drivers/media/video/saa711x.c | 584 - trunk/drivers/media/video/saa7127.c | 43 +- trunk/drivers/media/video/saa7134/saa6752hs.c | 105 +- .../media/video/saa7134/saa7134-alsa.c | 4 - .../media/video/saa7134/saa7134-cards.c | 181 +- .../media/video/saa7134/saa7134-core.c | 1 - .../drivers/media/video/saa7134/saa7134-dvb.c | 10 + .../media/video/saa7134/saa7134-empress.c | 86 +- .../drivers/media/video/saa7134/saa7134-i2c.c | 2 + .../media/video/saa7134/saa7134-input.c | 81 + .../drivers/media/video/saa7134/saa7134-reg.h | 1 + .../media/video/saa7134/saa7134-tvaudio.c | 35 +- .../media/video/saa7134/saa7134-video.c | 82 +- trunk/drivers/media/video/saa7134/saa7134.h | 6 +- .../media/video/sh_mobile_ceu_camera.c | 657 + .../media/video/sn9c102/sn9c102_devtable.h | 2 - trunk/drivers/media/video/soc_camera.c | 64 +- .../drivers/media/video/soc_camera_platform.c | 198 + trunk/drivers/media/video/stk-webcam.c | 18 +- trunk/drivers/media/video/tcm825x.c | 6 + trunk/drivers/media/video/tcm825x.h | 1 + trunk/drivers/media/video/tda7432.c | 1 + trunk/drivers/media/video/tda9840.c | 1 + trunk/drivers/media/video/tda9875.c | 2 +- trunk/drivers/media/video/tea6415c.c | 1 + trunk/drivers/media/video/tea6420.c | 1 + trunk/drivers/media/video/tlv320aic23b.c | 1 - trunk/drivers/media/video/tuner-core.c | 1 - trunk/drivers/media/video/tvaudio.c | 13 - .../media/video/usbvision/usbvision-core.c | 4 - .../media/video/usbvision/usbvision-i2c.c | 5 - .../media/video/usbvision/usbvision-video.c | 30 +- trunk/drivers/media/video/uvc/Kconfig | 17 + trunk/drivers/media/video/uvc/uvc_ctrl.c | 1 + trunk/drivers/media/video/uvc/uvc_driver.c | 31 +- trunk/drivers/media/video/uvc/uvc_queue.c | 1 + trunk/drivers/media/video/uvc/uvc_status.c | 20 +- trunk/drivers/media/video/uvc/uvc_v4l2.c | 3 +- trunk/drivers/media/video/uvc/uvc_video.c | 117 +- trunk/drivers/media/video/uvc/uvcvideo.h | 3 + .../drivers/media/video/videobuf-dma-contig.c | 418 + trunk/drivers/media/video/videobuf-dma-sg.c | 8 +- trunk/drivers/media/video/videobuf-dvb.c | 2 - trunk/drivers/media/video/videobuf-vmalloc.c | 2 +- trunk/drivers/media/video/videodev.c | 735 +- trunk/drivers/media/video/vivi.c | 37 +- trunk/drivers/media/video/vp27smpx.c | 1 - trunk/drivers/media/video/wm8739.c | 1 - trunk/drivers/media/video/wm8775.c | 2 - trunk/drivers/media/video/zoran_card.c | 34 +- trunk/drivers/media/video/zoran_driver.c | 5 +- trunk/drivers/media/video/zr364xx.c | 16 +- trunk/drivers/mfd/Kconfig | 2 +- trunk/drivers/mfd/asic3.c | 388 +- trunk/drivers/net/3c503.c | 14 +- trunk/drivers/net/3c515.c | 4 + trunk/drivers/net/3c523.c | 37 +- trunk/drivers/net/3c527.c | 45 +- trunk/drivers/net/8139cp.c | 44 +- trunk/drivers/net/8139too.c | 66 +- trunk/drivers/net/8390.h | 19 +- trunk/drivers/net/8390p.c | 66 + trunk/drivers/net/Kconfig | 200 +- trunk/drivers/net/Makefile | 15 +- trunk/drivers/net/a2065.c | 4 - trunk/drivers/net/acenic.c | 21 +- trunk/drivers/net/acenic.h | 1 - trunk/drivers/net/amd8111e.c | 137 +- trunk/drivers/net/ariadne.c | 47 +- trunk/drivers/net/arm/ixp4xx_eth.c | 3 +- trunk/drivers/net/atarilance.c | 2 +- trunk/drivers/net/atlx/atl1.c | 3 +- trunk/drivers/net/au1000_eth.c | 2 +- trunk/drivers/net/b44.c | 140 +- trunk/drivers/net/bfin_mac.c | 2 +- trunk/drivers/net/bnx2.c | 1339 +- trunk/drivers/net/bnx2.h | 115 +- trunk/drivers/net/bnx2_fw.h | 80 + trunk/drivers/net/bnx2_fw2.h | 8858 +++---- trunk/drivers/net/bnx2x.c | 9988 -------- trunk/drivers/net/bnx2x.h | 1585 +- trunk/drivers/net/bnx2x_fw_defs.h | 483 +- trunk/drivers/net/bnx2x_hsi.h | 1101 +- trunk/drivers/net/bnx2x_init.h | 352 +- trunk/drivers/net/bnx2x_init_values.h | 19186 +++++++++++----- trunk/drivers/net/bnx2x_link.c | 4527 ++++ trunk/drivers/net/bnx2x_link.h | 168 + trunk/drivers/net/bnx2x_main.c | 10294 +++++++++ trunk/drivers/net/bnx2x_reg.h | 1969 +- trunk/drivers/net/bonding/bond_alb.c | 6 +- trunk/drivers/net/bonding/bond_main.c | 824 +- trunk/drivers/net/bonding/bond_sysfs.c | 103 +- trunk/drivers/net/bonding/bonding.h | 17 +- trunk/drivers/net/chelsio/cxgb2.c | 2 - trunk/drivers/net/chelsio/sge.c | 70 +- trunk/drivers/net/cpmac.c | 35 +- trunk/drivers/net/cxgb3/adapter.h | 18 + trunk/drivers/net/cxgb3/common.h | 1 + trunk/drivers/net/cxgb3/cxgb3_ctl_defs.h | 5 +- trunk/drivers/net/cxgb3/cxgb3_ioctl.h | 1 + trunk/drivers/net/cxgb3/cxgb3_main.c | 19 + trunk/drivers/net/cxgb3/cxgb3_offload.c | 32 +- trunk/drivers/net/cxgb3/l2t.c | 2 +- trunk/drivers/net/cxgb3/regs.h | 10 +- trunk/drivers/net/cxgb3/sge.c | 391 +- trunk/drivers/net/cxgb3/t3_cpl.h | 51 + trunk/drivers/net/cxgb3/t3cdev.h | 4 +- trunk/drivers/net/declance.c | 4 - trunk/drivers/net/dl2k.c | 10 +- trunk/drivers/net/dm9000.c | 1199 +- trunk/drivers/net/dm9000.h | 11 + trunk/drivers/net/e1000/e1000_main.c | 64 +- trunk/drivers/net/e1000e/e1000.h | 4 + trunk/drivers/net/e1000e/netdev.c | 84 +- trunk/drivers/net/fealnx.c | 43 +- trunk/drivers/net/fec_mpc52xx.c | 2 +- trunk/drivers/net/forcedeth.c | 82 +- trunk/drivers/net/fs_enet/fs_enet-main.c | 33 +- trunk/drivers/net/gianfar.c | 82 +- trunk/drivers/net/gianfar.h | 11 - trunk/drivers/net/hamachi.c | 12 +- trunk/drivers/net/hamradio/6pack.c | 28 +- trunk/drivers/net/hamradio/bpqether.c | 14 +- trunk/drivers/net/hamradio/mkiss.c | 4 +- trunk/drivers/net/hp.c | 14 +- trunk/drivers/net/hplance.c | 4 +- trunk/drivers/net/ibm_emac/Kconfig | 70 - trunk/drivers/net/ibm_emac/Makefile | 11 - trunk/drivers/net/ibm_emac/ibm_emac.h | 329 - trunk/drivers/net/ibm_emac/ibm_emac_core.c | 2263 -- trunk/drivers/net/ibm_emac/ibm_emac_core.h | 222 - trunk/drivers/net/ibm_emac/ibm_emac_debug.c | 211 - trunk/drivers/net/ibm_emac/ibm_emac_debug.h | 62 - trunk/drivers/net/ibm_emac/ibm_emac_mal.c | 570 - trunk/drivers/net/ibm_emac/ibm_emac_mal.h | 267 - trunk/drivers/net/ibm_emac/ibm_emac_phy.c | 398 - trunk/drivers/net/ibm_emac/ibm_emac_phy.h | 80 - trunk/drivers/net/ibm_emac/ibm_emac_rgmii.c | 200 - trunk/drivers/net/ibm_emac/ibm_emac_rgmii.h | 64 - trunk/drivers/net/ibm_emac/ibm_emac_tah.c | 110 - trunk/drivers/net/ibm_emac/ibm_emac_tah.h | 87 - trunk/drivers/net/ibm_emac/ibm_emac_zmii.c | 253 - trunk/drivers/net/ibm_emac/ibm_emac_zmii.h | 82 - trunk/drivers/net/ibm_newemac/core.c | 4 + trunk/drivers/net/ifb.c | 14 - trunk/drivers/net/igb/e1000_82575.c | 446 +- trunk/drivers/net/igb/e1000_82575.h | 36 +- trunk/drivers/net/igb/e1000_defines.h | 38 +- trunk/drivers/net/igb/e1000_hw.h | 16 +- trunk/drivers/net/igb/e1000_mac.c | 144 +- trunk/drivers/net/igb/e1000_mac.h | 1 + trunk/drivers/net/igb/e1000_nvm.c | 52 +- trunk/drivers/net/igb/e1000_phy.c | 138 +- trunk/drivers/net/igb/e1000_regs.h | 9 +- trunk/drivers/net/igb/igb.h | 51 +- trunk/drivers/net/igb/igb_ethtool.c | 203 +- trunk/drivers/net/igb/igb_main.c | 1284 +- trunk/drivers/net/ipg.c | 105 +- trunk/drivers/net/ipg.h | 83 +- trunk/drivers/net/irda/ali-ircc.h | 2 - trunk/drivers/net/irda/au1000_ircc.h | 1 - trunk/drivers/net/irda/donauboe.c | 6 +- trunk/drivers/net/irda/irtty-sir.c | 2 +- trunk/drivers/net/irda/smsc-ircc2.c | 1 - trunk/drivers/net/irda/smsc-ircc2.h | 1 - trunk/drivers/net/irda/via-ircc.h | 1 - trunk/drivers/net/ixgb/Makefile | 2 +- trunk/drivers/net/ixgb/ixgb.h | 21 +- trunk/drivers/net/ixgb/ixgb_ee.c | 28 +- trunk/drivers/net/ixgb/ixgb_ee.h | 12 +- trunk/drivers/net/ixgb/ixgb_ethtool.c | 120 +- trunk/drivers/net/ixgb/ixgb_hw.c | 40 +- trunk/drivers/net/ixgb/ixgb_hw.h | 2 +- trunk/drivers/net/ixgb/ixgb_ids.h | 10 +- trunk/drivers/net/ixgb/ixgb_main.c | 499 +- trunk/drivers/net/ixgb/ixgb_osdep.h | 4 +- trunk/drivers/net/ixgb/ixgb_param.c | 44 +- trunk/drivers/net/ixgbe/ixgbe.h | 9 + trunk/drivers/net/ixgbe/ixgbe_ethtool.c | 27 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 191 +- trunk/drivers/net/ixp2000/ixpdev.c | 4 +- trunk/drivers/net/lib8390.c | 100 +- trunk/drivers/net/loopback.c | 8 +- trunk/drivers/net/mac8390.c | 8 +- trunk/drivers/net/macb.c | 8 +- trunk/drivers/net/macsonic.c | 19 +- trunk/drivers/net/macvlan.c | 30 +- trunk/drivers/net/mv643xx_eth.c | 4673 ++-- trunk/drivers/net/myri10ge/myri10ge.c | 1076 +- trunk/drivers/net/natsemi.c | 4 +- trunk/drivers/net/ne.c | 14 +- trunk/drivers/net/ne2.c | 16 +- trunk/drivers/net/netconsole.c | 10 +- trunk/drivers/net/niu.c | 203 +- trunk/drivers/net/niu.h | 2 +- trunk/drivers/net/ns83820.c | 9 +- trunk/drivers/net/pci-skeleton.c | 1 - trunk/drivers/net/pcmcia/3c574_cs.c | 47 +- trunk/drivers/net/pcmcia/3c589_cs.c | 49 +- trunk/drivers/net/pcmcia/axnet_cs.c | 70 +- trunk/drivers/net/pcnet32.c | 6 +- trunk/drivers/net/phy/Kconfig | 9 +- trunk/drivers/net/phy/Makefile | 1 + trunk/drivers/net/phy/broadcom.c | 201 +- trunk/drivers/net/phy/mdio-bitbang.c | 2 + trunk/drivers/net/phy/mdio-ofgpio.c | 205 + trunk/drivers/net/ppp_async.c | 2 +- trunk/drivers/net/ppp_generic.c | 22 +- trunk/drivers/net/ppp_synctty.c | 2 +- trunk/drivers/net/ps3_gelic_net.c | 10 +- trunk/drivers/net/ps3_gelic_net.h | 2 +- trunk/drivers/net/ps3_gelic_wireless.c | 236 +- trunk/drivers/net/ps3_gelic_wireless.h | 7 +- trunk/drivers/net/qla3xxx.c | 4 +- trunk/drivers/net/r8169.c | 145 +- trunk/drivers/net/s2io.c | 183 +- trunk/drivers/net/s2io.h | 3 +- trunk/drivers/net/saa9730.c | 1139 - trunk/drivers/net/saa9730.h | 384 - trunk/drivers/net/sb1250-mac.c | 2 +- trunk/drivers/net/sfc/Kconfig | 2 + trunk/drivers/net/sfc/Makefile | 2 +- trunk/drivers/net/sfc/boards.c | 2 +- trunk/drivers/net/sfc/boards.h | 3 +- trunk/drivers/net/sfc/efx.c | 6 +- trunk/drivers/net/sfc/falcon.c | 74 +- trunk/drivers/net/sfc/i2c-direct.c | 381 - trunk/drivers/net/sfc/i2c-direct.h | 91 - trunk/drivers/net/sfc/net_driver.h | 11 +- trunk/drivers/net/sfc/sfe4001.c | 126 +- trunk/drivers/net/sh_eth.c | 1174 + trunk/drivers/net/sh_eth.h | 464 + trunk/drivers/net/sis190.c | 2 +- trunk/drivers/net/sis900.c | 2 +- trunk/drivers/net/sky2.c | 241 +- trunk/drivers/net/sky2.h | 24 +- trunk/drivers/net/slip.c | 2 +- trunk/drivers/net/smc911x.c | 422 +- trunk/drivers/net/smc911x.h | 494 +- trunk/drivers/net/spider_net.c | 4 +- trunk/drivers/net/starfire.c | 111 +- trunk/drivers/net/sunlance.c | 4 - trunk/drivers/net/tc35815.c | 2 +- trunk/drivers/net/tehuti.c | 2 +- trunk/drivers/net/tehuti.h | 1 + trunk/drivers/net/tg3.c | 1362 +- trunk/drivers/net/tg3.h | 40 +- trunk/drivers/net/tlan.c | 490 +- trunk/drivers/net/tlan.h | 26 +- trunk/drivers/net/tokenring/3c359.c | 20 +- trunk/drivers/net/tokenring/3c359.h | 2 - trunk/drivers/net/tsi108_eth.c | 11 +- trunk/drivers/net/tulip/21142.c | 6 +- trunk/drivers/net/tulip/de2104x.c | 10 +- trunk/drivers/net/tulip/eeprom.c | 6 +- trunk/drivers/net/tulip/interrupt.c | 5 +- trunk/drivers/net/tulip/media.c | 5 +- trunk/drivers/net/tulip/pnic.c | 5 +- trunk/drivers/net/tulip/pnic2.c | 5 +- trunk/drivers/net/tulip/timer.c | 6 +- trunk/drivers/net/tulip/tulip.h | 4 +- trunk/drivers/net/tulip/tulip_core.c | 8 +- trunk/drivers/net/tun.c | 458 +- trunk/drivers/net/typhoon.c | 3 - trunk/drivers/net/ucc_geth.c | 33 +- trunk/drivers/net/ucc_geth_ethtool.c | 4 +- trunk/drivers/net/usb/Kconfig | 10 + trunk/drivers/net/usb/Makefile | 1 + trunk/drivers/net/usb/hso.c | 2836 +++ trunk/drivers/net/usb/rndis_host.c | 14 +- trunk/drivers/net/via-rhine.c | 27 +- trunk/drivers/net/via-velocity.c | 183 +- trunk/drivers/net/via-velocity.h | 5 - trunk/drivers/net/virtio_net.c | 3 +- trunk/drivers/net/wan/Kconfig | 3 +- trunk/drivers/net/wan/c101.c | 6 +- trunk/drivers/net/wan/dscc4.c | 22 +- trunk/drivers/net/wan/farsync.c | 70 +- trunk/drivers/net/wan/hd6457x.c | 33 +- trunk/drivers/net/wan/hdlc.c | 2 +- trunk/drivers/net/wan/hdlc_cisco.c | 4 +- trunk/drivers/net/wan/hdlc_fr.c | 54 +- trunk/drivers/net/wan/hdlc_raw_eth.c | 2 +- trunk/drivers/net/wan/hdlc_x25.c | 6 +- trunk/drivers/net/wan/pc300_drv.c | 71 +- trunk/drivers/net/wan/pc300_tty.c | 10 +- trunk/drivers/net/wan/wanxl.c | 26 +- trunk/drivers/net/wan/x25_asy.c | 2 +- trunk/drivers/net/wireless/Kconfig | 25 +- trunk/drivers/net/wireless/Makefile | 2 + trunk/drivers/net/wireless/adm8211.c | 58 +- trunk/drivers/net/wireless/adm8211.h | 1 - trunk/drivers/net/wireless/airo.c | 156 +- trunk/drivers/net/wireless/arlan-main.c | 40 +- trunk/drivers/net/wireless/arlan.h | 1 - trunk/drivers/net/wireless/ath5k/Kconfig | 3 + trunk/drivers/net/wireless/ath5k/base.c | 377 +- trunk/drivers/net/wireless/ath5k/base.h | 36 +- trunk/drivers/net/wireless/ath5k/hw.c | 4 +- trunk/drivers/net/wireless/atmel.c | 70 +- trunk/drivers/net/wireless/b43/b43.h | 49 +- trunk/drivers/net/wireless/b43/debugfs.c | 436 +- trunk/drivers/net/wireless/b43/debugfs.h | 24 +- trunk/drivers/net/wireless/b43/dma.c | 119 +- trunk/drivers/net/wireless/b43/dma.h | 3 +- trunk/drivers/net/wireless/b43/lo.c | 731 +- trunk/drivers/net/wireless/b43/lo.h | 115 +- trunk/drivers/net/wireless/b43/main.c | 450 +- trunk/drivers/net/wireless/b43/main.h | 7 + trunk/drivers/net/wireless/b43/nphy.c | 2 - trunk/drivers/net/wireless/b43/phy.c | 291 +- trunk/drivers/net/wireless/b43/phy.h | 16 +- trunk/drivers/net/wireless/b43/pio.c | 44 +- trunk/drivers/net/wireless/b43/pio.h | 8 +- trunk/drivers/net/wireless/b43/rfkill.c | 27 +- trunk/drivers/net/wireless/b43/xmit.c | 88 +- trunk/drivers/net/wireless/b43/xmit.h | 4 +- .../net/wireless/b43legacy/b43legacy.h | 17 - trunk/drivers/net/wireless/b43legacy/dma.c | 172 +- trunk/drivers/net/wireless/b43legacy/dma.h | 7 +- trunk/drivers/net/wireless/b43legacy/main.c | 72 +- trunk/drivers/net/wireless/b43legacy/phy.c | 14 +- trunk/drivers/net/wireless/b43legacy/pio.c | 27 +- trunk/drivers/net/wireless/b43legacy/pio.h | 7 +- trunk/drivers/net/wireless/b43legacy/radio.c | 12 +- trunk/drivers/net/wireless/b43legacy/rfkill.c | 28 +- trunk/drivers/net/wireless/b43legacy/xmit.c | 70 +- trunk/drivers/net/wireless/b43legacy/xmit.h | 2 +- trunk/drivers/net/wireless/hostap/hostap.h | 3 +- .../net/wireless/hostap/hostap_80211_rx.c | 21 + trunk/drivers/net/wireless/hostap/hostap_ap.c | 32 +- trunk/drivers/net/wireless/hostap/hostap_hw.c | 19 +- .../net/wireless/hostap/hostap_ioctl.c | 63 +- .../drivers/net/wireless/hostap/hostap_main.c | 20 +- .../drivers/net/wireless/hostap/hostap_wlan.h | 14 +- trunk/drivers/net/wireless/iwlwifi/Kconfig | 32 +- trunk/drivers/net/wireless/iwlwifi/Makefile | 11 +- .../net/wireless/iwlwifi/iwl-3945-hw.h | 13 +- .../net/wireless/iwlwifi/iwl-3945-led.c | 146 +- .../net/wireless/iwlwifi/iwl-3945-led.h | 2 +- .../net/wireless/iwlwifi/iwl-3945-rs.c | 17 +- trunk/drivers/net/wireless/iwlwifi/iwl-3945.c | 131 +- trunk/drivers/net/wireless/iwlwifi/iwl-3945.h | 51 +- .../net/wireless/iwlwifi/iwl-4965-hw.h | 634 +- .../net/wireless/iwlwifi/iwl-4965-rs.c | 1233 +- .../net/wireless/iwlwifi/iwl-4965-rs.h | 105 +- trunk/drivers/net/wireless/iwlwifi/iwl-4965.c | 4132 +--- .../net/wireless/iwlwifi/iwl-5000-hw.h | 134 + trunk/drivers/net/wireless/iwlwifi/iwl-5000.c | 1580 ++ .../drivers/net/wireless/iwlwifi/iwl-calib.c | 802 + .../drivers/net/wireless/iwlwifi/iwl-calib.h | 84 + .../{iwl-4965-commands.h => iwl-commands.h} | 462 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.c | 1259 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.h | 219 +- trunk/drivers/net/wireless/iwlwifi/iwl-csr.h | 38 +- .../drivers/net/wireless/iwlwifi/iwl-debug.h | 31 +- .../net/wireless/iwlwifi/iwl-debugfs.c | 103 +- .../iwlwifi/{iwl-4965.h => iwl-dev.h} | 567 +- .../drivers/net/wireless/iwlwifi/iwl-eeprom.c | 171 +- .../drivers/net/wireless/iwlwifi/iwl-eeprom.h | 206 +- trunk/drivers/net/wireless/iwlwifi/iwl-fh.h | 391 + trunk/drivers/net/wireless/iwlwifi/iwl-hcmd.c | 15 +- .../net/wireless/iwlwifi/iwl-helpers.h | 92 +- trunk/drivers/net/wireless/iwlwifi/iwl-led.c | 209 +- trunk/drivers/net/wireless/iwlwifi/iwl-led.h | 5 +- .../drivers/net/wireless/iwlwifi/iwl-power.c | 423 + .../drivers/net/wireless/iwlwifi/iwl-power.h | 76 + trunk/drivers/net/wireless/iwlwifi/iwl-prph.h | 333 +- .../drivers/net/wireless/iwlwifi/iwl-rfkill.c | 106 +- .../drivers/net/wireless/iwlwifi/iwl-rfkill.h | 6 - trunk/drivers/net/wireless/iwlwifi/iwl-rx.c | 1321 ++ trunk/drivers/net/wireless/iwlwifi/iwl-scan.c | 931 + trunk/drivers/net/wireless/iwlwifi/iwl-sta.c | 712 +- trunk/drivers/net/wireless/iwlwifi/iwl-sta.h | 28 +- trunk/drivers/net/wireless/iwlwifi/iwl-tx.c | 1519 ++ .../net/wireless/iwlwifi/iwl3945-base.c | 535 +- .../net/wireless/iwlwifi/iwl4965-base.c | 5182 +---- trunk/drivers/net/wireless/libertas/Makefile | 8 +- trunk/drivers/net/wireless/libertas/assoc.c | 8 +- trunk/drivers/net/wireless/libertas/cmd.c | 192 +- trunk/drivers/net/wireless/libertas/cmd.h | 8 +- trunk/drivers/net/wireless/libertas/cmdresp.c | 25 +- trunk/drivers/net/wireless/libertas/decl.h | 8 +- trunk/drivers/net/wireless/libertas/defs.h | 14 +- trunk/drivers/net/wireless/libertas/dev.h | 8 +- trunk/drivers/net/wireless/libertas/host.h | 17 + trunk/drivers/net/wireless/libertas/hostcmd.h | 4 +- trunk/drivers/net/wireless/libertas/if_cs.c | 315 +- trunk/drivers/net/wireless/libertas/if_usb.c | 22 + trunk/drivers/net/wireless/libertas/main.c | 254 +- .../net/wireless/libertas/persistcfg.c | 453 + trunk/drivers/net/wireless/libertas/rx.c | 4 +- trunk/drivers/net/wireless/libertas/scan.c | 36 +- trunk/drivers/net/wireless/libertas/types.h | 30 + trunk/drivers/net/wireless/libertas/wext.c | 32 +- trunk/drivers/net/wireless/mac80211_hwsim.c | 515 + trunk/drivers/net/wireless/orinoco.c | 30 +- trunk/drivers/net/wireless/p54/p54.h | 2 +- trunk/drivers/net/wireless/p54/p54common.c | 138 +- trunk/drivers/net/wireless/p54/p54common.h | 1 - trunk/drivers/net/wireless/p54/p54pci.c | 2 +- .../drivers/net/wireless/prism54/isl_ioctl.c | 49 +- trunk/drivers/net/wireless/rndis_wlan.c | 205 +- trunk/drivers/net/wireless/rt2x00/Kconfig | 63 +- trunk/drivers/net/wireless/rt2x00/rt2400pci.c | 352 +- trunk/drivers/net/wireless/rt2x00/rt2400pci.h | 7 +- trunk/drivers/net/wireless/rt2x00/rt2500pci.c | 312 +- trunk/drivers/net/wireless/rt2x00/rt2500pci.h | 11 +- trunk/drivers/net/wireless/rt2x00/rt2500usb.c | 307 +- trunk/drivers/net/wireless/rt2x00/rt2500usb.h | 47 +- trunk/drivers/net/wireless/rt2x00/rt2x00.h | 105 +- .../net/wireless/rt2x00/rt2x00config.c | 2 + .../drivers/net/wireless/rt2x00/rt2x00debug.c | 10 +- trunk/drivers/net/wireless/rt2x00/rt2x00dev.c | 362 +- .../net/wireless/rt2x00/rt2x00firmware.c | 8 + trunk/drivers/net/wireless/rt2x00/rt2x00lib.h | 78 +- trunk/drivers/net/wireless/rt2x00/rt2x00mac.c | 172 +- trunk/drivers/net/wireless/rt2x00/rt2x00pci.c | 231 +- trunk/drivers/net/wireless/rt2x00/rt2x00pci.h | 45 +- .../drivers/net/wireless/rt2x00/rt2x00queue.c | 413 +- .../drivers/net/wireless/rt2x00/rt2x00queue.h | 136 +- trunk/drivers/net/wireless/rt2x00/rt2x00reg.h | 145 +- .../net/wireless/rt2x00/rt2x00rfkill.c | 114 +- trunk/drivers/net/wireless/rt2x00/rt2x00usb.c | 361 +- trunk/drivers/net/wireless/rt2x00/rt2x00usb.h | 69 +- trunk/drivers/net/wireless/rt2x00/rt61pci.c | 344 +- trunk/drivers/net/wireless/rt2x00/rt61pci.h | 7 +- trunk/drivers/net/wireless/rt2x00/rt73usb.c | 270 +- trunk/drivers/net/wireless/rt2x00/rt73usb.h | 7 +- trunk/drivers/net/wireless/rtl8180_dev.c | 71 +- trunk/drivers/net/wireless/rtl8187.h | 119 +- trunk/drivers/net/wireless/rtl8187_dev.c | 558 +- trunk/drivers/net/wireless/rtl8187_rtl8225.c | 250 +- trunk/drivers/net/wireless/rtl8187_rtl8225.h | 15 +- trunk/drivers/net/wireless/rtl818x.h | 36 +- trunk/drivers/net/wireless/strip.c | 2 +- trunk/drivers/net/wireless/wl3501_cs.c | 10 +- trunk/drivers/net/wireless/zd1201.c | 21 +- trunk/drivers/net/wireless/zd1211rw/zd_mac.c | 262 +- trunk/drivers/net/wireless/zd1211rw/zd_mac.h | 16 - trunk/drivers/net/wireless/zd1211rw/zd_usb.c | 29 +- trunk/drivers/s390/net/qeth_l3_main.c | 4 +- trunk/drivers/serial/21285.c | 12 +- trunk/drivers/serial/68328serial.c | 30 +- trunk/drivers/serial/68360serial.c | 52 +- trunk/drivers/serial/8250.c | 8 +- trunk/drivers/serial/8250.h | 2 - trunk/drivers/serial/8250_pci.c | 2 - trunk/drivers/serial/8250_pnp.c | 2 - trunk/drivers/serial/Kconfig | 2 - trunk/drivers/serial/Makefile | 2 - trunk/drivers/serial/amba-pl010.c | 8 +- trunk/drivers/serial/amba-pl011.c | 4 +- trunk/drivers/serial/atmel_serial.c | 21 +- trunk/drivers/serial/bfin_5xx.c | 10 +- trunk/drivers/serial/bfin_sport_uart.c | 4 +- trunk/drivers/serial/clps711x.c | 9 +- trunk/drivers/serial/crisv10.c | 79 +- trunk/drivers/serial/dz.c | 4 +- trunk/drivers/serial/imx.c | 2 +- trunk/drivers/serial/ioc3_serial.c | 14 +- trunk/drivers/serial/ioc4_serial.c | 21 +- trunk/drivers/serial/ip22zilog.c | 4 +- trunk/drivers/serial/jsm/jsm_neo.c | 2 +- trunk/drivers/serial/jsm/jsm_tty.c | 8 +- trunk/drivers/serial/m32r_sio.c | 6 +- trunk/drivers/serial/mcf.c | 2 +- trunk/drivers/serial/mcfserial.c | 32 +- trunk/drivers/serial/mpc52xx_uart.c | 2 +- trunk/drivers/serial/mpsc.c | 6 +- trunk/drivers/serial/mux.c | 2 +- trunk/drivers/serial/netx-serial.c | 2 +- trunk/drivers/serial/pmac_zilog.c | 4 +- trunk/drivers/serial/pnx8xxx_uart.c | 4 +- trunk/drivers/serial/pxa.c | 2 +- trunk/drivers/serial/sa1100.c | 9 +- trunk/drivers/serial/sb1250-duart.c | 2 +- trunk/drivers/serial/sc26xx.c | 2 +- trunk/drivers/serial/serial_core.c | 82 +- trunk/drivers/serial/serial_ks8695.c | 2 +- trunk/drivers/serial/serial_lh7a40x.c | 2 +- trunk/drivers/serial/sh-sci.c | 8 +- trunk/drivers/serial/sn_console.c | 2 +- trunk/drivers/serial/sunhv.c | 2 +- trunk/drivers/serial/sunsab.c | 2 +- trunk/drivers/serial/sunsu.c | 4 +- trunk/drivers/serial/sunzilog.c | 4 +- trunk/drivers/serial/uartlite.c | 4 +- trunk/drivers/serial/ucc_uart.c | 2 +- trunk/drivers/serial/v850e_uart.c | 4 +- trunk/drivers/serial/vr41xx_siu.c | 2 +- trunk/drivers/serial/zs.c | 2 +- trunk/drivers/ssb/Kconfig | 2 +- trunk/drivers/ssb/main.c | 75 +- trunk/drivers/ssb/pci.c | 20 +- trunk/drivers/video/amifb.c | 3 + trunk/drivers/video/atafb.c | 5 +- trunk/drivers/video/c2p.c | 3 + trunk/drivers/zorro/proc.c | 4 +- trunk/drivers/zorro/zorro-sysfs.c | 10 +- trunk/drivers/zorro/zorro.c | 2 - trunk/drivers/zorro/zorro.ids | 2 - trunk/fs/compat_ioctl.c | 114 +- trunk/fs/configfs/dir.c | 28 +- trunk/fs/dlm/config.c | 45 +- trunk/fs/lockd/svc.c | 33 +- trunk/fs/lockd/svc4proc.c | 7 +- trunk/fs/lockd/svclock.c | 33 +- trunk/fs/lockd/svcproc.c | 7 +- trunk/fs/lockd/svcsubs.c | 32 +- trunk/fs/nfsd/lockd.c | 2 +- trunk/fs/nfsd/nfs2acl.c | 7 +- trunk/fs/nfsd/nfs3acl.c | 5 +- trunk/fs/nfsd/nfs3proc.c | 8 +- trunk/fs/nfsd/nfs4proc.c | 76 +- trunk/fs/nfsd/nfs4state.c | 49 +- trunk/fs/nfsd/nfs4xdr.c | 392 +- trunk/fs/nfsd/nfsctl.c | 118 +- trunk/fs/nfsd/nfsfh.c | 31 +- trunk/fs/nfsd/nfsproc.c | 9 +- trunk/fs/nfsd/nfssvc.c | 148 +- trunk/fs/nfsd/vfs.c | 140 +- trunk/fs/ocfs2/cluster/heartbeat.c | 19 +- trunk/fs/ocfs2/cluster/nodemanager.c | 49 +- trunk/fs/proc/proc_net.c | 32 + trunk/fs/proc/proc_tty.c | 48 - trunk/include/asm-avr32/ioctls.h | 4 + trunk/include/asm-cris/Kbuild | 5 +- trunk/include/asm-frv/ioctls.h | 4 + trunk/include/asm-frv/termbits.h | 5 +- trunk/include/asm-ia64/kvm_host.h | 3 + trunk/include/asm-m68k/amigahw.h | 4 - trunk/include/asm-m68k/amigaints.h | 2 + trunk/include/asm-m68k/apollodma.h | 2 +- trunk/include/asm-m68k/dvma.h | 4 +- trunk/include/asm-m68k/fpu.h | 10 +- trunk/include/asm-m68k/irq.h | 2 +- trunk/include/asm-m68k/mac_baboon.h | 2 - trunk/include/asm-m68k/mac_via.h | 1 - trunk/include/asm-m68k/machines.h | 4 +- trunk/include/asm-m68k/macintosh.h | 5 - trunk/include/asm-m68k/md.h | 2 +- trunk/include/asm-m68k/openprom.h | 1 - trunk/include/asm-m68k/oplib.h | 3 +- trunk/include/asm-m68k/sbus.h | 5 - trunk/include/asm-m68k/sun3-head.h | 1 - trunk/include/asm-m68k/tlbflush.h | 8 +- trunk/include/asm-mips/bitops.h | 6 +- trunk/include/asm-mips/bootinfo.h | 6 + trunk/include/asm-mips/fpu.h | 2 + .../mach-rc32434/cpu-feature-overrides.h | 81 + trunk/include/asm-mips/mach-rc32434/ddr.h | 141 + trunk/include/asm-mips/mach-rc32434/dma.h | 103 + trunk/include/asm-mips/mach-rc32434/dma_v.h | 52 + trunk/include/asm-mips/mach-rc32434/eth.h | 220 + trunk/include/asm-mips/mach-rc32434/gpio.h | 126 + trunk/include/asm-mips/mach-rc32434/integ.h | 59 + trunk/include/asm-mips/mach-rc32434/irq.h | 8 + trunk/include/asm-mips/mach-rc32434/pci.h | 481 + trunk/include/asm-mips/mach-rc32434/prom.h | 44 + trunk/include/asm-mips/mach-rc32434/rb.h | 81 + trunk/include/asm-mips/mach-rc32434/rc32434.h | 61 + trunk/include/asm-mips/mach-rc32434/timer.h | 65 + trunk/include/asm-mips/mach-rc32434/war.h | 25 + trunk/include/asm-mips/mips-boards/atlas.h | 80 - trunk/include/asm-mips/mips-boards/atlasint.h | 109 - trunk/include/asm-mips/mips-boards/maltasmp.h | 36 - .../asm-mips/mips-boards/saa9730_uart.h | 69 - trunk/include/asm-mips/mips-boards/sead.h | 36 - trunk/include/asm-mips/mips-boards/seadint.h | 28 - trunk/include/asm-mips/page.h | 3 + trunk/include/asm-mips/pci.h | 1 - trunk/include/asm-mips/setup.h | 2 + trunk/include/asm-mips/txx9/generic.h | 7 + trunk/include/asm-mips/txx9/rbtx4927.h | 26 +- trunk/include/asm-mips/txx9/rbtx4938.h | 52 +- trunk/include/asm-mips/txx9/tx3927.h | 19 +- trunk/include/asm-mips/txx9/tx4927.h | 63 +- trunk/include/asm-mips/txx9/tx4938.h | 243 +- trunk/include/asm-powerpc/kvm_host.h | 2 + trunk/include/asm-s390/kvm_host.h | 36 +- trunk/include/asm-x86/kvm.h | 1 + trunk/include/asm-x86/kvm_host.h | 69 +- trunk/include/asm-x86/kvm_x86_emulate.h | 11 +- trunk/include/linux/brcmphy.h | 6 + trunk/include/linux/configfs.h | 7 +- trunk/include/linux/cyclades.h | 13 +- trunk/include/linux/dccp.h | 6 +- trunk/include/linux/dm9000.h | 1 + trunk/include/linux/ethtool.h | 33 + trunk/include/linux/fs.h | 4 +- trunk/include/linux/generic_serial.h | 8 +- trunk/include/linux/hayesesp.h | 9 +- trunk/include/linux/hdlc.h | 7 - trunk/include/linux/i2c-id.h | 8 - trunk/include/linux/ieee80211.h | 499 +- trunk/include/linux/if_bridge.h | 2 - trunk/include/linux/if_packet.h | 24 + trunk/include/linux/if_ppp.h | 2 - trunk/include/linux/if_tun.h | 34 +- trunk/include/linux/if_vlan.h | 238 +- trunk/include/linux/igmp.h | 1 - trunk/include/linux/ip6_tunnel.h | 4 - trunk/include/linux/ipv6.h | 4 + trunk/include/linux/istallion.h | 6 +- trunk/include/linux/kvm.h | 33 +- trunk/include/linux/kvm_host.h | 11 +- trunk/include/linux/lockd/lockd.h | 8 +- trunk/include/linux/mfd/asic3.h | 185 +- trunk/include/linux/mroute.h | 28 +- trunk/include/linux/mroute6.h | 35 +- trunk/include/linux/mv643xx_eth.h | 65 +- trunk/include/linux/net.h | 4 +- trunk/include/linux/netdevice.h | 330 +- .../linux/netfilter/nfnetlink_conntrack.h | 10 + trunk/include/linux/netfilter/xt_string.h | 15 +- .../include/linux/netfilter_bridge/ebt_ip6.h | 40 + .../include/linux/netfilter_bridge/ebt_log.h | 3 +- trunk/include/linux/netfilter_ipv4.h | 1 + trunk/include/linux/netfilter_ipv6.h | 5 + trunk/include/linux/netlink.h | 2 +- trunk/include/linux/nfs4.h | 3 - trunk/include/linux/nfsd/nfsd.h | 27 +- trunk/include/linux/nfsd/state.h | 2 - trunk/include/linux/nl80211.h | 13 +- trunk/include/linux/notifier.h | 1 + trunk/include/linux/pci_ids.h | 3 + trunk/include/linux/pkt_cls.h | 1 + trunk/include/linux/pkt_sched.h | 29 +- trunk/include/linux/ppp-comp.h | 2 - trunk/include/linux/ppp_defs.h | 2 - trunk/include/linux/rfkill.h | 46 +- trunk/include/linux/rtnetlink.h | 1 + trunk/include/linux/seq_file_net.h | 3 + trunk/include/linux/serial_core.h | 27 +- trunk/include/linux/skbuff.h | 27 +- trunk/include/linux/smc911x.h | 12 + trunk/include/linux/socket.h | 6 +- trunk/include/linux/sonet.h | 2 +- trunk/include/linux/ssb/ssb.h | 144 +- trunk/include/linux/stallion.h | 6 +- trunk/include/linux/sunrpc/auth_gss.h | 2 - trunk/include/linux/sunrpc/gss_api.h | 2 - trunk/include/linux/sunrpc/gss_krb5.h | 3 + trunk/include/linux/sunrpc/svc.h | 7 +- trunk/include/linux/sunrpc/svc_rdma.h | 36 +- trunk/include/linux/sunrpc/svcauth_gss.h | 3 - trunk/include/linux/tcp.h | 56 +- trunk/include/linux/textsearch.h | 13 +- trunk/include/linux/tipc_config.h | 10 +- trunk/include/linux/tty.h | 204 +- trunk/include/linux/tty_ldisc.h | 7 +- trunk/include/linux/udp.h | 6 + trunk/include/linux/usb/rndis_host.h | 3 +- trunk/include/linux/videodev2.h | 14 + trunk/include/linux/wanrouter.h | 2 +- trunk/include/linux/wireless.h | 30 + trunk/include/media/cx2341x.h | 7 +- trunk/include/media/ir-kbd-i2c.h | 3 - trunk/include/media/pwc-ioctl.h | 3 +- trunk/include/media/saa7146.h | 4 +- trunk/include/media/sh_mobile_ceu.h | 12 + trunk/include/media/soc_camera.h | 16 +- trunk/include/media/soc_camera_platform.h | 15 + trunk/include/media/v4l2-dev.h | 83 +- trunk/include/media/v4l2-i2c-drv-legacy.h | 1 - trunk/include/media/videobuf-dma-contig.h | 32 + trunk/include/media/videobuf-dma-sg.h | 2 +- trunk/include/media/videobuf-vmalloc.h | 2 +- trunk/include/net/addrconf.h | 3 +- trunk/include/net/bluetooth/bluetooth.h | 1 + trunk/include/net/bluetooth/hci.h | 68 +- trunk/include/net/bluetooth/hci_core.h | 19 +- trunk/include/net/bluetooth/rfcomm.h | 2 + trunk/include/net/compat.h | 2 +- trunk/include/net/dst.h | 12 + trunk/include/net/fib_rules.h | 2 +- trunk/include/net/garp.h | 128 + trunk/include/net/icmp.h | 18 +- trunk/include/net/ieee80211.h | 11 - trunk/include/net/if_inet6.h | 1 - trunk/include/net/inet6_hashtables.h | 10 +- trunk/include/net/inet_hashtables.h | 12 +- trunk/include/net/inet_sock.h | 9 +- trunk/include/net/inetpeer.h | 2 - trunk/include/net/ip.h | 19 +- trunk/include/net/ip6_tunnel.h | 5 - trunk/include/net/ipconfig.h | 2 - trunk/include/net/ipip.h | 1 - trunk/include/net/ipv6.h | 12 +- trunk/include/net/irda/irda_device.h | 2 +- trunk/include/net/iw_handler.h | 151 +- trunk/include/net/mac80211.h | 591 +- trunk/include/net/neighbour.h | 4 +- trunk/include/net/net_namespace.h | 5 + .../net/netfilter/ipv4/nf_conntrack_ipv4.h | 2 - trunk/include/net/netfilter/nf_conntrack.h | 22 +- trunk/include/net/netns/hash.h | 21 + trunk/include/net/netns/ipv4.h | 5 + trunk/include/net/netns/ipv6.h | 1 + trunk/include/net/netns/mib.h | 16 + trunk/include/net/pkt_sched.h | 14 +- trunk/include/net/rose.h | 2 +- trunk/include/net/route.h | 2 +- trunk/include/net/sch_generic.h | 198 +- trunk/include/net/sctp/checksum.h | 23 +- trunk/include/net/sctp/sctp.h | 4 +- trunk/include/net/sctp/structs.h | 8 +- trunk/include/net/sctp/user.h | 34 +- trunk/include/net/snmp.h | 2 - trunk/include/net/sock.h | 41 +- trunk/include/net/stp.h | 14 + trunk/include/net/tcp.h | 65 +- trunk/include/net/tipc/tipc_port.h | 10 +- trunk/include/net/transp_v6.h | 2 +- trunk/include/net/udp.h | 28 +- trunk/include/net/wext.h | 7 + trunk/include/net/wireless.h | 6 + trunk/init/main.c | 5 +- trunk/ipc/mqueue.c | 2 +- trunk/lib/textsearch.c | 14 +- trunk/lib/ts_bm.c | 26 +- trunk/lib/ts_fsm.c | 6 +- trunk/lib/ts_kmp.c | 29 +- trunk/mm/highmem.c | 1 + trunk/net/802/Kconfig | 7 + trunk/net/802/Makefile | 2 + trunk/net/802/garp.c | 636 + trunk/net/802/stp.c | 102 + trunk/net/8021q/Kconfig | 10 + trunk/net/8021q/Makefile | 12 +- trunk/net/8021q/vlan.c | 80 +- trunk/net/8021q/vlan.h | 86 +- trunk/net/8021q/vlan_core.c | 64 + trunk/net/8021q/vlan_dev.c | 298 +- trunk/net/8021q/vlan_gvrp.c | 66 + trunk/net/8021q/vlan_netlink.c | 7 +- trunk/net/8021q/vlanproc.c | 13 +- trunk/net/Kconfig | 1 + trunk/net/Makefile | 4 +- trunk/net/appletalk/aarp.c | 4 +- trunk/net/appletalk/ddp.c | 6 +- trunk/net/atm/addr.c | 10 +- trunk/net/atm/addr.h | 4 +- trunk/net/atm/br2684.c | 14 +- trunk/net/atm/clip.c | 2 +- trunk/net/atm/common.c | 8 +- trunk/net/atm/lec.c | 55 +- trunk/net/atm/lec.h | 10 +- trunk/net/atm/mpc.c | 2 +- trunk/net/ax25/af_ax25.c | 8 +- trunk/net/ax25/ax25_in.c | 2 +- trunk/net/ax25/ax25_std_timer.c | 8 +- trunk/net/bluetooth/af_bluetooth.c | 53 +- trunk/net/bluetooth/bnep/bnep.h | 4 - trunk/net/bluetooth/bnep/core.c | 9 +- trunk/net/bluetooth/bnep/netdev.c | 4 - trunk/net/bluetooth/bnep/sock.c | 4 - trunk/net/bluetooth/hci_conn.c | 96 +- trunk/net/bluetooth/hci_core.c | 42 +- trunk/net/bluetooth/hci_event.c | 512 +- trunk/net/bluetooth/hci_sock.c | 18 +- trunk/net/bluetooth/hci_sysfs.c | 31 +- trunk/net/bluetooth/hidp/core.c | 10 + trunk/net/bluetooth/l2cap.c | 337 +- trunk/net/bluetooth/rfcomm/core.c | 94 +- trunk/net/bluetooth/rfcomm/sock.c | 25 +- trunk/net/bluetooth/rfcomm/tty.c | 70 +- trunk/net/bluetooth/sco.c | 14 +- trunk/net/bridge/Kconfig | 1 + trunk/net/bridge/br.c | 18 +- trunk/net/bridge/br_device.c | 14 +- trunk/net/bridge/br_fdb.c | 2 - trunk/net/bridge/br_forward.c | 6 +- trunk/net/bridge/br_if.c | 12 +- trunk/net/bridge/br_input.c | 25 +- trunk/net/bridge/br_ioctl.c | 2 - trunk/net/bridge/br_notify.c | 4 +- trunk/net/bridge/br_private.h | 10 +- trunk/net/bridge/br_private_stp.h | 2 - trunk/net/bridge/br_stp.c | 2 - trunk/net/bridge/br_stp_bpdu.c | 16 +- trunk/net/bridge/br_stp_if.c | 6 +- trunk/net/bridge/br_stp_timer.c | 2 - trunk/net/bridge/netfilter/Kconfig | 11 +- trunk/net/bridge/netfilter/Makefile | 1 + trunk/net/bridge/netfilter/ebt_ip6.c | 144 + trunk/net/bridge/netfilter/ebt_log.c | 66 +- trunk/net/can/af_can.c | 4 +- trunk/net/can/bcm.c | 2 +- trunk/net/can/raw.c | 2 +- trunk/net/compat.c | 2 +- trunk/net/core/dev.c | 380 +- trunk/net/core/dev_mcast.c | 24 +- trunk/net/core/ethtool.c | 37 + trunk/net/core/fib_rules.c | 2 +- trunk/net/core/iovec.c | 2 +- trunk/net/core/link_watch.c | 11 +- trunk/net/core/neighbour.c | 8 +- trunk/net/core/net-sysfs.c | 26 +- trunk/net/core/netpoll.c | 24 +- trunk/net/core/pktgen.c | 71 +- trunk/net/core/rtnetlink.c | 26 +- trunk/net/core/skbuff.c | 166 +- trunk/net/core/sock.c | 8 +- trunk/net/core/sysctl_net_core.c | 39 +- trunk/net/dccp/ccids/ccid3.c | 14 +- trunk/net/dccp/ccids/lib/loss_interval.c | 10 +- trunk/net/dccp/ccids/lib/packet_history.c | 103 +- trunk/net/dccp/ccids/lib/packet_history.h | 30 +- trunk/net/dccp/dccp.h | 17 +- trunk/net/dccp/ipv4.c | 19 +- trunk/net/dccp/ipv6.c | 15 +- trunk/net/dccp/options.c | 14 +- trunk/net/dccp/proto.c | 4 +- trunk/net/dccp/timer.c | 4 +- trunk/net/decnet/af_decnet.c | 34 +- trunk/net/decnet/dn_route.c | 2 +- trunk/net/decnet/dn_rules.c | 2 +- trunk/net/econet/af_econet.c | 8 +- trunk/net/ieee80211/ieee80211_rx.c | 2 +- trunk/net/ieee80211/ieee80211_tx.c | 86 - trunk/net/ieee80211/ieee80211_wx.c | 137 +- trunk/net/ipv4/af_inet.c | 87 +- trunk/net/ipv4/arp.c | 9 +- trunk/net/ipv4/datagram.c | 2 +- trunk/net/ipv4/devinet.c | 35 +- trunk/net/ipv4/fib_frontend.c | 19 +- trunk/net/ipv4/fib_hash.c | 8 +- trunk/net/ipv4/fib_rules.c | 4 +- trunk/net/ipv4/fib_semantics.c | 2 - trunk/net/ipv4/fib_trie.c | 30 +- trunk/net/ipv4/icmp.c | 31 +- trunk/net/ipv4/igmp.c | 28 +- trunk/net/ipv4/inet_connection_sock.c | 13 +- trunk/net/ipv4/inet_diag.c | 2 - trunk/net/ipv4/inet_hashtables.c | 23 +- trunk/net/ipv4/inet_timewait_sock.c | 21 +- trunk/net/ipv4/inetpeer.c | 2 - trunk/net/ipv4/ip_forward.c | 11 +- trunk/net/ipv4/ip_fragment.c | 61 +- trunk/net/ipv4/ip_gre.c | 32 +- trunk/net/ipv4/ip_input.c | 40 +- trunk/net/ipv4/ip_options.c | 2 - trunk/net/ipv4/ip_output.c | 35 +- trunk/net/ipv4/ip_sockglue.c | 2 - trunk/net/ipv4/ipconfig.c | 6 +- trunk/net/ipv4/ipip.c | 24 +- trunk/net/ipv4/ipmr.c | 125 +- trunk/net/ipv4/ipvs/ip_vs_app.c | 2 - trunk/net/ipv4/ipvs/ip_vs_conn.c | 2 - trunk/net/ipv4/ipvs/ip_vs_core.c | 5 +- trunk/net/ipv4/ipvs/ip_vs_ctl.c | 2 - trunk/net/ipv4/ipvs/ip_vs_dh.c | 2 - trunk/net/ipv4/ipvs/ip_vs_est.c | 2 - trunk/net/ipv4/ipvs/ip_vs_ftp.c | 2 - trunk/net/ipv4/ipvs/ip_vs_lblc.c | 2 - trunk/net/ipv4/ipvs/ip_vs_lblcr.c | 2 - trunk/net/ipv4/ipvs/ip_vs_lc.c | 2 - trunk/net/ipv4/ipvs/ip_vs_nq.c | 2 - trunk/net/ipv4/ipvs/ip_vs_proto.c | 2 - trunk/net/ipv4/ipvs/ip_vs_proto_ah.c | 2 - trunk/net/ipv4/ipvs/ip_vs_proto_esp.c | 2 - trunk/net/ipv4/ipvs/ip_vs_proto_tcp.c | 2 - trunk/net/ipv4/ipvs/ip_vs_proto_udp.c | 2 - trunk/net/ipv4/ipvs/ip_vs_rr.c | 2 - trunk/net/ipv4/ipvs/ip_vs_sched.c | 2 - trunk/net/ipv4/ipvs/ip_vs_sed.c | 2 - trunk/net/ipv4/ipvs/ip_vs_sh.c | 2 - trunk/net/ipv4/ipvs/ip_vs_sync.c | 433 +- trunk/net/ipv4/ipvs/ip_vs_wlc.c | 2 - trunk/net/ipv4/ipvs/ip_vs_wrr.c | 2 - trunk/net/ipv4/ipvs/ip_vs_xmit.c | 2 - trunk/net/ipv4/netfilter/Kconfig | 15 +- trunk/net/ipv4/netfilter/Makefile | 1 + trunk/net/ipv4/netfilter/ip_queue.c | 5 +- trunk/net/ipv4/netfilter/ipt_MASQUERADE.c | 2 +- trunk/net/ipv4/netfilter/iptable_security.c | 180 + .../ipv4/netfilter/nf_conntrack_proto_icmp.c | 5 +- trunk/net/ipv4/netfilter/nf_nat_proto_sctp.c | 4 +- trunk/net/ipv4/proc.c | 113 +- trunk/net/ipv4/protocol.c | 2 - trunk/net/ipv4/raw.c | 12 +- trunk/net/ipv4/route.c | 262 +- trunk/net/ipv4/syncookies.c | 8 +- trunk/net/ipv4/sysctl_net_ipv4.c | 5 +- trunk/net/ipv4/tcp.c | 102 +- trunk/net/ipv4/tcp_diag.c | 2 - trunk/net/ipv4/tcp_input.c | 236 +- trunk/net/ipv4/tcp_ipv4.c | 324 +- trunk/net/ipv4/tcp_minisocks.c | 12 +- trunk/net/ipv4/tcp_output.c | 466 +- trunk/net/ipv4/tcp_timer.c | 27 +- trunk/net/ipv4/udp.c | 76 +- trunk/net/ipv4/udp_impl.h | 2 +- trunk/net/ipv4/udplite.c | 3 - trunk/net/ipv6/addrconf.c | 94 +- trunk/net/ipv6/addrlabel.c | 106 +- trunk/net/ipv6/af_inet6.c | 17 +- trunk/net/ipv6/anycast.c | 2 +- trunk/net/ipv6/datagram.c | 2 - trunk/net/ipv6/exthdrs.c | 4 +- trunk/net/ipv6/icmp.c | 5 +- trunk/net/ipv6/inet6_hashtables.c | 13 +- trunk/net/ipv6/ip6_fib.c | 2 - trunk/net/ipv6/ip6_input.c | 7 +- trunk/net/ipv6/ip6_output.c | 19 +- trunk/net/ipv6/ip6_tunnel.c | 28 +- trunk/net/ipv6/ip6mr.c | 81 +- trunk/net/ipv6/ipv6_sockglue.c | 11 +- trunk/net/ipv6/mcast.c | 9 +- trunk/net/ipv6/ndisc.c | 11 +- trunk/net/ipv6/netfilter/Kconfig | 12 + trunk/net/ipv6/netfilter/Makefile | 1 + trunk/net/ipv6/netfilter/ip6_queue.c | 5 +- trunk/net/ipv6/netfilter/ip6table_filter.c | 31 +- trunk/net/ipv6/netfilter/ip6table_security.c | 172 + .../netfilter/nf_conntrack_proto_icmpv6.c | 5 +- trunk/net/ipv6/proc.c | 33 +- trunk/net/ipv6/protocol.c | 2 - trunk/net/ipv6/raw.c | 10 +- trunk/net/ipv6/reassembly.c | 63 +- trunk/net/ipv6/route.c | 74 +- trunk/net/ipv6/sit.c | 26 +- trunk/net/ipv6/syncookies.c | 6 +- trunk/net/ipv6/sysctl_net_ipv6.c | 29 +- trunk/net/ipv6/tcp_ipv6.c | 269 +- trunk/net/ipv6/udp.c | 53 +- trunk/net/ipv6/udp_impl.h | 2 +- trunk/net/ipv6/udplite.c | 2 - trunk/net/ipx/af_ipx.c | 4 +- trunk/net/irda/ircomm/ircomm_tty.c | 14 +- trunk/net/irda/irlap_frame.c | 2 +- trunk/net/irda/irnet/irnet_ppp.c | 54 +- trunk/net/irda/irnet/irnet_ppp.h | 7 +- trunk/net/iucv/af_iucv.c | 1 + trunk/net/iucv/iucv.c | 15 +- trunk/net/key/af_key.c | 622 +- trunk/net/llc/af_llc.c | 4 +- trunk/net/llc/llc_input.c | 2 +- trunk/net/mac80211/Kconfig | 164 +- trunk/net/mac80211/Makefile | 20 +- trunk/net/mac80211/aes_ccm.c | 53 +- trunk/net/mac80211/aes_ccm.h | 6 +- trunk/net/mac80211/cfg.c | 42 +- trunk/net/mac80211/debugfs.c | 58 +- trunk/net/mac80211/debugfs_key.c | 8 +- trunk/net/mac80211/debugfs_netdev.c | 59 +- trunk/net/mac80211/debugfs_netdev.h | 5 - trunk/net/mac80211/debugfs_sta.c | 56 +- trunk/net/mac80211/ieee80211_i.h | 179 +- trunk/net/mac80211/iface.c | 396 +- trunk/net/mac80211/key.c | 11 +- trunk/net/mac80211/key.h | 54 +- trunk/net/mac80211/main.c | 609 +- trunk/net/mac80211/mesh.c | 38 +- trunk/net/mac80211/mesh.h | 2 +- trunk/net/mac80211/mesh_hwmp.c | 2 +- trunk/net/mac80211/mesh_pathtbl.c | 54 +- trunk/net/mac80211/mesh_plink.c | 88 +- trunk/net/mac80211/michael.c | 116 +- trunk/net/mac80211/michael.h | 8 +- trunk/net/mac80211/mlme.c | 1035 +- trunk/net/mac80211/rate.c | 12 +- trunk/net/mac80211/rate.h | 37 +- trunk/net/mac80211/rc80211_pid.h | 4 +- trunk/net/mac80211/rc80211_pid_algo.c | 40 +- trunk/net/mac80211/rc80211_pid_debugfs.c | 8 +- trunk/net/mac80211/rx.c | 683 +- trunk/net/mac80211/sta_info.c | 55 +- trunk/net/mac80211/sta_info.h | 168 +- trunk/net/mac80211/tkip.c | 282 +- trunk/net/mac80211/tkip.h | 8 +- trunk/net/mac80211/tx.c | 1167 +- trunk/net/mac80211/util.c | 136 +- trunk/net/mac80211/wep.c | 71 +- trunk/net/mac80211/wep.h | 2 +- trunk/net/mac80211/wext.c | 145 +- trunk/net/mac80211/wme.c | 676 +- trunk/net/mac80211/wme.h | 43 +- trunk/net/mac80211/wpa.c | 403 +- trunk/net/netfilter/Kconfig | 5 +- trunk/net/netfilter/nf_conntrack_core.c | 29 +- trunk/net/netfilter/nf_conntrack_extend.c | 10 +- trunk/net/netfilter/nf_conntrack_netlink.c | 32 +- trunk/net/netfilter/nf_conntrack_proto_dccp.c | 3 +- trunk/net/netfilter/nf_conntrack_proto_sctp.c | 80 + trunk/net/netfilter/nf_conntrack_proto_tcp.c | 11 +- trunk/net/netfilter/nf_sockopt.c | 2 +- trunk/net/netfilter/nfnetlink_queue.c | 3 +- trunk/net/netfilter/xt_CONNSECMARK.c | 10 +- trunk/net/netfilter/xt_SECMARK.c | 10 +- trunk/net/netfilter/xt_string.c | 38 +- trunk/net/netlabel/netlabel_cipso_v4.c | 2 +- trunk/net/netlabel/netlabel_unlabeled.c | 2 +- trunk/net/netlink/af_netlink.c | 4 +- trunk/net/netrom/af_netrom.c | 24 +- trunk/net/packet/af_packet.c | 222 +- trunk/net/rfkill/rfkill-input.c | 98 +- trunk/net/rfkill/rfkill-input.h | 1 + trunk/net/rfkill/rfkill.c | 314 +- trunk/net/rose/af_rose.c | 26 +- trunk/net/rose/rose_route.c | 29 +- trunk/net/rxrpc/ar-input.c | 5 +- trunk/net/sched/act_gact.c | 2 +- trunk/net/sched/act_ipt.c | 2 +- trunk/net/sched/act_mirred.c | 4 +- trunk/net/sched/act_nat.c | 2 +- trunk/net/sched/act_pedit.c | 2 +- trunk/net/sched/act_police.c | 8 +- trunk/net/sched/act_simple.c | 2 +- trunk/net/sched/cls_api.c | 20 +- trunk/net/sched/cls_flow.c | 52 +- trunk/net/sched/cls_route.c | 12 +- trunk/net/sched/cls_u32.c | 18 +- trunk/net/sched/sch_api.c | 613 +- trunk/net/sched/sch_atm.c | 12 +- trunk/net/sched/sch_cbq.c | 155 +- trunk/net/sched/sch_dsmark.c | 10 +- trunk/net/sched/sch_fifo.c | 49 +- trunk/net/sched/sch_generic.c | 467 +- trunk/net/sched/sch_gred.c | 14 +- trunk/net/sched/sch_hfsc.c | 110 +- trunk/net/sched/sch_htb.c | 195 +- trunk/net/sched/sch_ingress.c | 2 +- trunk/net/sched/sch_netem.c | 65 +- trunk/net/sched/sch_prio.c | 143 +- trunk/net/sched/sch_red.c | 37 +- trunk/net/sched/sch_sfq.c | 20 +- trunk/net/sched/sch_tbf.c | 42 +- trunk/net/sched/sch_teql.c | 50 +- trunk/net/sctp/Kconfig | 4 +- trunk/net/sctp/Makefile | 4 +- trunk/net/sctp/associola.c | 4 + trunk/net/sctp/bind_addr.c | 37 + trunk/net/sctp/input.c | 38 +- trunk/net/sctp/ipv6.c | 20 +- trunk/net/sctp/output.c | 14 +- trunk/net/sctp/outqueue.c | 34 +- trunk/net/sctp/proc.c | 141 + trunk/net/sctp/protocol.c | 35 +- trunk/net/sctp/sm_make_chunk.c | 7 +- trunk/net/sctp/sm_sideeffect.c | 44 +- trunk/net/sctp/sm_statefuns.c | 16 +- trunk/net/sctp/socket.c | 383 +- trunk/net/sctp/transport.c | 3 + trunk/net/socket.c | 92 +- trunk/net/sunrpc/auth_gss/Makefile | 4 +- trunk/net/sunrpc/auth_gss/auth_gss.c | 2 - trunk/net/sunrpc/auth_gss/gss_krb5_crypto.c | 10 - trunk/net/sunrpc/auth_gss/gss_krb5_seal.c | 26 +- trunk/net/sunrpc/auth_gss/gss_krb5_unseal.c | 16 +- trunk/net/sunrpc/auth_gss/gss_krb5_wrap.c | 72 +- trunk/net/sunrpc/svc.c | 110 +- trunk/net/sunrpc/xprtrdma/svc_rdma.c | 35 + trunk/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 84 +- trunk/net/sunrpc/xprtrdma/svc_rdma_sendto.c | 166 +- .../net/sunrpc/xprtrdma/svc_rdma_transport.c | 195 +- trunk/net/sysctl_net.c | 31 +- trunk/net/tipc/bcast.c | 14 +- trunk/net/tipc/bearer.c | 8 +- trunk/net/tipc/cluster.c | 4 +- trunk/net/tipc/config.c | 11 +- trunk/net/tipc/core.c | 13 +- trunk/net/tipc/core.h | 126 +- trunk/net/tipc/dbg.c | 231 +- trunk/net/tipc/dbg.h | 12 +- trunk/net/tipc/discover.c | 14 +- trunk/net/tipc/discover.h | 2 +- trunk/net/tipc/eth_media.c | 10 +- trunk/net/tipc/link.c | 98 +- trunk/net/tipc/msg.c | 13 +- trunk/net/tipc/msg.h | 42 +- trunk/net/tipc/name_distr.c | 6 +- trunk/net/tipc/name_table.c | 55 +- trunk/net/tipc/net.c | 14 +- trunk/net/tipc/net.h | 2 +- trunk/net/tipc/netlink.c | 16 +- trunk/net/tipc/node.c | 55 +- trunk/net/tipc/port.c | 115 +- trunk/net/tipc/ref.c | 14 +- trunk/net/tipc/socket.c | 62 +- trunk/net/tipc/subscr.c | 249 +- trunk/net/tipc/subscr.h | 34 +- trunk/net/tipc/user_reg.c | 14 +- trunk/net/unix/af_unix.c | 2 - trunk/net/wanrouter/Kconfig | 2 - trunk/net/wanrouter/wanmain.c | 6 +- trunk/net/wanrouter/wanproc.c | 2 +- trunk/net/wireless/Kconfig | 11 + trunk/net/wireless/core.c | 33 +- trunk/net/wireless/nl80211.c | 6 +- trunk/net/wireless/radiotap.c | 16 +- trunk/net/wireless/wext.c | 584 +- trunk/net/x25/af_x25.c | 11 +- trunk/net/x25/x25_dev.c | 2 +- trunk/net/xfrm/xfrm_policy.c | 2 +- trunk/virt/kvm/coalesced_mmio.c | 156 + trunk/virt/kvm/coalesced_mmio.h | 23 + trunk/virt/kvm/ioapic.c | 23 +- trunk/virt/kvm/iodev.h | 8 +- trunk/virt/kvm/kvm_main.c | 153 +- trunk/virt/kvm/kvm_trace.c | 18 +- 1550 files changed, 148455 insertions(+), 79114 deletions(-) create mode 100644 trunk/Documentation/networking/dm9000.txt create mode 100644 trunk/Documentation/networking/mac80211_hwsim/README create mode 100644 trunk/Documentation/networking/mac80211_hwsim/hostapd.conf create mode 100644 trunk/Documentation/networking/mac80211_hwsim/wpa_supplicant.conf create mode 100644 trunk/Documentation/video4linux/gspca.txt delete mode 100644 trunk/arch/m68k/mac/bootparse.c delete mode 100644 trunk/arch/m68k/sun3/sbus.c create mode 100644 trunk/arch/mips/configs/rb532_defconfig create mode 100644 trunk/arch/mips/pci/fixup-rc32434.c create mode 100644 trunk/arch/mips/pci/ops-rc32434.c create mode 100644 trunk/arch/mips/pci/pci-rc32434.c create mode 100644 trunk/arch/mips/rb532/Makefile create mode 100644 trunk/arch/mips/rb532/devices.c create mode 100644 trunk/arch/mips/rb532/gpio.c create mode 100644 trunk/arch/mips/rb532/irq.c create mode 100644 trunk/arch/mips/rb532/prom.c create mode 100644 trunk/arch/mips/rb532/serial.c create mode 100644 trunk/arch/mips/rb532/setup.c create mode 100644 trunk/arch/mips/rb532/time.c delete mode 100644 trunk/arch/mips/txx9/generic/mem_tx4938.c create mode 100644 trunk/arch/mips/txx9/generic/setup_tx4927.c create mode 100644 trunk/arch/mips/txx9/generic/setup_tx4938.c delete mode 100644 trunk/drivers/atm/fore200e_firmware_copyright delete mode 100644 trunk/drivers/atm/fore200e_mkfirm.c delete mode 100644 trunk/drivers/atm/pca200e.data delete mode 100644 trunk/drivers/atm/pca200e_ecd.data delete mode 100644 trunk/drivers/atm/sba200e_ecd.data create mode 100644 trunk/drivers/media/dvb/dvb-usb/anysee.c create mode 100644 trunk/drivers/media/dvb/dvb-usb/anysee.h create mode 100644 trunk/drivers/media/dvb/siano/Kconfig create mode 100644 trunk/drivers/media/dvb/siano/Makefile create mode 100644 trunk/drivers/media/dvb/siano/sms-cards.c create mode 100644 trunk/drivers/media/dvb/siano/sms-cards.h create mode 100644 trunk/drivers/media/dvb/siano/smscoreapi.c create mode 100644 trunk/drivers/media/dvb/siano/smscoreapi.h create mode 100644 trunk/drivers/media/dvb/siano/smsdvb.c create mode 100644 trunk/drivers/media/dvb/siano/smsusb.c create mode 100644 trunk/drivers/media/video/gspca/Kconfig create mode 100644 trunk/drivers/media/video/gspca/Makefile create mode 100644 trunk/drivers/media/video/gspca/conex.c create mode 100644 trunk/drivers/media/video/gspca/etoms.c create mode 100644 trunk/drivers/media/video/gspca/gspca.c create mode 100644 trunk/drivers/media/video/gspca/gspca.h create mode 100644 trunk/drivers/media/video/gspca/jpeg.h create mode 100644 trunk/drivers/media/video/gspca/mars.c create mode 100644 trunk/drivers/media/video/gspca/ov519.c create mode 100644 trunk/drivers/media/video/gspca/pac207.c create mode 100644 trunk/drivers/media/video/gspca/pac7311.c create mode 100644 trunk/drivers/media/video/gspca/sonixb.c create mode 100644 trunk/drivers/media/video/gspca/sonixj.c create mode 100644 trunk/drivers/media/video/gspca/spca500.c create mode 100644 trunk/drivers/media/video/gspca/spca501.c create mode 100644 trunk/drivers/media/video/gspca/spca505.c create mode 100644 trunk/drivers/media/video/gspca/spca506.c create mode 100644 trunk/drivers/media/video/gspca/spca508.c create mode 100644 trunk/drivers/media/video/gspca/spca561.c create mode 100644 trunk/drivers/media/video/gspca/stk014.c create mode 100644 trunk/drivers/media/video/gspca/sunplus.c create mode 100644 trunk/drivers/media/video/gspca/t613.c create mode 100644 trunk/drivers/media/video/gspca/tv8532.c create mode 100644 trunk/drivers/media/video/gspca/vc032x.c create mode 100644 trunk/drivers/media/video/gspca/zc3xx-reg.h create mode 100644 trunk/drivers/media/video/gspca/zc3xx.c create mode 100644 trunk/drivers/media/video/s2255drv.c delete mode 100644 trunk/drivers/media/video/saa711x.c create mode 100644 trunk/drivers/media/video/sh_mobile_ceu_camera.c create mode 100644 trunk/drivers/media/video/soc_camera_platform.c create mode 100644 trunk/drivers/media/video/uvc/Kconfig create mode 100644 trunk/drivers/media/video/videobuf-dma-contig.c create mode 100644 trunk/drivers/net/8390p.c delete mode 100644 trunk/drivers/net/bnx2x.c create mode 100644 trunk/drivers/net/bnx2x_link.c create mode 100644 trunk/drivers/net/bnx2x_link.h create mode 100644 trunk/drivers/net/bnx2x_main.c delete mode 100644 trunk/drivers/net/ibm_emac/Kconfig delete mode 100644 trunk/drivers/net/ibm_emac/Makefile delete mode 100644 trunk/drivers/net/ibm_emac/ibm_emac.h delete mode 100644 trunk/drivers/net/ibm_emac/ibm_emac_core.c delete mode 100644 trunk/drivers/net/ibm_emac/ibm_emac_core.h delete mode 100644 trunk/drivers/net/ibm_emac/ibm_emac_debug.c delete mode 100644 trunk/drivers/net/ibm_emac/ibm_emac_debug.h delete mode 100644 trunk/drivers/net/ibm_emac/ibm_emac_mal.c delete mode 100644 trunk/drivers/net/ibm_emac/ibm_emac_mal.h delete mode 100644 trunk/drivers/net/ibm_emac/ibm_emac_phy.c delete mode 100644 trunk/drivers/net/ibm_emac/ibm_emac_phy.h delete mode 100644 trunk/drivers/net/ibm_emac/ibm_emac_rgmii.c delete mode 100644 trunk/drivers/net/ibm_emac/ibm_emac_rgmii.h delete mode 100644 trunk/drivers/net/ibm_emac/ibm_emac_tah.c delete mode 100644 trunk/drivers/net/ibm_emac/ibm_emac_tah.h delete mode 100644 trunk/drivers/net/ibm_emac/ibm_emac_zmii.c delete mode 100644 trunk/drivers/net/ibm_emac/ibm_emac_zmii.h create mode 100644 trunk/drivers/net/phy/mdio-ofgpio.c delete mode 100644 trunk/drivers/net/saa9730.c delete mode 100644 trunk/drivers/net/saa9730.h delete mode 100644 trunk/drivers/net/sfc/i2c-direct.c delete mode 100644 trunk/drivers/net/sfc/i2c-direct.h create mode 100644 trunk/drivers/net/sh_eth.c create mode 100644 trunk/drivers/net/sh_eth.h create mode 100644 trunk/drivers/net/usb/hso.c create mode 100644 trunk/drivers/net/wireless/iwlwifi/iwl-5000-hw.h create mode 100644 trunk/drivers/net/wireless/iwlwifi/iwl-5000.c create mode 100644 trunk/drivers/net/wireless/iwlwifi/iwl-calib.c create mode 100644 trunk/drivers/net/wireless/iwlwifi/iwl-calib.h rename trunk/drivers/net/wireless/iwlwifi/{iwl-4965-commands.h => iwl-commands.h} (89%) rename trunk/drivers/net/wireless/iwlwifi/{iwl-4965.h => iwl-dev.h} (66%) create mode 100644 trunk/drivers/net/wireless/iwlwifi/iwl-fh.h create mode 100644 trunk/drivers/net/wireless/iwlwifi/iwl-power.c create mode 100644 trunk/drivers/net/wireless/iwlwifi/iwl-power.h create mode 100644 trunk/drivers/net/wireless/iwlwifi/iwl-rx.c create mode 100644 trunk/drivers/net/wireless/iwlwifi/iwl-scan.c create mode 100644 trunk/drivers/net/wireless/iwlwifi/iwl-tx.c create mode 100644 trunk/drivers/net/wireless/libertas/persistcfg.c create mode 100644 trunk/drivers/net/wireless/mac80211_hwsim.c create mode 100644 trunk/include/asm-mips/mach-rc32434/cpu-feature-overrides.h create mode 100644 trunk/include/asm-mips/mach-rc32434/ddr.h create mode 100644 trunk/include/asm-mips/mach-rc32434/dma.h create mode 100644 trunk/include/asm-mips/mach-rc32434/dma_v.h create mode 100644 trunk/include/asm-mips/mach-rc32434/eth.h create mode 100644 trunk/include/asm-mips/mach-rc32434/gpio.h create mode 100644 trunk/include/asm-mips/mach-rc32434/integ.h create mode 100644 trunk/include/asm-mips/mach-rc32434/irq.h create mode 100644 trunk/include/asm-mips/mach-rc32434/pci.h create mode 100644 trunk/include/asm-mips/mach-rc32434/prom.h create mode 100644 trunk/include/asm-mips/mach-rc32434/rb.h create mode 100644 trunk/include/asm-mips/mach-rc32434/rc32434.h create mode 100644 trunk/include/asm-mips/mach-rc32434/timer.h create mode 100644 trunk/include/asm-mips/mach-rc32434/war.h delete mode 100644 trunk/include/asm-mips/mips-boards/atlas.h delete mode 100644 trunk/include/asm-mips/mips-boards/atlasint.h delete mode 100644 trunk/include/asm-mips/mips-boards/maltasmp.h delete mode 100644 trunk/include/asm-mips/mips-boards/saa9730_uart.h delete mode 100644 trunk/include/asm-mips/mips-boards/sead.h delete mode 100644 trunk/include/asm-mips/mips-boards/seadint.h create mode 100644 trunk/include/linux/brcmphy.h create mode 100644 trunk/include/linux/netfilter_bridge/ebt_ip6.h create mode 100644 trunk/include/linux/smc911x.h create mode 100644 trunk/include/media/sh_mobile_ceu.h create mode 100644 trunk/include/media/soc_camera_platform.h create mode 100644 trunk/include/media/videobuf-dma-contig.h create mode 100644 trunk/include/net/garp.h create mode 100644 trunk/include/net/netns/hash.h create mode 100644 trunk/include/net/netns/mib.h create mode 100644 trunk/include/net/stp.h create mode 100644 trunk/net/802/Kconfig create mode 100644 trunk/net/802/garp.c create mode 100644 trunk/net/802/stp.c create mode 100644 trunk/net/8021q/vlan_core.c create mode 100644 trunk/net/8021q/vlan_gvrp.c create mode 100644 trunk/net/bridge/netfilter/ebt_ip6.c create mode 100644 trunk/net/ipv4/netfilter/iptable_security.c create mode 100644 trunk/net/ipv6/netfilter/ip6table_security.c create mode 100644 trunk/virt/kvm/coalesced_mmio.c create mode 100644 trunk/virt/kvm/coalesced_mmio.h diff --git a/[refs] b/[refs] index dfc3e2287e08..9fcfb7bd9541 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d092633bff3b19faffc480fe9810805e7792a029 +refs/heads/master: e27772b48df91a954a74b1411b57d83b945a58c7 diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 65a1482457a8..86334b6f8238 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -308,9 +308,31 @@ Who: Matthew Wilcox --------------------------- +What: SCTP_GET_PEER_ADDRS_NUM_OLD, SCTP_GET_PEER_ADDRS_OLD, + SCTP_GET_LOCAL_ADDRS_NUM_OLD, SCTP_GET_LOCAL_ADDRS_OLD +When: June 2009 +Why: A newer version of the options have been introduced in 2005 that + removes the limitions of the old API. The sctp library has been + converted to use these new options at the same time. Any user + space app that directly uses the old options should convert to using + the new options. +Who: Vlad Yasevich + +--------------------------- + What: CONFIG_THERMAL_HWMON When: January 2009 Why: This option was introduced just to allow older lm-sensors userspace to keep working over the upgrade to 2.6.26. At the scheduled time of removal fixed lm-sensors (2.x or 3.x) should be readily available. Who: Rene Herman + +--------------------------- + +What: Code that is now under CONFIG_WIRELESS_EXT_SYSFS + (in net/core/net-sysfs.c) +When: After the only user (hal) has seen a release with the patches + for enough time, probably some time in 2010. +Why: Over 1K .text/.data size reduction, data is available in other + ways (ioctls) +Who: Johannes Berg diff --git a/trunk/Documentation/filesystems/configfs/configfs.txt b/trunk/Documentation/filesystems/configfs/configfs.txt index 15838d706ea2..44c97e6accb2 100644 --- a/trunk/Documentation/filesystems/configfs/configfs.txt +++ b/trunk/Documentation/filesystems/configfs/configfs.txt @@ -233,12 +233,10 @@ accomplished via the group operations specified on the group's config_item_type. struct configfs_group_operations { - int (*make_item)(struct config_group *group, - const char *name, - struct config_item **new_item); - int (*make_group)(struct config_group *group, - const char *name, - struct config_group **new_group); + struct config_item *(*make_item)(struct config_group *group, + const char *name); + struct config_group *(*make_group)(struct config_group *group, + const char *name); int (*commit_item)(struct config_item *item); void (*disconnect_notify)(struct config_group *group, struct config_item *item); diff --git a/trunk/Documentation/filesystems/configfs/configfs_example.c b/trunk/Documentation/filesystems/configfs/configfs_example.c index 0b422acd470c..039648791701 100644 --- a/trunk/Documentation/filesystems/configfs/configfs_example.c +++ b/trunk/Documentation/filesystems/configfs/configfs_example.c @@ -273,13 +273,13 @@ static inline struct simple_children *to_simple_children(struct config_item *ite return item ? container_of(to_config_group(item), struct simple_children, group) : NULL; } -static int simple_children_make_item(struct config_group *group, const char *name, struct config_item **new_item) +static struct config_item *simple_children_make_item(struct config_group *group, const char *name) { struct simple_child *simple_child; simple_child = kzalloc(sizeof(struct simple_child), GFP_KERNEL); if (!simple_child) - return -ENOMEM; + return ERR_PTR(-ENOMEM); config_item_init_type_name(&simple_child->item, name, @@ -287,8 +287,7 @@ static int simple_children_make_item(struct config_group *group, const char *nam simple_child->storeme = 0; - *new_item = &simple_child->item; - return 0; + return &simple_child->item; } static struct configfs_attribute simple_children_attr_description = { @@ -360,21 +359,20 @@ static struct configfs_subsystem simple_children_subsys = { * children of its own. */ -static int group_children_make_group(struct config_group *group, const char *name, struct config_group **new_group) +static struct config_group *group_children_make_group(struct config_group *group, const char *name) { struct simple_children *simple_children; simple_children = kzalloc(sizeof(struct simple_children), GFP_KERNEL); if (!simple_children) - return -ENOMEM; + return ERR_PTR(-ENOMEM); config_group_init_type_name(&simple_children->group, name, &simple_children_type); - *new_group = &simple_children->group; - return 0; + return &simple_children->group; } static struct configfs_attribute group_children_attr_description = { diff --git a/trunk/Documentation/filesystems/nfs-rdma.txt b/trunk/Documentation/filesystems/nfs-rdma.txt index d0ec45ae4e7d..44bd766f2e5d 100644 --- a/trunk/Documentation/filesystems/nfs-rdma.txt +++ b/trunk/Documentation/filesystems/nfs-rdma.txt @@ -5,7 +5,7 @@ ################################################################################ Author: NetApp and Open Grid Computing - Date: April 15, 2008 + Date: May 29, 2008 Table of Contents ~~~~~~~~~~~~~~~~~ @@ -60,16 +60,18 @@ Installation The procedures described in this document have been tested with distributions from Red Hat's Fedora Project (http://fedora.redhat.com/). - - Install nfs-utils-1.1.1 or greater on the client + - Install nfs-utils-1.1.2 or greater on the client - An NFS/RDMA mount point can only be obtained by using the mount.nfs - command in nfs-utils-1.1.1 or greater. To see which version of mount.nfs - you are using, type: + An NFS/RDMA mount point can be obtained by using the mount.nfs command in + nfs-utils-1.1.2 or greater (nfs-utils-1.1.1 was the first nfs-utils + version with support for NFS/RDMA mounts, but for various reasons we + recommend using nfs-utils-1.1.2 or greater). To see which version of + mount.nfs you are using, type: - > /sbin/mount.nfs -V + $ /sbin/mount.nfs -V - If the version is less than 1.1.1 or the command does not exist, - then you will need to install the latest version of nfs-utils. + If the version is less than 1.1.2 or the command does not exist, + you should install the latest version of nfs-utils. Download the latest package from: @@ -77,22 +79,33 @@ Installation Uncompress the package and follow the installation instructions. - If you will not be using GSS and NFSv4, the installation process - can be simplified by disabling these features when running configure: + If you will not need the idmapper and gssd executables (you do not need + these to create an NFS/RDMA enabled mount command), the installation + process can be simplified by disabling these features when running + configure: - > ./configure --disable-gss --disable-nfsv4 + $ ./configure --disable-gss --disable-nfsv4 - For more information on this see the package's README and INSTALL files. + To build nfs-utils you will need the tcp_wrappers package installed. For + more information on this see the package's README and INSTALL files. After building the nfs-utils package, there will be a mount.nfs binary in the utils/mount directory. This binary can be used to initiate NFS v2, v3, - or v4 mounts. To initiate a v4 mount, the binary must be called mount.nfs4. - The standard technique is to create a symlink called mount.nfs4 to mount.nfs. + or v4 mounts. To initiate a v4 mount, the binary must be called + mount.nfs4. The standard technique is to create a symlink called + mount.nfs4 to mount.nfs. - NOTE: mount.nfs and therefore nfs-utils-1.1.1 or greater is only needed + This mount.nfs binary should be installed at /sbin/mount.nfs as follows: + + $ sudo cp utils/mount/mount.nfs /sbin/mount.nfs + + In this location, mount.nfs will be invoked automatically for NFS mounts + by the system mount commmand. + + NOTE: mount.nfs and therefore nfs-utils-1.1.2 or greater is only needed on the NFS client machine. You do not need this specific version of nfs-utils on the server. Furthermore, only the mount.nfs command from - nfs-utils-1.1.1 is needed on the client. + nfs-utils-1.1.2 is needed on the client. - Install a Linux kernel with NFS/RDMA @@ -156,8 +169,8 @@ Check RDMA and NFS Setup this time. For example, if you are using a Mellanox Tavor/Sinai/Arbel card: - > modprobe ib_mthca - > modprobe ib_ipoib + $ modprobe ib_mthca + $ modprobe ib_ipoib If you are using InfiniBand, make sure there is a Subnet Manager (SM) running on the network. If your IB switch has an embedded SM, you can @@ -166,7 +179,7 @@ Check RDMA and NFS Setup If an SM is running on your network, you should see the following: - > cat /sys/class/infiniband/driverX/ports/1/state + $ cat /sys/class/infiniband/driverX/ports/1/state 4: ACTIVE where driverX is mthca0, ipath5, ehca3, etc. @@ -174,10 +187,10 @@ Check RDMA and NFS Setup To further test the InfiniBand software stack, use IPoIB (this assumes you have two IB hosts named host1 and host2): - host1> ifconfig ib0 a.b.c.x - host2> ifconfig ib0 a.b.c.y - host1> ping a.b.c.y - host2> ping a.b.c.x + host1$ ifconfig ib0 a.b.c.x + host2$ ifconfig ib0 a.b.c.y + host1$ ping a.b.c.y + host2$ ping a.b.c.x For other device types, follow the appropriate procedures. @@ -202,11 +215,11 @@ NFS/RDMA Setup /vol0 192.168.0.47(fsid=0,rw,async,insecure,no_root_squash) /vol0 192.168.0.0/255.255.255.0(fsid=0,rw,async,insecure,no_root_squash) - The IP address(es) is(are) the client's IPoIB address for an InfiniBand HCA or the - cleint's iWARP address(es) for an RNIC. + The IP address(es) is(are) the client's IPoIB address for an InfiniBand + HCA or the cleint's iWARP address(es) for an RNIC. - NOTE: The "insecure" option must be used because the NFS/RDMA client does not - use a reserved port. + NOTE: The "insecure" option must be used because the NFS/RDMA client does + not use a reserved port. Each time a machine boots: @@ -214,43 +227,45 @@ NFS/RDMA Setup For InfiniBand using a Mellanox adapter: - > modprobe ib_mthca - > modprobe ib_ipoib - > ifconfig ib0 a.b.c.d + $ modprobe ib_mthca + $ modprobe ib_ipoib + $ ifconfig ib0 a.b.c.d NOTE: use unique addresses for the client and server - Start the NFS server - If the NFS/RDMA server was built as a module (CONFIG_SUNRPC_XPRT_RDMA=m in kernel config), - load the RDMA transport module: + If the NFS/RDMA server was built as a module (CONFIG_SUNRPC_XPRT_RDMA=m in + kernel config), load the RDMA transport module: - > modprobe svcrdma + $ modprobe svcrdma - Regardless of how the server was built (module or built-in), start the server: + Regardless of how the server was built (module or built-in), start the + server: - > /etc/init.d/nfs start + $ /etc/init.d/nfs start or - > service nfs start + $ service nfs start Instruct the server to listen on the RDMA transport: - > echo rdma 2050 > /proc/fs/nfsd/portlist + $ echo rdma 2050 > /proc/fs/nfsd/portlist - On the client system - If the NFS/RDMA client was built as a module (CONFIG_SUNRPC_XPRT_RDMA=m in kernel config), - load the RDMA client module: + If the NFS/RDMA client was built as a module (CONFIG_SUNRPC_XPRT_RDMA=m in + kernel config), load the RDMA client module: - > modprobe xprtrdma.ko + $ modprobe xprtrdma.ko - Regardless of how the client was built (module or built-in), issue the mount.nfs command: + Regardless of how the client was built (module or built-in), use this + command to mount the NFS/RDMA server: - > /path/to/your/mount.nfs :/ /mnt -i -o rdma,port=2050 + $ mount -o rdma,port=2050 :/ /mnt - To verify that the mount is using RDMA, run "cat /proc/mounts" and check the - "proto" field for the given mount. + To verify that the mount is using RDMA, run "cat /proc/mounts" and check + the "proto" field for the given mount. Congratulations! You're using NFS/RDMA! diff --git a/trunk/Documentation/networking/bonding.txt b/trunk/Documentation/networking/bonding.txt index a0cda062bc33..7fa7fe71d7a8 100644 --- a/trunk/Documentation/networking/bonding.txt +++ b/trunk/Documentation/networking/bonding.txt @@ -289,35 +289,73 @@ downdelay fail_over_mac Specifies whether active-backup mode should set all slaves to - the same MAC address (the traditional behavior), or, when - enabled, change the bond's MAC address when changing the - active interface (i.e., fail over the MAC address itself). - - Fail over MAC is useful for devices that cannot ever alter - their MAC address, or for devices that refuse incoming - broadcasts with their own source MAC (which interferes with - the ARP monitor). - - The down side of fail over MAC is that every device on the - network must be updated via gratuitous ARP, vs. just updating - a switch or set of switches (which often takes place for any - traffic, not just ARP traffic, if the switch snoops incoming - traffic to update its tables) for the traditional method. If - the gratuitous ARP is lost, communication may be disrupted. - - When fail over MAC is used in conjuction with the mii monitor, - devices which assert link up prior to being able to actually - transmit and receive are particularly susecptible to loss of - the gratuitous ARP, and an appropriate updelay setting may be - required. - - A value of 0 disables fail over MAC, and is the default. A - value of 1 enables fail over MAC. This option is enabled - automatically if the first slave added cannot change its MAC - address. This option may be modified via sysfs only when no - slaves are present in the bond. - - This option was added in bonding version 3.2.0. + the same MAC address at enslavement (the traditional + behavior), or, when enabled, perform special handling of the + bond's MAC address in accordance with the selected policy. + + Possible values are: + + none or 0 + + This setting disables fail_over_mac, and causes + bonding to set all slaves of an active-backup bond to + the same MAC address at enslavement time. This is the + default. + + active or 1 + + The "active" fail_over_mac policy indicates that the + MAC address of the bond should always be the MAC + address of the currently active slave. The MAC + address of the slaves is not changed; instead, the MAC + address of the bond changes during a failover. + + This policy is useful for devices that cannot ever + alter their MAC address, or for devices that refuse + incoming broadcasts with their own source MAC (which + interferes with the ARP monitor). + + The down side of this policy is that every device on + the network must be updated via gratuitous ARP, + vs. just updating a switch or set of switches (which + often takes place for any traffic, not just ARP + traffic, if the switch snoops incoming traffic to + update its tables) for the traditional method. If the + gratuitous ARP is lost, communication may be + disrupted. + + When this policy is used in conjuction with the mii + monitor, devices which assert link up prior to being + able to actually transmit and receive are particularly + susecptible to loss of the gratuitous ARP, and an + appropriate updelay setting may be required. + + follow or 2 + + The "follow" fail_over_mac policy causes the MAC + address of the bond to be selected normally (normally + the MAC address of the first slave added to the bond). + However, the second and subsequent slaves are not set + to this MAC address while they are in a backup role; a + slave is programmed with the bond's MAC address at + failover time (and the formerly active slave receives + the newly active slave's MAC address). + + This policy is useful for multiport devices that + either become confused or incur a performance penalty + when multiple ports are programmed with the same MAC + address. + + + The default policy is none, unless the first slave cannot + change its MAC address, in which case the active policy is + selected by default. + + This option may be modified via sysfs only when no slaves are + present in the bond. + + This option was added in bonding version 3.2.0. The "follow" + policy was added in bonding version 3.3.0. lacp_rate @@ -338,7 +376,8 @@ max_bonds Specifies the number of bonding devices to create for this instance of the bonding driver. E.g., if max_bonds is 3, and the bonding driver is not already loaded, then bond0, bond1 - and bond2 will be created. The default value is 1. + and bond2 will be created. The default value is 1. Specifying + a value of 0 will load bonding, but will not create any devices. miimon @@ -501,6 +540,17 @@ mode swapped with the new curr_active_slave that was chosen. +num_grat_arp + + Specifies the number of gratuitous ARPs to be issued after a + failover event. One gratuitous ARP is issued immediately after + the failover, subsequent ARPs are sent at a rate of one per link + monitor interval (arp_interval or miimon, whichever is active). + + The valid range is 0 - 255; the default value is 1. This option + affects only the active-backup mode. This option was added for + bonding version 3.3.0. + primary A string (eth0, eth2, etc) specifying which slave is the diff --git a/trunk/Documentation/networking/dm9000.txt b/trunk/Documentation/networking/dm9000.txt new file mode 100644 index 000000000000..65df3dea5561 --- /dev/null +++ b/trunk/Documentation/networking/dm9000.txt @@ -0,0 +1,167 @@ +DM9000 Network driver +===================== + +Copyright 2008 Simtec Electronics, + Ben Dooks + + +Introduction +------------ + +This file describes how to use the DM9000 platform-device based network driver +that is contained in the files drivers/net/dm9000.c and drivers/net/dm9000.h. + +The driver supports three DM9000 variants, the DM9000E which is the first chip +supported as well as the newer DM9000A and DM9000B devices. It is currently +maintained and tested by Ben Dooks, who should be CC: to any patches for this +driver. + + +Defining the platform device +---------------------------- + +The minimum set of resources attached to the platform device are as follows: + + 1) The physical address of the address register + 2) The physical address of the data register + 3) The IRQ line the device's interrupt pin is connected to. + +These resources should be specified in that order, as the ordering of the +two address regions is important (the driver expects these to be address +and then data). + +An example from arch/arm/mach-s3c2410/mach-bast.c is: + +static struct resource bast_dm9k_resource[] = { + [0] = { + .start = S3C2410_CS5 + BAST_PA_DM9000, + .end = S3C2410_CS5 + BAST_PA_DM9000 + 3, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = S3C2410_CS5 + BAST_PA_DM9000 + 0x40, + .end = S3C2410_CS5 + BAST_PA_DM9000 + 0x40 + 0x3f, + .flags = IORESOURCE_MEM, + }, + [2] = { + .start = IRQ_DM9000, + .end = IRQ_DM9000, + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, + } +}; + +static struct platform_device bast_device_dm9k = { + .name = "dm9000", + .id = 0, + .num_resources = ARRAY_SIZE(bast_dm9k_resource), + .resource = bast_dm9k_resource, +}; + +Note the setting of the IRQ trigger flag in bast_dm9k_resource[2].flags, +as this will generate a warning if it is not present. The trigger from +the flags field will be passed to request_irq() when registering the IRQ +handler to ensure that the IRQ is setup correctly. + +This shows a typical platform device, without the optional configuration +platform data supplied. The next example uses the same resources, but adds +the optional platform data to pass extra configuration data: + +static struct dm9000_plat_data bast_dm9k_platdata = { + .flags = DM9000_PLATF_16BITONLY, +}; + +static struct platform_device bast_device_dm9k = { + .name = "dm9000", + .id = 0, + .num_resources = ARRAY_SIZE(bast_dm9k_resource), + .resource = bast_dm9k_resource, + .dev = { + .platform_data = &bast_dm9k_platdata, + } +}; + +The platform data is defined in include/linux/dm9000.h and described below. + + +Platform data +------------- + +Extra platform data for the DM9000 can describe the IO bus width to the +device, whether or not an external PHY is attached to the device and +the availability of an external configuration EEPROM. + +The flags for the platform data .flags field are as follows: + +DM9000_PLATF_8BITONLY + + The IO should be done with 8bit operations. + +DM9000_PLATF_16BITONLY + + The IO should be done with 16bit operations. + +DM9000_PLATF_32BITONLY + + The IO should be done with 32bit operations. + +DM9000_PLATF_EXT_PHY + + The chip is connected to an external PHY. + +DM9000_PLATF_NO_EEPROM + + This can be used to signify that the board does not have an + EEPROM, or that the EEPROM should be hidden from the user. + +DM9000_PLATF_SIMPLE_PHY + + Switch to using the simpler PHY polling method which does not + try and read the MII PHY state regularly. This is only available + when using the internal PHY. See the section on link state polling + for more information. + + The config symbol DM9000_FORCE_SIMPLE_PHY_POLL, Kconfig entry + "Force simple NSR based PHY polling" allows this flag to be + forced on at build time. + + +PHY Link state polling +---------------------- + +The driver keeps track of the link state and informs the network core +about link (carrier) availablilty. This is managed by several methods +depending on the version of the chip and on which PHY is being used. + +For the internal PHY, the original (and currently default) method is +to read the MII state, either when the status changes if we have the +necessary interrupt support in the chip or every two seconds via a +periodic timer. + +To reduce the overhead for the internal PHY, there is now the option +of using the DM9000_FORCE_SIMPLE_PHY_POLL config, or DM9000_PLATF_SIMPLE_PHY +platform data option to read the summary information without the +expensive MII accesses. This method is faster, but does not print +as much information. + +When using an external PHY, the driver currently has to poll the MII +link status as there is no method for getting an interrupt on link change. + + +DM9000A / DM9000B +----------------- + +These chips are functionally similar to the DM9000E and are supported easily +by the same driver. The features are: + + 1) Interrupt on internal PHY state change. This means that the periodic + polling of the PHY status may be disabled on these devices when using + the internal PHY. + + 2) TCP/UDP checksum offloading, which the driver does not currently support. + + +ethtool +------- + +The driver supports the ethtool interface for access to the driver +state information, the PHY state and the EEPROM. diff --git a/trunk/Documentation/networking/ip-sysctl.txt b/trunk/Documentation/networking/ip-sysctl.txt index 946b66e1b652..d84932650fd3 100644 --- a/trunk/Documentation/networking/ip-sysctl.txt +++ b/trunk/Documentation/networking/ip-sysctl.txt @@ -551,8 +551,9 @@ icmp_echo_ignore_broadcasts - BOOLEAN icmp_ratelimit - INTEGER Limit the maximal rates for sending ICMP packets whose type matches icmp_ratemask (see below) to specific targets. - 0 to disable any limiting, otherwise the maximal rate in jiffies(1) - Default: 100 + 0 to disable any limiting, + otherwise the minimal space between responses in milliseconds. + Default: 1000 icmp_ratemask - INTEGER Mask made of ICMP types for which rates are being limited. @@ -1023,11 +1024,23 @@ max_addresses - INTEGER autoconfigured addresses. Default: 16 +disable_ipv6 - BOOLEAN + Disable IPv6 operation. + Default: FALSE (enable IPv6 operation) + +accept_dad - INTEGER + Whether to accept DAD (Duplicate Address Detection). + 0: Disable DAD + 1: Enable DAD (default) + 2: Enable DAD, and disable IPv6 operation if MAC-based duplicate + link-local address has been found. + icmp/*: ratelimit - INTEGER Limit the maximal rates for sending ICMPv6 packets. - 0 to disable any limiting, otherwise the maximal rate in jiffies(1) - Default: 100 + 0 to disable any limiting, + otherwise the minimal space between responses in milliseconds. + Default: 1000 IPv6 Update by: diff --git a/trunk/Documentation/networking/ixgb.txt b/trunk/Documentation/networking/ixgb.txt index 7c98277777eb..a0d0ffb5e584 100644 --- a/trunk/Documentation/networking/ixgb.txt +++ b/trunk/Documentation/networking/ixgb.txt @@ -1,7 +1,7 @@ -Linux* Base Driver for the Intel(R) PRO/10GbE Family of Adapters -================================================================ +Linux Base Driver for 10 Gigabit Intel(R) Network Connection +============================================================= -November 17, 2004 +October 9, 2007 Contents @@ -9,94 +9,151 @@ Contents - In This Release - Identifying Your Adapter +- Building and Installation - Command Line Parameters - Improving Performance +- Additional Configurations +- Known Issues/Troubleshooting - Support + In This Release =============== -This file describes the Linux* Base Driver for the Intel(R) PRO/10GbE Family -of Adapters, version 1.0.x. +This file describes the ixgb Linux Base Driver for the 10 Gigabit Intel(R) +Network Connection. This driver includes support for Itanium(R)2-based +systems. + +For questions related to hardware requirements, refer to the documentation +supplied with your 10 Gigabit adapter. All hardware requirements listed apply +to use with Linux. + +The following features are available in this kernel: + - 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. -For questions related to hardware requirements, refer to the documentation -supplied with your Intel PRO/10GbE adapter. All hardware requirements listed -apply to use with Linux. Identifying Your Adapter ======================== -To verify your Intel adapter is supported, find the board ID number on the -adapter. Look for a label that has a barcode and a number in the format -A12345-001. +The following Intel network adapters are compatible with the drivers in this +release: + +Controller Adapter Name Physical Layer +---------- ------------ -------------- +82597EX Intel(R) PRO/10GbE LR/SR/CX4 10G Base-LR (1310 nm optical fiber) + Server Adapters 10G Base-SR (850 nm optical fiber) + 10G Base-CX4(twin-axial copper cabling) + +For more information on how to identify your adapter, go to the Adapter & +Driver ID Guide at: + + http://support.intel.com/support/network/sb/CS-012904.htm + + +Building and Installation +========================= + +select m for "Intel(R) PRO/10GbE support" located at: + Location: + -> Device Drivers + -> Network device support (NETDEVICES [=y]) + -> Ethernet (10000 Mbit) (NETDEV_10000 [=y]) +1. make modules && make modules_install + +2. Load the module: + +    modprobe ixgb = + + The insmod command can be used if the full + path to the driver module is specified. For example: + + insmod /lib/modules//kernel/drivers/net/ixgb/ixgb.ko + + With 2.6 based kernels also make sure that older ixgb drivers are + removed from the kernel, before loading the new module: -Use the above information and the Adapter & Driver ID Guide at: + rmmod ixgb; modprobe ixgb - http://support.intel.com/support/network/adapter/pro100/21397.htm +3. Assign an IP address to the interface by entering the following, where + x is the interface number: -For the latest Intel network drivers for Linux, go to: + ifconfig ethx + +4. Verify that the interface works. Enter the following, where + is the IP address for another machine on the same subnet as the interface + that is being tested: + + ping - 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: +If the driver is built as a module, the following optional parameters are +used by entering them on the command line with the modprobe command using +this syntax: modprobe ixgb [