commit be0ea69674ed95e1e98cb3687a241badc756d228 Merge: 4496d93... 15a5b0a... Author: Linus Torvalds Date: Thu Mar 26 16:18:17 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slob: fix lockup in slob_free() slub: use get_track() slub: rename calculate_min_partial() to set_min_partial() slub: add min_partial sysfs tunable slub: move min_partial to struct kmem_cache SLUB: Fix default slab order for big object sizes SLUB: Do not pass 8k objects through to the page allocator SLUB: Introduce and use SLUB_MAX_SIZE and SLUB_PAGE_SHIFT constants slob: clean up the code SLUB: Use ->objsize from struct kmem_cache_cpu in slab_free() commit 4496d937a518fde0d0e1980e4ab470cedb4b50cd Merge: 8e9d208... 4b2873b... Author: Linus Torvalds Date: Thu Mar 26 16:15:31 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: irq_node.handler() should return irqreturn_t m68k: section mismatch fixes: Atari SCSI m68k: section mismatch fixes: DMAsound for Atari MAINTAINERS: Replace dead link to m68k CVS repository by link to new git repository m68k: mac - Add SWIM floppy support m68k: mac - Add a new entry in mac_model to identify the floppy controller type. m68k: Add install target commit 8e9d2089723d08d51e66c5eea49253d76e27941e Merge: ba1eb95... 60aa492... Author: Linus Torvalds Date: Thu Mar 26 16:14:02 2009 -0700 Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6 * 'bkl-removal' of git://git.lwn.net/linux-2.6: Rationalize fasync return values Move FASYNC bit handling to f_op->fasync() Use f_lock to protect f_flags Rename struct file->f_ep_lock commit ba1eb95cf3cc666769afe42eaa15a3a34ae82f94 Merge: a841696... 17d1404... Author: Linus Torvalds Date: Thu Mar 26 16:11:41 2009 -0700 Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits) x86: headers cleanup - setup.h emu101k1.h: fix duplicate include of compiler-gcc4: conditionalize #error on __KERNEL__ remove __KERNEL_STRICT_NAMES make netfilter use strict integer types make drm headers use strict integer types make MTD headers use strict integer types make most exported headers use strict integer types make exported headers use strict posix types unconditionally include asm/types.h from linux/types.h make linux/types.h as assembly safe Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h headers_check fix cleanup: linux/reiserfs_fs.h headers_check fix cleanup: linux/nubus.h headers_check fix cleanup: linux/coda_psdev.h headers_check fix: x86, setup.h headers_check fix: x86, prctl.h headers_check fix: linux/reinserfs_fs.h headers_check fix: linux/socket.h headers_check fix: linux/nubus.h ... Manually fix trivial conflicts in: include/linux/netfilter/xt_limit.h include/linux/netfilter/xt_statistic.h commit a8416961d32d8bb757bcbb86b72042b66d044510 Merge: 6671de3... fc2869f... Author: Linus Torvalds Date: Thu Mar 26 16:06:50 2009 -0700 Merge branch 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (32 commits) x86: disable __do_IRQ support sparseirq, powerpc/cell: fix unused variable warning in interrupt.c genirq: deprecate obsolete typedefs and defines genirq: deprecate __do_IRQ genirq: add doc to struct irqaction genirq: use kzalloc instead of explicit zero initialization genirq: make irqreturn_t an enum genirq: remove redundant if condition genirq: remove unused hw_irq_controller typedef irq: export remove_irq() and setup_irq() symbols irq: match remove_irq() args with setup_irq() irq: add remove_irq() for freeing of setup_irq() irqs genirq: assert that irq handlers are indeed running in hardirq context irq: name 'p' variables a bit better irq: further clean up the free_irq() code flow irq: refactor and clean up the free_irq() code flow irq: clean up manage.c irq: use GFP_KERNEL for action allocation in request_irq() kernel/irq: fix sparse warning: make symbol static irq: optimize init_kstat_irqs/init_copy_kstat_irqs ... commit 6671de344cd661453bbee3cfde5574a974332436 Merge: 831576f... 7c526e1... Author: Linus Torvalds Date: Thu Mar 26 16:05:42 2009 -0700 Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits) posix timers: fix RLIMIT_CPU && fork() time: ntp: fix bug in ntp_update_offset() & do_adjtimex(), fix time: ntp: clean up second_overflow() time: ntp: simplify ntp_tick_adj calculations time: ntp: make 64-bit constants more robust time: ntp: refactor do_adjtimex() some more time: ntp: refactor do_adjtimex() time: ntp: fix bug in ntp_update_offset() & do_adjtimex() time: ntp: micro-optimize ntp_update_offset() time: ntp: simplify ntp_update_offset_fll() time: ntp: refactor and clean up ntp_update_offset() time: ntp: refactor up ntp_update_frequency() time: ntp: clean up ntp_update_frequency() time: ntp: simplify the MAX_TICKADJ_SCALED definition time: ntp: simplify the second_overflow() code flow time: ntp: clean up kernel/time/ntp.c x86: hpet: stop HPET_COUNTER when programming periodic mode x86: hpet: provide separate functions to stop and start the counter x86: hpet: print HPET registers during setup (if hpet=verbose is used) time: apply NTP frequency/tick changes immediately ... commit 831576fe40f4175e0767623cffa4aeb28157943a Merge: 21cdbc1... 66fef08... Author: Linus Torvalds Date: Thu Mar 26 16:05:01 2009 -0700 Merge branch 'sched-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (46 commits) sched: Add comments to find_busiest_group() function sched: Refactor the power savings balance code sched: Optimize the !power_savings_balance during fbg() sched: Create a helper function to calculate imbalance sched: Create helper to calculate small_imbalance in fbg() sched: Create a helper function to calculate sched_domain stats for fbg() sched: Define structure to store the sched_domain statistics for fbg() sched: Create a helper function to calculate sched_group stats for fbg() sched: Define structure to store the sched_group statistics for fbg() sched: Fix indentations in find_busiest_group() using gotos sched: Simple helper functions for find_busiest_group() sched: remove unused fields from struct rq sched: jiffies not printed per CPU sched: small optimisation of can_migrate_task() sched: fix typos in documentation sched: add avg_overlap decay x86, sched_clock(): mark variables read-mostly sched: optimize ttwu vs group scheduling sched: TIF_NEED_RESCHED -> need_reshed() cleanup sched: don't rebalance if attached on NULL domain ... commit 21cdbc1378e8aa96e1ed4a606dce1a8e7daf7fdf Merge: 86d9c07... ef3500b... Author: Linus Torvalds Date: Thu Mar 26 16:04:22 2009 -0700 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (81 commits) [S390] remove duplicated #includes [S390] cpumask: use mm_cpumask() wrapper [S390] cpumask: Use accessors code. [S390] cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits. [S390] cpumask: remove cpu_coregroup_map [S390] fix clock comparator save area usage [S390] Add hwcap flag for the etf3 enhancement facility [S390] Ensure that ipl panic notifier is called late. [S390] fix dfp elf hwcap/facility bit detection [S390] smp: perform initial cpu reset before starting a cpu [S390] smp: fix memory leak on __cpu_up [S390] ipl: Improve checking logic and remove switch defaults. [S390] s390dbf: Remove needless check for NULL pointer. [S390] s390dbf: Remove redundant initilizations. [S390] use kzfree() [S390] BUG to BUG_ON changes [S390] zfcpdump: Prevent zcore from beeing built as a kernel module. [S390] Use csum_partial in checksum.h [S390] cleanup lowcore.h [S390] eliminate ipl_device from lowcore ... commit 86d9c070175de65890794fa227b68297da6206d8 Merge: 413e337... a2a9537... Author: Linus Torvalds Date: Thu Mar 26 16:03:04 2009 -0700 Merge branch 'for-2.6.30' of git://git.kernel.dk/linux-2.6-block * 'for-2.6.30' of git://git.kernel.dk/linux-2.6-block: Get rid of pdflush_operation() in emergency sync and remount btrfs: get rid of current_is_pdflush() in btrfs_btree_balance_dirty Move the default_backing_dev_info out of readahead.c and into backing-dev.c block: Repeated lines in switching-sched.txt bsg: Remove bogus check against request_queue->max_sectors block: WARN in __blk_put_request() for potential bio leak loop: fix circular locking in loop_clr_fd() loop: support barrier writes bsg: add support for tail queuing cpqarray: enable bus mastering block: genhd.h cleanup patch block: add private bio_set for bio integrity allocations block: genhd.h comment needs updating block: get rid of unused blkdev_free_rq() define block: remove various blk_queue_*() setting functions in blk_init_queue_node() cciss: add BUILD_BUG_ON() for catching bad CommandList_struct alignment block: don't create bio_vec slabs of less than the inline number block: cleanup bio_alloc_bioset() commit 413e3376485e6cf81f4cf6a4dbc0de0326535093 Merge: 13220a9... 86ee79c... Author: Linus Torvalds Date: Thu Mar 26 15:56:53 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Flush TLB before releasing pages. commit 13220a94d35708d5378114e96ffcc88d0a74fe99 Merge: 8690d8a... 08abe18... Author: Linus Torvalds Date: Thu Mar 26 15:54:36 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1750 commits) ixgbe: Allow Priority Flow Control settings to survive a device reset net: core: remove unneeded include in net/core/utils.c. e1000e: update version number e1000e: fix close interrupt race e1000e: fix loss of multicast packets e1000e: commonize tx cleanup routine to match e1000 & igb netfilter: fix nf_logger name in ebt_ulog. netfilter: fix warning in ebt_ulog init function. netfilter: fix warning about invalid const usage e1000: fix close race with interrupt e1000: cleanup clean_tx_irq routine so that it completely cleans ring e1000: fix tx hang detect logic and address dma mapping issues bridge: bad error handling when adding invalid ether address bonding: select current active slave when enslaving device for mode tlb and alb gianfar: reallocate skb when headroom is not enough for fcb Bump release date to 25Mar2009 and version to 0.22 r6040: Fix second PHY address qeth: fix wait_event_timeout handling qeth: check for completion of a running recovery qeth: unregister MAC addresses during recovery. ... Manually fixed up conflicts in: drivers/infiniband/hw/cxgb3/cxio_hal.h drivers/infiniband/hw/nes/nes_nic.c commit 8690d8a9f6c2d5728a9c9f68231f1bb4de109e3a Merge: d3f12d3... 3b9d49e... Author: Linus Torvalds Date: Thu Mar 26 15:48:11 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] i6300esb.c: start locking [WATCHDOG] i6300esb.c: convert to platform device driver [WATCHDOG] wdt.c: remove #ifdef CONFIG_WDT_501 [WATCHDOG] Fix io.h & uaccess.h includes. [WATCHDOG] More coding-style and trivial clean-up [WATCHDOG] struct file_operations should be const [WATCHDOG] cpwd.c: Coding style - Clean-up [WATCHDOG] hpwdt.c: Add new HP BMC controller. [PATCH 13/13] drivers/watchdog: use USB API functions rather than constants [WATCHDOG] orion5x_wdt: fix compile issue by providing tclk as platform data [WATCHDOG] rc32434_wdt: make sure watchdog is not running at startup [WATCHDOG] rc32434_wdt: add spin_locking [WATCHDOG] rc32434_wdt: add shutdown method [WATCHDOG] rc32434_wdt: add timeout module parameter [WATCHDOG] rc32434_wdt: clean-up driver [WATCHDOG] davinci: convert to ioremap() + io[read|write] [WATCHDOG] w83697ug: add error checking [WATCHDOG] cpwd.c & riowd.c - unlocked_ioctl commit d3f12d36f148f101c568bdbce795e41cd9ceadf3 Merge: 39b566e... 16175a7... Author: Linus Torvalds Date: Thu Mar 26 15:47:52 2009 -0700 Merge branch 'kvm-updates/2.6.30' of git://git.kernel.org/pub/scm/virt/kvm/kvm * 'kvm-updates/2.6.30' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (113 commits) KVM: VMX: Don't allow uninhibited access to EFER on i386 KVM: Correct deassign device ioctl to IOW KVM: ppc: e500: Fix the bug that KVM is unstable in SMP KVM: ppc: e500: Fix the bug that mas0 update to wrong value when read TLB entry KVM: Fix missing smp tlb flush in invlpg KVM: Get support IRQ routing entry counts KVM: fix sparse warnings: Should it be static? KVM: fix sparse warnings: context imbalance KVM: is_long_mode() should check for EFER.LMA KVM: VMX: Update necessary state when guest enters long mode KVM: ia64: Fix the build errors due to lack of macros related to MSI. ia64: Move the macro definitions related to MSI to one header file. KVM: fix kvm_vm_ioctl_deassign_device KVM: define KVM_CAP_DEVICE_DEASSIGNMENT KVM: ppc: Add emulation of E500 register mmucsr0 KVM: Report IRQ injection status for MSI delivered interrupts KVM: MMU: Fix another largepage memory leak KVM: SVM: set accessed bit for VMCB segment selectors KVM: Report IRQ injection status to userspace. KVM: MMU: remove assertion in kvm_mmu_alloc_page ... commit 39b566eedbe9e35d38502cc5e62ef7abf1aff9c9 Merge: 39f1500... 09f98ba... Author: Linus Torvalds Date: Thu Mar 26 15:47:08 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (30 commits) RDMA/cxgb3: Enforce required firmware IB/mlx4: Unregister IB device prior to CLOSE PORT command mlx4_core: Add link type autosensing mlx4_core: Don't perform SET_PORT command for Ethernet ports RDMA/nes: Handle MPA Reject message properly RDMA/nes: Improve use of PBLs RDMA/nes: Remove LLTX RDMA/nes: Inform hardware that asynchronous event has been handled RDMA/nes: Fix tmp_addr compilation warning RDMA/nes: Report correct vendor_id and vendor_part_id RDMA/nes: Update copyright to new legal entity and year RDMA/nes: Account for freed PBL after HW operation IB: Remove useless ibdev_is_alive() tests from sysfs code IB/sa_query: Fix AH leak due to update_sm_ah() race IB/mad: Fix ib_post_send_mad() returning 0 with no generate send comp IB/mad: initialize mad_agent_priv before putting on lists IB/mad: Fix null pointer dereference in local_completions() IB/mad: Fix RMPP header RRespTime manipulation IB/iser: Remove hard setting of path MTU mlx4_core: Add device IDs for MT25458 10GigE devices ... commit 39f15003c7b268e4199d5ddce60a6944a74a14b7 Merge: 7676b8f... b363b33... Author: Linus Torvalds Date: Thu Mar 26 15:46:37 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] Fix memory overwrite when saving nativeFileSystem field during mount [CIFS] Rename compose_mount_options to cifs_compose_mount_options. [CIFS] work around bug in Samba server handling for posix open [CIFS] Use posix open on file open when server supports it cifs: fix buffer format byte on NT Rename/hardlink [CIFS] Add definitions for remoteably fsctl calls [CIFS] add extra null attr check [CIFS] fix build error [CIFS] reopen file via newer posix open protocol operation if available [CIFS] Add new nostrictsync cifs mount option to avoid slow SMB flush [CIFS] DFS no longer experimental [CIFS] Send SMB flush in cifs_fsync commit 7676b8fd701beb47cc1b4cc291acaa07287ea69a Author: Alan Cox Date: Thu Mar 26 20:47:00 2009 +0000 dontdiff: Fix asm exclude Now that the headers are in arch/foo/include/asm we don't want to exclude them when preparing diff files. Closes-bug: 12921 Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 9e80d407736161d9b8b0c5a0d44f786e44c322ea Author: Jan Kara Date: Thu Mar 26 13:08:04 2009 +0100 ext3: Avoid starting a transaction in writepage when not necessary We don't have to start a transaction in writepage() when all the blocks are a properly allocated. Even in ordered mode either the data has been written via write() and they are thus already added to transaction's list or the data was written via mmap and then it's random in which transaction they get written anyway. This should help VM to pageout dirty memory without blocking on transaction commits. Signed-off-by: Jan Kara Signed-off-by: Linus Torvalds commit 08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6 Merge: f0de70f... 0384e29... Author: David S. Miller Date: Thu Mar 26 15:23:24 2009 -0700 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ Conflicts: drivers/net/wimax/i2400m/usb-notif.c commit 4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213 Author: Geert Uytterhoeven Date: Thu Mar 26 09:48:45 2009 +0100 m68k: irq_node.handler() should return irqreturn_t commit b5dc7840b3ebe9c7967dd8ba73db957767009ff9 ("m68k: introduce irq controller") reverted the return type of struct irq_node.handler() from irqreturn_t to int. Change it back to irqreturn_t, else it will give a compiler warning when irqreturn_t is turned into an enum in the near future: | arch/m68k/kernel/ints.c:231: warning: assignment from incompatible pointer type Signed-off-by: Geert Uytterhoeven commit 95fde7a83989d595c06105629f42f3691bf62f91 Author: Michael Schmitz Date: Sun Jan 18 03:22:15 2009 +0100 m68k: section mismatch fixes: Atari SCSI add __init annotations to probe routines Signed-off-by: Michael Schmitz Signed-off-by: Geert Uytterhoeven commit d497e3ab91a726ecd76028698e5ce298f75ab681 Author: Michael Schmitz Date: Sun Jan 18 03:17:33 2009 +0100 m68k: section mismatch fixes: DMAsound for Atari add __initdata to driver presets struct Signed-off-By: Michael Schmitz Signed-off-by: Geert Uytterhoeven commit 0e750aa47ab26236c15c1dc7a66ecf39148e67bc Author: Geert Uytterhoeven Date: Mon Nov 24 21:37:09 2008 +0100 MAINTAINERS: Replace dead link to m68k CVS repository by link to new git repository CVS is dead, long live git! Signed-off-by: Geert Uytterhoeven commit 8852ecd97488249ca7fe2c0d3eb44cae95886881 Author: Laurent Vivier Date: Sat Nov 15 16:10:10 2008 +0100 m68k: mac - Add SWIM floppy support It allows to read data from a floppy, but not to write to, and to eject the floppy (useful on our Mac without eject button). Signed-off-by: Laurent Vivier Signed-off-by: Geert Uytterhoeven commit 7ad93b42bd135641ddc2c298f030132aca7aeca3 Author: Laurent Vivier Date: Thu Nov 6 20:57:41 2008 +0100 m68k: mac - Add a new entry in mac_model to identify the floppy controller type. This patch adds a field "floppy_type" which can take the following values: MAC_FLOPPY_IWM for an IWM based mac MAC_FLOPPY_SWIM_ADDR1 for a SWIM based mac with controller at VIA1 + 0x1E000 MAC_FLOPPY_SWIM_ADDR2 for a SWIM based mac with controller at VIA1 + 0x16000 MAC_FLOPPY_IOP for an IOP based mac MAC_FLOPPY_AV for an AV based mac Signed-off-by: Laurent Vivier Signed-off-by: Geert Uytterhoeven commit 612bfc9e630e3f7a4f3be1325eac28de8b8970af Author: Laurent Vivier Date: Thu Oct 30 21:17:47 2008 +0100 m68k: Add install target This patch enables the use of "make install" on m68k architecture to copy kernel to /boot. Signed-off-by: Laurent Vivier Signed-off-by: Geert Uytterhoeven commit 0384e2959127a56d0640505d004d8dd92f9c29f5 Merge: 61a0918... c96f173... Author: Linus Torvalds Date: Thu Mar 26 11:20:23 2009 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (35 commits) [libata] Improve timeout handling [libata] Drain data on errors pata_sc1200: Activate secondary channel pata_artop: Serializing support [libata] ahci: correct enclosure LED state save [libata] More robust parsing for IDENTIFY DEVICE multi_count field sata_mv: fix LED blinking for SoC+NCQ sata_mv: optimize IRQ coalescing for 8-port chips sata_mv: implement IRQ coalescing (v2) sata_mv: cosmetic preparations for IRQ coalescing pata-rb532-cf: platform_get_irq() fix ignored failure pata_efar: fix *dma_mask pata_radisys: fix mwdma_mask to exclude mwdma0 [libata] convert drivers to use ata.h mode mask defines include/linux/ata.h: add some more transfer masks ahci: Blacklist HP Compaq 6720s that spins off disks during ACPI power off [libata] sata_mv: Implement direct FIS transmission via mv_qc_issue_fis(). [libata] Export ata_pio_queue_task() so that it can be used from sata_mv. [libata] sata_mv: Add a new mv_sff_check_status() function to sata_mv. [libata] sata_mv: Tighten up interrupt masking in mv_qc_issue() ... commit 61a091827e273650b39eb87c799a6d260913fa0b Merge: 0c93ea4... fd8345f... Author: Linus Torvalds Date: Thu Mar 26 11:17:39 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (97 commits) USB: qcserial: add device id for HP devices USB: isp1760: Add a delay before reading the SKIPMAP registers in isp1760-hcd.c USB: allow malformed LANGID descriptors USB: pxa27x_udc: typo fixes and code cleanups USB: gadget: gadget zero uses new suspend/resume hooks USB: gadget: composite device-level suspend/resume hooks USB: r8a66597-hcd: suspend/resume support USB: more u32 conversion after transfer_buffer_length and actual_length USB: Fix cp2101 USB serial device driver termios functions for console use USB: CP2101 New Device ID USB: ipaq: handle 4 endpoint devices USB: S3C: Move usb-control.h to platform include USB: ohci-hcd: Add ARCH_S3C24XX to the ohci-s3c2410.c glue USB: pedantic: spelling correction in comment for ch9.h USB: host: fix sparse warning: Using plain integer as NULL pointer USB: ohci-s3c2410: fix name of bus clock USB: ohci-s3c2410: remove include USB: serial: rename cp2101 driver to cp210x USB: CP2101 Reduce Error Logging USB: CP2101 Support AN205 baud rates ... commit 0c93ea4064a209cdc36de8a9a3003d43d08f46f7 Merge: bc2fd38... e6e66b0... Author: Linus Torvalds Date: Thu Mar 26 11:17:04 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (61 commits) Dynamic debug: fix pr_fmt() build error Dynamic debug: allow simple quoting of words dynamic debug: update docs dynamic debug: combine dprintk and dynamic printk sysfs: fix some bin_vm_ops errors kobject: don't block for each kobject_uevent sysfs: only allow one scheduled removal callback per kobj Driver core: Fix device_move() vs. dpm list ordering, v2 Driver core: some cleanup on drivers/base/sys.c Driver core: implement uevent suppress in kobject vcs: hook sysfs devices into object lifetime instead of "binding" driver core: fix passing platform_data driver core: move platform_data into platform_device sysfs: don't block indefinitely for unmapped files. driver core: move knode_bus into private structure driver core: move knode_driver into private structure driver core: move klist_children into private structure driver core: create a private portion of struct device driver core: remove polling for driver_probe_done(v5) sysfs: reference sysfs_dirent from sysfs inodes ... Fixed conflicts in drivers/sh/maple/maple.c manually commit bc2fd381d8f9dbeb181f82286cdca1567e3d0def Merge: 928a726... 2ebe1d9... Author: Linus Torvalds Date: Thu Mar 26 11:13:06 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (53 commits) ide: use try_to_identify() in ide_driveid_update() ide: clear drive IRQ after re-enabling local IRQs in ide_driveid_update() ide: sanitize SELECT_MASK() usage in ide_driveid_update() ide: classify device type in do_probe() ide: remove broken EXABYTENEST support ide: shorten timeout value in ide_driveid_update() ide: propagate AltStatus workarounds to ide_driveid_update() ide: fix kmalloc() failure handling in ide_driveid_update() mn10300: remove frv: remove ide: remove pciirq argument from ide_pci_setup_ports() ide: fix ->init_chipset method to return 'int' value ide: remove try_to_identify() wrapper ide: remove no longer needed IRQ auto-probing from try_to_identify() (v2) ide: remove no longer needed IRQ fallback code from hwif_init() amd74xx: remove no longer needed ->init_hwif method ide: remove no longer needed IDE_HFLAG[_FORCE]_LEGACY_IRQS ide: use ide_pci_is_in_compatibility_mode() in ide_pci_init_{one,two}() ide: use pci_get_legacy_ide_irq() in ide_pci_init_{one,two}() ide: handle IDE_HFLAG[_FORCE]_LEGACY_IRQS in ide_pci_init_{one,two}() ... commit 928a726b0e12184729900c076e13dbf1c511c96c Merge: 8ff64b5... eaeed5d... Author: Linus Torvalds Date: Thu Mar 26 11:11:23 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (96 commits) sh: add support for SMSC Polaris platform sh: fix the HD64461 level-triggered interrupts handling sh: sh-rtc wakeup support sh: sh-rtc invalid time rework sh: sh-rtc carry interrupt rework sh: disallow kexec virtual entry sh: kexec jump: fix for ftrace. sh: kexec: Drop SR.BL bit toggling. sh: add kexec jump support sh: rework kexec segment code sh: simplify kexec vbr code sh: Flush only the needed range when unmapping a VMA. sh: Update debugfs ASID dumping for 16-bit ASID support. sh: tlb-pteaex: Kill off legacy PTEA updates. sh: Support for extended ASIDs on PTEAEX-capable SH-X3 cores. sh: sh7763rdp: Change IRQ number for sh_eth of sh7763rdp sh: espt-giga board support sh: dma: Make G2 DMA configurable. sh: dma: Make PVR2 DMA configurable. sh: Move IRQ multi definition of DMAC to defconfig ... commit 8ff64b539bfd998792614481ccb67139b97075ef Merge: 61a9dc2... df3647b... Author: Linus Torvalds Date: Thu Mar 26 11:08:47 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: GFS2: Fix freeze issue Fix a minor bug in the previous patch GFS2: Clean up of glops.c GFS2: Fix locking bug in failed shared to exclusive conversion GFS2: Pagecache usage optimization on GFS2 GFS2: fix sparse warning: Should it be static? GFS2: fix sparse warnings: constant is so big it is ... GFS2: Support quota/noquota mount arguments GFS2: Fix alignment issue and tidy gfs2_bitfit GFS2: Add a "demote a glock" interface to sysfs GFS2: Expose UUID via sysfs/uevent GFS2: Support generation of discard requests GFS2: Fix deadlock on journal flush GFS2: Fix error path ref counting for root inode GFS2: Remove unused field from glock GFS2: Merge lock_dlm module into GFS2 GFS2: Remove "double" locking in quota GFS2: change gfs2_quota_scan into a shrinker GFS2: Bring back lvb-related stuff to lock_nolock to support quotas GFS2: Fix remount argument parsing commit 61a9dc26d3d4ef61b0ead9930561c9ce0efa1919 Merge: 5020125... 5201b0a... Author: Linus Torvalds Date: Thu Mar 26 11:05:58 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: avr32: remove duplicated #include avr32: fix out-of-range rjmp instruction on large kernels avr32: Fix out-of-range rcalls in large kernels commit 502012534dd23e4a88aba7e5827b2ca1e1eaa4ca Merge: 562f477... c441c29... Author: Linus Torvalds Date: Thu Mar 26 11:05:17 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (430 commits) ALSA: hda - Add quirk for Acer Ferrari 5000 ALSA: hda - Use cached calls to get widget caps and pin caps ALSA: hda - Don't create empty/single-item input source ALSA: hda - Fix the wrong pin-cap check in patch_realtek.c ALSA: hda - Cache pin-cap values ALSA: hda - Avoid output amp manipulation to digital mic pins ALSA: hda - Add function id to proc output ALSA: pcm - Safer boundary checks ALSA: hda - Detect digital-mic inputs on ALC663 / ALC272 ALSA: sound/ali5451: typo: s/resouces/resources/ ALSA: hda - Don't show the current connection for power widgets ALSA: Fix wrong pointer to dev_err() in arm/pxa2xx-ac97-lib.c ASoC: Declare Headset as Mic and Headphone widgets for SDP3430 ASoC: OMAP: N810: Add more jack functions ASoC: OMAP: N810: Mark not connected input pins ASoC: Add FLL support for WM8400 ALSA: hda - Don't reset stream at each prepare callback ALSA: hda - Don't reset BDL unnecessarily ALSA: pcm - Fix delta calculation at boundary overlap ALSA: pcm - Reset invalid position even without debug option ... commit 562f477a54478002ddfbb5b85627c009ca41e71d Merge: ada19a3... 949abe5... Author: Linus Torvalds Date: Thu Mar 26 11:04:34 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (29 commits) crypto: sha512-s390 - Add missing block size hwrng: timeriomem - Breaks an allyesconfig build on s390: nlattr: Fix build error with NET off crypto: testmgr - add zlib test crypto: zlib - New zlib crypto module, using pcomp crypto: testmgr - Add support for the pcomp interface crypto: compress - Add pcomp interface netlink: Move netlink attribute parsing support to lib crypto: Fix dead links hwrng: timeriomem - New driver crypto: chainiv - Use kcrypto_wq instead of keventd_wq crypto: cryptd - Per-CPU thread implementation based on kcrypto_wq crypto: api - Use dedicated workqueue for crypto subsystem crypto: testmgr - Test skciphers with no IVs crypto: aead - Avoid infinite loop when nivaead fails selftest crypto: skcipher - Avoid infinite loop when cipher fails selftest crypto: api - Fix crypto_alloc_tfm/create_create_tfm return convention crypto: api - crypto_alg_mod_lookup either tested or untested crypto: amcc - Add crypt4xx driver crypto: ansi_cprng - Add maintainer ... commit ada19a31a90b4f46c040c25ef4ef8ffc203c7fc6 Merge: 8d80ce8... 36e8abf... Author: Linus Torvalds Date: Thu Mar 26 11:04:08 2009 -0700 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: (35 commits) [CPUFREQ] Prevent p4-clockmod from auto-binding to the ondemand governor. [CPUFREQ] Make cpufreq-nforce2 less obnoxious [CPUFREQ] p4-clockmod reports wrong frequency. [CPUFREQ] powernow-k8: Use a common exit path. [CPUFREQ] Change link order of x86 cpufreq modules [CPUFREQ] conservative: remove 10x from def_sampling_rate [CPUFREQ] conservative: fixup governor to function more like ondemand logic [CPUFREQ] conservative: fix dbs_cpufreq_notifier so freq is not locked [CPUFREQ] conservative: amend author's email address [CPUFREQ] Use swap() in longhaul.c [CPUFREQ] checkpatch cleanups for acpi-cpufreq [CPUFREQ] powernow-k8: Only print error message once, not per core. [CPUFREQ] ondemand/conservative: sanitize sampling_rate restrictions [CPUFREQ] ondemand/conservative: deprecate sampling_rate{min,max} [CPUFREQ] powernow-k8: Always compile powernow-k8 driver with ACPI support [CPUFREQ] Introduce /sys/devices/system/cpu/cpu*/cpufreq/cpuinfo_transition_latency [CPUFREQ] checkpatch cleanups for powernow-k8 [CPUFREQ] checkpatch cleanups for ondemand governor. [CPUFREQ] checkpatch cleanups for powernow-k7 [CPUFREQ] checkpatch cleanups for speedstep related drivers. ... commit 8d80ce80e1d58ba9cd3e3972b112cccd6b4008f4 Merge: 1646df4... 703a3cd... Author: Linus Torvalds Date: Thu Mar 26 11:03:39 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (71 commits) SELinux: inode_doinit_with_dentry drop no dentry printk SELinux: new permission between tty audit and audit socket SELinux: open perm for sock files smack: fixes for unlabeled host support keys: make procfiles per-user-namespace keys: skip keys from another user namespace keys: consider user namespace in key_permission keys: distinguish per-uid keys in different namespaces integrity: ima iint radix_tree_lookup locking fix TOMOYO: Do not call tomoyo_realpath_init unless registered. integrity: ima scatterlist bug fix smack: fix lots of kernel-doc notation TOMOYO: Don't create securityfs entries unless registered. TOMOYO: Fix exception policy read failure. SELinux: convert the avc cache hash list to an hlist SELinux: code readability with avc_cache SELinux: remove unused av.decided field SELinux: more careful use of avd in avc_has_perm_noaudit SELinux: remove the unused ae.used SELinux: check seqno when updating an avc_node ... commit 1646df40bb111715a90ce0b86448dabbcc5b3f3d Merge: 1b5e62b... 9fb4c2b... Author: Linus Torvalds Date: Thu Mar 26 11:02:50 2009 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: MIPS: R2: Fix problem with code that incorrectly modifies ebase. MIPS: Change {set,clear,change}_c0_ to return old value. MIPS: compat: Remove duplicated #include MIPS: VR5500: Enable prefetch MIPS: Fix oops in dma_unmap_page on not coherent mips platforms commit 1b5e62b42b55c509eea04c3c0f25e42c8b35b564 Author: Wu Fengguang Date: Mon Mar 23 08:57:38 2009 +0800 writeback: double the dirty thresholds Enlarge default dirty ratios from 5/10 to 10/20. This fixes [Bug #12809] iozone regression with 2.6.29-rc6. The iozone benchmarks are performed on a 1200M file, with 8GB ram. iozone -i 0 -i 1 -i 2 -i 3 -i 4 -r 4k -s 64k -s 512m -s 1200m -b tmp.xls iozone -B -r 4k -s 64k -s 512m -s 1200m -b tmp.xls The performance regression is triggered by commit 1cf6e7d83bf3(mm: task dirty accounting fix), which makes more correct/thorough dirty accounting. The default 5/10 dirty ratios were picked (a) with the old dirty logic and (b) largely at random and (c) designed to be aggressive. In particular, that (a) means that having fixed some of the dirty accounting, maybe the real bug is now that it was always too aggressive, just hidden by an accounting issue. The enlarged 10/20 dirty ratios are just about enough to fix the regression. [ We will have to look at how this affects the old fsync() latency issue, but that probably will need independent work. - Linus ] Cc: Nick Piggin Cc: Peter Zijlstra Reported-by: "Lin, Ming M" Tested-by: "Lin, Ming M" Signed-off-by: Wu Fengguang Signed-off-by: Linus Torvalds commit 0a1c01c9477602ee8b44548a9405b2c1d587b5a2 Author: Matthew Garrett Date: Thu Mar 26 17:53:14 2009 +0000 Make relatime default Change the default behaviour of the kernel to use relatime for all filesystems. This can be overridden with the "strictatime" mount option. Signed-off-by: Matthew Garrett Signed-off-by: Linus Torvalds commit d0adde574b8487ef30f69e2d08bba769e4be513f Author: Matthew Garrett Date: Thu Mar 26 17:49:56 2009 +0000 Add a strictatime mount option Add support for explicitly requesting full atime updates. This makes it possible for kernels to default to relatime but still allow userspace to override it. Signed-off-by: Matthew Garrett Signed-off-by: Linus Torvalds commit 11ff6f05f1e836a6a02369a4c4b64757e484adc1 Author: Matthew Garrett Date: Thu Mar 26 17:32:14 2009 +0000 Allow relatime to update atime once a day Allow atime to be updated once per day even with relatime. This lets utilities like tmpreaper (which delete files based on last access time) continue working, making relatime a plausible default for distributions. Signed-off-by: Matthew Garrett Reviewed-by: Matthew Wilcox Acked-by: Valerie Aurora Henson Acked-by: Alan Cox Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 17d140402e6f0fd5dde2fdf8d045e3f95f865663 Author: Cyrill Gorcunov Date: Wed Jan 14 23:37:50 2009 +0300 x86: headers cleanup - setup.h Impact: cleanup 'make headers_check' warn us about leaking of kernel private (mostly compile time vars) data to userspace in headers. Fix it. Guard this one by __KERNEL__. Signed-off-by: Cyrill Gorcunov Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar commit 5a54bd1307471c1cd0521402fe65e2057edcab2f Merge: f9f3567... 8e0ee43... Author: Ingo Molnar Date: Thu Mar 26 18:29:40 2009 +0100 Merge commit 'v2.6.29' into core/header-fixes commit f9f35677d81adb0feedcd6e0e661784805c8facd Author: Arnd Bergmann Date: Thu Feb 26 09:57:27 2009 +0100 emu101k1.h: fix duplicate include of Impact: cleanup The earlier patch 'make most exported headers use strict integer types' accidentally includes both from the common and from the kernel-only parts. Signed-off-by: Arnd Bergmann Acked-by: Takashi Iwai Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar commit 8cd2c29dd5f04d91dac6ea7f8b9df4ff1b4380ee Author: H. Peter Anvin Date: Wed Feb 25 15:22:19 2009 -0800 compiler-gcc4: conditionalize #error on __KERNEL__ Impact: Fix for exported headers We only want to error out on specific gcc versions if we are actually building the kernel, so conditionalize the #if...#error on __KERNEL__. Based on a patchset by Arnd Bergmann . Cc: Arnd Bergmann Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar commit 3a471cbc081b6bf2b58a48db13d734ecd3b0d437 Author: Arnd Bergmann Date: Thu Feb 26 00:51:45 2009 +0100 remove __KERNEL_STRICT_NAMES With the last used of non-strict names gone from the exported header files, we can remove the old libc5 compatibility cruft from our headers and only export strict types. Signed-off-by: Arnd Bergmann Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar commit 60c195c729532815c5209c81442fa0eb26ace706 Author: Arnd Bergmann Date: Thu Feb 26 00:51:43 2009 +0100 make netfilter use strict integer types Netfilter traditionally uses BSD integer types in its interface headers. This changes it to use the Linux strict integer types, like everyone else. Cc: netfilter-devel@vger.kernel.org Signed-off-by: Arnd Bergmann Acked-by: David S. Miller Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar commit 1d7f83d5ad6c30b385ba549c1c3a287cc872b7ae Author: Arnd Bergmann Date: Thu Feb 26 00:51:42 2009 +0100 make drm headers use strict integer types The drm headers are traditionally shared with BSD and could not use the strict linux integer types. This is over now, so we can use our own types now. Cc: David Airlie Signed-off-by: Arnd Bergmann Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar commit ccef7ab534347e2e1e1ef398d2ec987d37e519f3 Author: Arnd Bergmann Date: Thu Feb 26 00:51:41 2009 +0100 make MTD headers use strict integer types The MTD headers traditionally use stdint types rather than the kernel integer types. This converts them to do the same as all the others. Cc: David Woodhouse Signed-off-by: Arnd Bergmann Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar commit 9adfbfb611307060db54691bc7e6d53fdc12312b Author: Arnd Bergmann Date: Thu Feb 26 00:51:40 2009 +0100 make most exported headers use strict integer types This takes care of all files that have only a small number of non-strict integer type uses. Signed-off-by: Arnd Bergmann Cc: Mauro Carvalho Chehab Cc: David Airlie Cc: Arnaldo Carvalho de Melo Cc: YOSHIFUJI Hideaki Cc: netdev@vger.kernel.org Cc: linux-ppp@vger.kernel.org Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: David Woodhouse Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar commit 85efde6f4e0de9577256c5f0030088d3fd4347c1 Author: Arnd Bergmann Date: Thu Feb 26 00:51:39 2009 +0100 make exported headers use strict posix types A number of standard posix types are used in exported headers, which is not allowed if __STRICT_KERNEL_NAMES is defined. In order to get rid of the non-__STRICT_KERNEL_NAMES part and to make sane headers the default, we have to change them all to safe types. There are also still some leftovers in reiserfs_fs.h, elfcore.h and coda.h, but these files have not compiled in user space for a long time. This leaves out the various integer types ({u_,u,}int{8,16,32,64}_t), which we take care of separately. Signed-off-by: Arnd Bergmann Acked-by: Mauro Carvalho Chehab Cc: David Airlie Cc: Arnaldo Carvalho de Melo Cc: YOSHIFUJI Hideaki Cc: netdev@vger.kernel.org Cc: linux-ppp@vger.kernel.org Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: David Woodhouse Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar commit 9d50638bae05ab7f62d700c9e4a83a1845cf9ef4 Author: Jaswinder Singh Rajput Date: Sun Feb 8 11:00:25 2009 +0530 unconditionally include asm/types.h from linux/types.h Reported-by: Sam Ravnborg Signed-off-by: Jaswinder Singh Rajput Signed-off-by: Ingo Molnar commit fc2869f6a1993550c2765e934b117e993782db30 Author: Thomas Gleixner Date: Fri Mar 13 16:37:48 2009 +0100 x86: disable __do_IRQ support Impact: disable unused code x86 is fully converted to flow handlers. No need to keep the deprecated __do_IRQ() support active. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit 7c526e1fef8d604a9ec022d9145bba5dbfe40a11 Merge: e868460... 7401922... a2a5ac8... 37bebc7... Author: Ingo Molnar Date: Thu Mar 26 15:45:52 2009 +0100 Merge branches 'timers/new-apis', 'timers/ntp' and 'timers/urgent' into timers/core commit e8684605adf87d8e65f64ce7b0274d60a05085bd Merge: a5ebc0b... c23e253... Author: Ingo Molnar Date: Thu Mar 26 15:45:45 2009 +0100 Merge branch 'timers/hpet' into timers/core commit a5ebc0b1a7843508b375f7ab8a36a628e5c9f372 Merge: 5ba1ae9... 8e0ee43... Author: Ingo Molnar Date: Thu Mar 26 15:45:22 2009 +0100 Merge commit 'v2.6.29' into timers/core commit 66fef08f7d5267b2312c4b48a6d2957d2d414105 Merge: b6d9842... b7bb4c9... Author: Ingo Molnar Date: Thu Mar 26 15:25:24 2009 +0100 Merge branch 'sched/balancing' into sched/core commit ef3500b2b2955af4fa6b0564b51c0c604e38c571 Author: Huang Weiyi Date: Thu Mar 26 15:25:02 2009 +0100 [S390] remove duplicated #includes Remove duplicated #include's in arch/s390/kernel/ipl.c. Signed-off-by: Huang Weiyi Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 005f8eee6f3c8173e492d7bd4d51bda990eb468b Author: Rusty Russell Date: Thu Mar 26 15:25:01 2009 +0100 [S390] cpumask: use mm_cpumask() wrapper Makes code futureproof against the impending change to mm->cpu_vm_mask. It's also a chance to use the new cpumask_ ops which take a pointer (the older ones are deprecated, but there's no hurry for arch code). Signed-off-by: Rusty Russell Signed-off-by: Martin Schwidefsky commit def6cfb70bab83c0094bc0cedd27c4eda563043e Author: Rusty Russell Date: Thu Mar 26 15:25:00 2009 +0100 [S390] cpumask: Use accessors code. Impact: use new API Use the accessors rather than frobbing bits directly. Most of this is in arch code I haven't even compiled, but is straightforward. Signed-off-by: Rusty Russell Signed-off-by: Mike Travis Signed-off-by: Martin Schwidefsky commit 93632d1bf7447d445c6fc274c8931152f9412b56 Author: Rusty Russell Date: Thu Mar 26 15:24:59 2009 +0100 [S390] cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits. Impact: cleanup, futureproof In fact, all cpumask ops will only be valid (in general) for bit numbers < nr_cpu_ids. So use that instead of NR_CPUS in various places (I also updated the immediate sites to use the new cpumask_ operators). This is always safe: no cpu number can be >= nr_cpu_ids, and nr_cpu_ids is initialized to NR_CPUS at boot. Signed-off-by: Rusty Russell Signed-off-by: Mike Travis Acked-by: Ingo Molnar Signed-off-by: Martin Schwidefsky commit 6f7a321d5feb0bc9aa7f7b14eceb1e6a63bff937 Author: Rusty Russell Date: Thu Mar 26 15:24:58 2009 +0100 [S390] cpumask: remove cpu_coregroup_map Impact: cleanup cpu_coregroup_mask is the New Hotness. As S/390 uses theirs internally, so we just make it static. Signed-off-by: Rusty Russell Signed-off-by: Martin Schwidefsky commit c70d0fef1da286d7f96e774674aea2d20cf6222f Author: Heiko Carstens Date: Thu Mar 26 15:24:57 2009 +0100 [S390] fix clock comparator save area usage The lowcore clock comparator save area on 64 bit machines is defined to contain only the seven most significant bits of the register. That's also why it starts at an uneven address (0x1331). The current code however writes eight bytes to the address and therefore overwrites the first byte of the access register save area. Fix this and write only seven bytes to the save area. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 488253ce49714f4e9d42413c1d60b7724059a338 Author: Andreas Krebbel Date: Thu Mar 26 15:24:56 2009 +0100 [S390] Add hwcap flag for the etf3 enhancement facility The Extended Translation Facility 3 (ETF3) added instructions which allow conversions between different unicode character maps (UTF-8, UTF-32 ...). These instructions got enhanced with a later version of the ETF3 allowing malformed multibyte chars to be recognized and reported correctly. The attached patch reserves bit 8 in the elf hwcaps vector for the enhanced version of ETF3. The bit corresponds to the stfle bits 22 and 30 and will only be set if both of the stfle bits are set. Signed-off-by: Andreas Krebbel Signed-off-by: Martin Schwidefsky commit 7e9b580e5f0644cd8952b6671fd5380fd430bca3 Author: Michael Holzheu Date: Thu Mar 26 15:24:55 2009 +0100 [S390] Ensure that ipl panic notifier is called late. The s390 ipl panic notifier will stop the system or trigger a system dump. This should be done as final action on the panic path. All other panic notifiers should be executed before. Currently we use priority 0 for the ipl notifier. In order to be called late, this patch changes the priority to INT_MIN which is the lowest possible priority. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 2ac3307f275c2a91af0417e16d2cfb95ae478661 Author: Christian Ehrhardt Date: Thu Mar 26 15:24:54 2009 +0100 [S390] fix dfp elf hwcap/facility bit detection The old dfp detection wanted to check bit 43 (dfp high performance), but due to a wrong calculation always used to check bit 42. Additionally the "userspace expectation" is, that the dfp capability bit is set is if facility bit 42 (decimal floating point facility available) and bit 44 (perform floating point operation facility avail). The patch fixes the bit calculation and extends the check to work like: elf hw cap dfp bit = facility bits 42 (dfp) & 44 (pfpo) available Signed-off-by: Christian Ehrhardt Signed-off-by: Martin Schwidefsky commit d0d3cdf4c27fa4ce241616da08138954e02890f7 Author: Heiko Carstens Date: Thu Mar 26 15:24:53 2009 +0100 [S390] smp: perform initial cpu reset before starting a cpu Performing an initial cpu reset makes sure all registers and tlbs of the targeted cpu are initialized and flushed. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 6d54c5a3fb13d32d66a8383cb0b5fb422a563051 Author: Heiko Carstens Date: Thu Mar 26 15:24:52 2009 +0100 [S390] smp: fix memory leak on __cpu_up If sigp_set_prefix fails on __cpu_up we leak the lowcore structures and async+panic stacks for the failed cpu. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 008d2d112cb8a743a87dfe41a67e11c0a4c73aa4 Author: Michael Holzheu Date: Thu Mar 26 15:24:51 2009 +0100 [S390] ipl: Improve checking logic and remove switch defaults. A code analysis tool reported two warnings: "The expression `ipl_info.type == IPL_TYPE_FCP' is true whenever evaluated." and "Default is not possible". This patch improves the corresponding if statement logic and removes the unnecessary switch defaults. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 58ace9f2a8f1caa0303aa64079d3929be28a937a Author: Michael Holzheu Date: Thu Mar 26 15:24:50 2009 +0100 [S390] s390dbf: Remove needless check for NULL pointer. The check for NULL pointer has already be done before. Therefore we can remove the second check. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit a0fa8e3743c80643a06a770b95e73e751548ab17 Author: Michael Holzheu Date: Thu Mar 26 15:24:49 2009 +0100 [S390] s390dbf: Remove redundant initilizations. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 3e75a902196c45d26d5e28014eb2d9821aa9794f Author: Johannes Weiner Date: Thu Mar 26 15:24:48 2009 +0100 [S390] use kzfree() Use kzfree() instead of memset() + kfree(). Signed-off-by: Johannes Weiner Reviewed-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 6aa0d3a922c4f58fc36cc1502c6ac72f999e26bb Author: Stoyan Gaydarov Date: Thu Mar 26 15:24:47 2009 +0100 [S390] BUG to BUG_ON changes Signed-off-by: Stoyan Gaydarov Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 59f2e69d0f95bc00353628ef33fd534fbb8e3597 Author: Michael Holzheu Date: Thu Mar 26 15:24:46 2009 +0100 [S390] zfcpdump: Prevent zcore from beeing built as a kernel module. The zcore code switches to real addressing mode when creating a kernel dump. This is not possible, if it is built as a kernel module. With this patch zcore (zfcpdump) can't be built as a kernel module any more. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 159d1ff8f6c38086ed75f8e892790d0a4f3a6b71 Author: Frank Munzert Date: Thu Mar 26 15:24:45 2009 +0100 [S390] Use csum_partial in checksum.h The cksm function in system.h is duplicate to csum_partial in checksum.h. Remove cksm and use csum_partial instead. Signed-off-by: Frank Munzert Signed-off-by: Martin Schwidefsky commit 866ba28418d30122d863c50182a202741f4dcf3e Author: Martin Schwidefsky Date: Thu Mar 26 15:24:44 2009 +0100 [S390] cleanup lowcore.h The lowcore.h header has quite a lot of whitespace damage and a rather wild collection of entries. Remove all that whitespace and tidy up the order of the lowcore fields. Signed-off-by: Martin Schwidefsky commit da292bbe1f620221b08c4b589424f370168d642b Author: Martin Schwidefsky Date: Thu Mar 26 15:24:43 2009 +0100 [S390] eliminate ipl_device from lowcore Signed-off-by: Martin Schwidefsky commit 7b4684880dfc6c45bc56039ca5eada771d7643ab Author: Martin Schwidefsky Date: Thu Mar 26 15:24:42 2009 +0100 [S390] eliminate cpuinfo_S390 structure Signed-off-by: Martin Schwidefsky commit 2938af534d47891ddbced552e5d29f7b90bec609 Author: Christian Borntraeger Date: Thu Mar 26 15:24:41 2009 +0100 [S390] Fix comments in lowcore structure This patch fixes two addresses in the comments for the lowcore structure. Looks like an copy-paste bug. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit eaf1b6fbca8d9be87bef2eafaa3f40bffe26ce04 Author: Dan Smith Date: Thu Mar 26 15:24:40 2009 +0100 [S390] Expose a constant for the number of words representing the CRs We need to use this value in the checkpoint/restart code and would like to have a constant instead of a magic '3'. Cc: linux-s390@vger.kernel.org Signed-off-by: Dan Smith Signed-off-by: Martin Schwidefsky commit 1fbc9f46a024535d95c3d5f136901decd86b109e Author: Eric Sesterhenn Date: Thu Mar 26 15:24:39 2009 +0100 [S390] list usage cleanup in s390 Trivial cleanup, list_del(); list_add{,_tail}() is equivalent to list_move{,_tail}(). Semantic patch for coccinelle can be found at www.cccmz.de/~snakebyte/list_move_tail.spatch Signed-off-by: Eric Sesterhenn Signed-off-by: Martin Schwidefsky commit ab640db01013192f6867785a7def7c9d9ec8903d Author: Carsten Otte Date: Thu Mar 26 15:24:38 2009 +0100 [S390] tape message cleanup This is a cleanup of all the messages this driver prints. It uses the dev_message macros now. Signed-off-by: Carsten Otte Signed-off-by: Martin Schwidefsky commit 1edad85b16fdda43c8ab809e2779e8bf64ab8bb2 Author: Heiko Carstens Date: Thu Mar 26 15:24:37 2009 +0100 [S390] use compiler builtin versions of strlen/strcpy/strcat Use builtin variants if gcc 4 or newer is used to compile the kernel. Generates better code than the asm variants. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 504665a91498f43d220b7d0942281067283a35f7 Author: Martin Schwidefsky Date: Thu Mar 26 15:24:36 2009 +0100 [S390] module function call optimization Avoid the detour over the PLT if the branch target of a function call in a module is in the range of the bras (16-bit) or brasl (32-bit) instruction. The PLT is still generated but it is unused. Signed-off-by: Martin Schwidefsky commit e13ed9b2704487e98d9241282765869fbd9a2dda Author: Heiko Carstens Date: Thu Mar 26 15:24:35 2009 +0100 [S390] bitops: remove likely annotations likely/unlikely profiling revealed that none of the branches in bitops is taken likely or unlikely. So remove the annotations. In addition the generated code is shorter. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit ced2c8bcbc5082bc112d7c7410b3f5380c77e306 Author: Hendrik Brueckner Date: Thu Mar 26 15:24:34 2009 +0100 [S390] remove duplicate nul-termination of string strlcpy() does already NUL-terminate the destination string. Signed-off-by: Hendrik Brueckner Signed-off-by: Martin Schwidefsky commit 6faf250789dfd35146a71402f9be245be82bf01e Author: Rusty Russell Date: Thu Mar 26 15:24:33 2009 +0100 [S390] allow usage of string functions in linux/string.h In introducing a trivial "strstarts()" function in linux/string.h, we hit the following error on s390: In file included from include/linux/bitmap.h:8, from include/linux/cpumask.h:142, from include/linux/smp.h:12, from /home/rusty/devel/kernel/patches/linux-2.6/arch/s390/include/asm/spinlock.h:14, from include/linux/spinlock.h:88, from include/linux/seqlock.h:29, from include/linux/time.h:8, from include/linux/stat.h:60, from include/linux/module.h:10, from arch/s390/lib/string.c:13: include/linux/string.h: In function 'strstarts': include/linux/string.h:124: error: implicit declaration of function 'strlen' include/linux/string.h:124: warning: incompatible implicit declaration of built-in function 'strlen' Because when including asm/string.h from arch/s390/lib/string.c we don't declare the string ops we are about to define, and linux/string.h barfs. The fix is to declare them in this IN_ARCH_STRING_C case, but in general I wonder if there's a neater fix. Reported-by: linux-next Signed-off-by: Rusty Russell Signed-off-by: Martin Schwidefsky commit 9c8a08d7a74b07ab2c47e259231d9d0f0047a3c1 Author: Jan Glauber Date: Thu Mar 26 15:24:32 2009 +0100 [S390] qdio: merge inbound and outbound handler functions The inbound and outbound handlers are nearly identical if the outbound handler uses first_to_check as end index instead of last_move. Since both values are identical at that point the handlers can be merged. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit d303b6fd858370c22d5c70c313669e3521a5f758 Author: Jan Glauber Date: Thu Mar 26 15:24:31 2009 +0100 [S390] qdio: report SIGA errors directly Errors from SIGA instructions are stored in the per queue qdio_error and reported back when the queue handler is called. That opens a race when multiple error conditions occur simultanously. Report SIGA errors immediately in the return value of do_QDIO so the upper layer can react and SIGA errors no longer interfere with other errors. Move the SIGA error handling in qeth from the outbound handler to qeth_flush_buffers. Signed-off-by: Jan Glauber commit 9e890ad880be1dd98483313b2ec0e23fbd4e3792 Author: Jan Glauber Date: Thu Mar 26 15:24:30 2009 +0100 [S390] qdio: tasklet termination in case of module unload If the qdio module is unloaded the tiqdio tasklet must be terminated by tasklet_kill. Move the tasklet_kill after the unregistration of the adapter interrupt so the tiqdio tasklet will not be scheduled anymore before calling tasklet_kill. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit e85dea0e415617b5c5627f38c71b33fbc7f94a85 Author: Jan Glauber Date: Thu Mar 26 15:24:29 2009 +0100 [S390] qdio: seperate last move index and polling index The index value that indicated that the input queue moved was also used to store the index of the first acknowledged buffer. For non-qebsm only the newest buffer is acknowledged which may be different from the last move index so two seperate values are needed to track the input queue. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 3fdf1e18cbc7c58f2d5604315ddae3596725bc6a Author: Jan Glauber Date: Thu Mar 26 15:24:28 2009 +0100 [S390] qdio: move ACK to newest buffer for devices without QEBSM The ACKnowledgement state should be set on the newest SBAL so an adapter interrupt surpression check needs to scan fewer SBALs. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 700e982f28f5e13cef8eea93ac8c6702f699d894 Author: Jan Glauber Date: Thu Mar 26 15:24:27 2009 +0100 [S390] qdio: call qdio_free also if qdio_shutdown fails qdio_cleanup is a wrapper function that should call qdio_shutdown and qdio_free. qdio_free was not called if an error occured in qdio_shutdown resulting in a missing free of allocated resources. Call qdio_free regardless of the return value of qdio_shutdown. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit c38f96080955854e54df9cb392bc674e1ae330e1 Author: Jan Glauber Date: Thu Mar 26 15:24:26 2009 +0100 [S390] qdio: proper kill of qdio tasklets The queue tasklets were stopped with tasklet_disable. Although tasklet_disable prevents the tasklet from beeing executed it is still possible that a tasklet is scheduled on a CPU at that point. A following qdio_establish calls tasklet_init which clears the tasklet count and the tasklet state leading to the following Oops: <2>kernel BUG at kernel/softirq.c:392! <4>illegal operation: 0001 [#1] SMP <4>Modules linked in: iptable_filter ip_tables x_tables dm_round_robin dm_multipath scsi_dh sg sd_mod crc_t10dif nfs lockd nfs _acl sunrpc fuse loop dm_mod qeth_l3 ipv6 zfcp qeth scsi_transport_fc qdio scsi_tgt scsi_mod chsc_sch ccwgroup dasd_eckd_mod dasdm od ext3 mbcache jbd <4>Supported: Yes <4>CPU: 0 Not tainted 2.6.27.13-1.1.mz13-default #1 <4>Process blast.LzS_64 (pid: 16445, task: 000000006cc02538, ksp: 000000006cb67998) <4>Krnl PSW : 0704c00180000000 00000000001399f4 (tasklet_action+0xc8/0x1d4) <4> R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:3 CC:0 PM:0 EA:3 <4>Krnl GPRS: ffffffff00000030 0000000000000002 0000000000000002 fffffffffffffffe <4> 000000000013aabe 00000000003b6a18 fffffffffffffffd 0000000000000000 <4> 00000000006705a8 000000007d0914a8 000000007d0914b0 000000007fecfd30 <4> 0000000000000000 00000000003b63e8 000000007fecfd90 000000007fecfd30 <4>Krnl Code: 00000000001399e8: b9200021 cgr %r2,%r1 <4> 00000000001399ec: a7740004 brc 7,1399f4 <4> 00000000001399f0: a7f40001 brc 15,1399f2 <4> >00000000001399f4: c0100027e8ee larl %r1,636bd0 <4> 00000000001399fa: bf1f1008 icm %r1,15,8(%r1) <4> 00000000001399fe: a7840019 brc 8,139a30 <4> 0000000000139a02: c0300027e8ef larl %r3,636be0 <4> 0000000000139a08: e3c030000004 lg %r12,0(%r3) <4>Call Trace: <4>([<0000000000139c12>] tasklet_hi_action+0x112/0x1d4) <4> [<000000000013aabe>] __do_softirq+0xde/0x1c4 <4> [<000000000010fa2e>] do_softirq+0x96/0xb0 <4> [<000000000013a8d8>] irq_exit+0x70/0xcc <4> [<000000000010d1d8>] do_extint+0xf0/0x110 <4> [<0000000000113b10>] ext_no_vtime+0x16/0x1a <4> [<000003e0000a3662>] ext3_dirty_inode+0xe6/0xe8 [ext3] <4>([<00000000001f6cf2>] __mark_inode_dirty+0x52/0x1d4) <4> [<000003e0000a44f0>] ext3_ordered_write_end+0x138/0x190 [ext3] <4> [<000000000018d5ec>] generic_perform_write+0x174/0x230 <4> [<0000000000190144>] generic_file_buffered_write+0xb4/0x194 <4> [<0000000000190864>] __generic_file_aio_write_nolock+0x418/0x454 <4> [<0000000000190ee2>] generic_file_aio_write+0x76/0xe4 <4> [<000003e0000a05c2>] ext3_file_write+0x3e/0xc8 [ext3] <4> [<00000000001cc2fe>] do_sync_write+0xd6/0x120 <4> [<00000000001ccfc8>] vfs_write+0xac/0x184 <4> [<00000000001cd218>] SyS_write+0x68/0xe0 <4> [<0000000000113402>] sysc_noemu+0x10/0x16 <4> [<0000020000043188>] 0x20000043188 <4>Last Breaking-Event-Address: <4> [<00000000001399f0>] tasklet_action+0xc4/0x1d4 <6>qdio: 0.0.c61b ZFCP on SC f67 using AI:1 QEBSM:0 PCI:1 TDD:1 SIGA: W AOP <4> <0>Kernel panic - not syncing: Fatal exception in interrupt Use tasklet_kill instead of tasklet_disbale. Since tasklet_schedule must not be called after tasklet_kill use the QDIO_IRQ_STATE_STOPPED to inidicate that a queue is going down and prevent further tasklet schedules in that case. Remove superflous tasklet_schedule from input queue setup, at that time the queues are not ready so the schedule results in a NOP. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit e4c14e2085cd32f61e9ffc47d5b20d4f5f7639f3 Author: Jan Glauber Date: Thu Mar 26 15:24:25 2009 +0100 [S390] qdio: Dont call qdio_shutdown in case qdio_activate fails Remove the call to qdio_shutdown from qdio_activate since the upper-layer drivers are responsible to call qdio_shutdown when qdio_activate returns with an error. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit b454740246d14b0a9c00220696f9020eaa15ca12 Author: Jan Glauber Date: Thu Mar 26 15:24:24 2009 +0100 [S390] qdio: add missing tiq_list locking Add a mutex to protect the tiq_list. Although reading the list is done using RCU adding and removing elements from the list must still happen locked since multiple qdio devices may change the list in parallel otherwise. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit feed9b62da6e2997612143ae4b857ec7f33c810d Author: Felix Beck Date: Thu Mar 26 15:24:23 2009 +0100 [S390] Add zcrypt section in MAINTAINERS Add zcrypt section in S390 part of MAINTAINERS file. Signed-off-by: Felix Beck Signed-off-by: Ralph Wuerthner Signed-off-by: Martin Schwidefsky commit 4b2a8b6043979f1e6cc8aaa4116c95b31ae942ec Author: Gerald Schaefer Date: Thu Mar 26 15:24:22 2009 +0100 [S390] kernel: Disable switch_amode by default Disable switch_amode by default because pagetable walk on pre z9 hardware has negative performance impact. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit 8283cb43ab3e92a039d3486a0f6253df95a5fa55 Author: Martin Schwidefsky Date: Thu Mar 26 15:24:21 2009 +0100 [S390] clock sync mode flags The clock sync mode flag CLOCK_SYNC_STP is not cleared when stp is set offline. In this case the get_sync_clock() function returns -EACCESS and the dasd driver will block all i/o until stp is enabled again. In addition get_sync_clock can return -EACCESS if the clock is not in sync instead of -EAGAIN. Rework the stp/etr online handling to fix these problems. Signed-off-by: Martin Schwidefsky commit 56e25e9777bf15365293e27a3256eb9214a11edf Author: Peter Oberparleiter Date: Thu Mar 26 15:24:20 2009 +0100 [S390] cio: prevent workqueue deadlock Subchannel reprobing can block the kslowcrw workqueue indefinitely while waiting for device recognition to finish which is also scheduled to run on kslowcrw. Prevent this deadlock by moving the waiting portion of subchannel reprobing to the cio workqueue. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 0cc110651bed4612074eeb445a23418a5ee34cd0 Author: Sebastian Ott Date: Thu Mar 26 15:24:19 2009 +0100 [S390] cio: remove unused local variable Remove unused subchannel pointer in io_subchannel_recog_done. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 7a968f0565dc5d0518c784465cc8ce32408102b7 Author: Peter Oberparleiter Date: Thu Mar 26 15:24:18 2009 +0100 [S390] cio: incorrect status check in interrogate function Fix incorrect check for active I/O in interrogate function. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 17e7d87d9f88480a75fc9c5978ab38131a074277 Author: Sebastian Ott Date: Thu Mar 26 15:24:17 2009 +0100 [S390] cio: fix rc generation after chsc call In some situations a rc in __chsc_do_secm will be overwritten by another one. This shouldn't do harm since todays callers don't check for _specific_ errors but fix it for the sake of correctness. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 94cbc203bee4ea87bd49ad56f6c5381bc10d8b6b Author: Sebastian Ott Date: Thu Mar 26 15:24:16 2009 +0100 [S390] cio: fix wrong buffer access in cio_ignore_write Writing only spaces to /proc/cio_ignore will cause a buffer overflow since the size_t value i will not become negative and so buf[-1UL] is accessed. Change the value of i to ssize_t. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit e909074bb91773680c0b2e49ea8af9f85c6f59bd Author: Sebastian Ott Date: Thu Mar 26 15:24:15 2009 +0100 [S390] cio: ccw group fix unbind behaviour. For a ccw group device unbinding it from its driver should do the same as a call to ungroup, since this virtual device can not exist without a driver. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 50f1548399b7bd00ceb38c84a84463a89c82afe8 Author: Sebastian Ott Date: Thu Mar 26 15:24:14 2009 +0100 [S390] cio: fix sanity checks in ccwgroup driver. Some sanity checks in the ccw group driver test the output of container_of macros to be !NULL. Test the input parameters instead. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 40c9f9992bc1caa1bb890bd8163361dbf2eefa86 Author: Sebastian Ott Date: Thu Mar 26 15:24:13 2009 +0100 [S390] cio: ccw group online store - report rcs to the caller. In case the ccw group driver refuses to set a device [on|off]line, we should transmit the return code to the caller. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit a1f640734ab57d548a3fdadad6b869da534d4ecb Author: Sebastian Ott Date: Thu Mar 26 15:24:12 2009 +0100 [S390] cio: airq - fix array boundary MAX_ISC is a valid isc number, so arrays with an index of isc need to have a length of MAX_ISC+1 Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 90ac24a5aeb8d4bef001bd3589564a52846d0eee Author: Sebastian Ott Date: Thu Mar 26 15:24:11 2009 +0100 [S390] cio: device scan oom fallback. Since some callers rely on for_each_subchannel_staged to not fail, fall back to brute force scanning using get_subchannel_by_schid in case of a oom situation. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 87fa5af80cdd5053b27a546725948c2b74ec82b2 Author: Heiko Carstens Date: Thu Mar 26 15:24:10 2009 +0100 [S390] cio: ensure single load of irq handler pointer Add barrier to prevent compiler from reloading pointer to irq handler. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 98c1c6825247c71e3d8a9a5439ba21fce7563014 Author: Heiko Carstens Date: Thu Mar 26 15:24:09 2009 +0100 [S390] cio/crw: add/fix locking The crw_unregister_handler uses xchg + synchronize_sched when unregistering a crw_handler. This doesn't protect crw_collect_info to potentially jump to NULL since it has unlocked code like this: if (crw_handlers[i]) crw_handlers[i](NULL, NULL, 1); So add a mutex which protects the crw handler array for changes. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit e74fe0cec92439115630b51195444b89b910800a Author: Sebastian Ott Date: Thu Mar 26 15:24:08 2009 +0100 [S390] cio: ccw device online store - report rc from ccw driver. In case the ccw driver refuses to set a device offline, we should transmit the return code to the caller. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit c08f294a14cb4c2abbd1a9a619c2d8d07afd41e3 Author: Cornelia Huck Date: Thu Mar 26 15:24:07 2009 +0100 [S390] cio: Use ccw_device_set_notoper(). Use ccw_device_set_notoper() (which also deletes the device timer and disables the subchannel) instead of simply setting the state to DEV_STATE_NOT_OPER in the generic not operational handling code. This prevents unexpected interrupts popping up for devices that are deemed not operational. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit ed04b892e28ae96662fbb3f4c961df5ff3385d28 Author: Cornelia Huck Date: Thu Mar 26 15:24:06 2009 +0100 [S390] cio: Try harder to disable subchannel. Acting upon the assumption that cio_disable_subchannel() is only called when we really want to disable the subchannel (a) remove the check for activity (it is already done in ccw_device_offline(), which is the place where it matters) (b) collect pending status via tsch() and ignore it (it can't matter anymore since the subchannel will be disabled). Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit eb32ae8d0e052d1a287f99f93130ea2ad9af317e Author: Cornelia Huck Date: Thu Mar 26 15:24:05 2009 +0100 [S390] cio: Use unbind/bind instead of unregister/register. The common I/O layer may encounter a situation where the device number of a ccw device has changed or a device driver doesn't want to keep a formerly disconnected device becoming operational again. Instead of using device_del()/ device_add() as now, we can just unbind the driver from the device and rebind it to get the desired effect (rebinding) with less overhead. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 1485c5c88483d200c9c4c71ed7e8eef1a1e317a1 Author: Heiko Carstens Date: Thu Mar 26 15:24:04 2009 +0100 [S390] move EXPORT_SYMBOLs to definitions Move all EXPORT_SYMBOLs to their corresponding definitions. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit e3dd9c2da674993edb5b52acb56a5d954415639b Author: Heiko Carstens Date: Thu Mar 26 15:24:03 2009 +0100 [S390] convert bitmap definitions to C Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 7b886416dfd76df9dd7304868556b1d82cf38890 Author: Heiko Carstens Date: Thu Mar 26 15:24:02 2009 +0100 [S390] Remove CONFIG_MACHCHK_WARNING. Everybody enables it so there is no point for an extra config option. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit f5daba1d4116d964435ddd99f32b6c80448a496b Author: Heiko Carstens Date: Thu Mar 26 15:24:01 2009 +0100 [S390] split/move machine check handler code Split machine check handler code and move it to cio and kernel code where it belongs to. No functional change. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 70193af9188113c9b4ff3dde1aed9f9c8f7c4f93 Author: Sachin Sant Date: Thu Mar 26 15:24:00 2009 +0100 [S390] Fix appldata build break with !NET With CONFIG_NET not set appldata build breaks on s390. arch/s390/appldata/built-in.o: In function appldata_get_net_sum_data: appldata_net_sum.c:(.text+0x2684): undefined reference to dev_get_stats appldata_net_sum.c:(.text+0x2688): undefined reference to init_net appldata_net_sum.c:(.text+0x268c): undefined reference to init_net appldata_net_sum.c:(.text+0x2694): undefined reference to dev_base_lock The following patch fixes the issue for me. Signed-off-by: Sachin Sant Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit cc54c1e66e4b90ab657464fec30e6970636ee23d Author: Heiko Carstens Date: Thu Mar 26 15:23:59 2009 +0100 [S390] ftrace: dont trace machine check handler The ftrace code is currently not reentrant, so we better don't trace our machine check handler. Machine checks are handled like NMIs on s390. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 92e6ecf392fac3082653ac9d84b1bdf53d0ea160 Author: Christian Borntraeger Date: Thu Mar 26 15:23:58 2009 +0100 [S390] Fix hypervisor detection for KVM Currently we use the cpuid (via STIDP instruction) to recognize LPAR, z/VM and KVM. The architecture states, that bit 0-7 of STIDP returns all zero, and if STIDP is executed in a virtual machine, the VM operating system will replace bits 0-7 with FF. KVM should not use FE to distinguish z/VM from KVM for interested guests. The proper way to detect the hypervisor is the STSI (Store System Information) instruction, which return information about the hypervisors via function code 3, selector1=2, selector2=2. This patch changes the detection routine of Linux to use STSI instead of STIDP. This detection is earlier than bootmem, we have to use a static buffer. Since STSI expects a 4kb block (4kb aligned) this patch also changes the init.data alignment for s390. As this section will be freed during boot, this should be no problem. Patch is tested with LPAR, z/VM, KVM on LPAR, and KVM under z/VM. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit 702d9e584feb028ed7e2a6d2b103b8ea57622ff2 Author: Carsten Otte Date: Thu Mar 26 15:23:57 2009 +0100 [S390] check addressing mode in s390_enable_sie The sie instruction requires address spaces to be switched to run proper. This patch verifies that this is the case in s390_enable_sie, otherwise the kernel would crash badly as soon as the process runs into sie. Signed-off-by: Carsten Otte Signed-off-by: Martin Schwidefsky commit 3324e60aafa9aeb1009878d45079b67367a5e2b6 Author: Christian Borntraeger Date: Thu Mar 26 15:23:56 2009 +0100 [S390] lockdep: trace hardirq off in smp_send_stop With lockdep we got the following trace after a panic: Badness at /home/autobuild/BUILD/linux-2.6.28-20090204/kernel/lockdep.c:2878 [...] Call Trace: [<0000000000176334>] lock_acquire+0x54/0xbc [<000000000050b4fe>] __atomic_notifier_call_chain+0x6e/0xdc [<000000000050b59c>] atomic_notifier_call_chain+0x30/0x44 [<0000000000504274>] panic+0xd0/0x1e8 [...] INFO: lockdep is turned off. Last Breaking-Event-Address: [<0000000000170e62>] check_flags+0xae/0x15c possible reason: unannotated irqs-off. lockdep is right. We missed a trace_hardirq_off in our smp_send_stop function and smp_send_stop is called before the panic call chain. Reported-by: Mijo Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit 431429ff788598a19c1a193b9fca3961b7f55916 Author: Hendrik Brueckner Date: Thu Mar 26 15:23:55 2009 +0100 [S390] hvc_iucv: Provide IUCV z/VM user ID filtering This patch introduces the kernel parameter hvc_iucv_allow= that specifies a comma-separated list of z/VM user IDs. If specified, the z/VM IUCV hypervisor console device driver accepts IUCV connections from listed z/VM user IDs only. Signed-off-by: Hendrik Brueckner Signed-off-by: Martin Schwidefsky commit 82f3a79bc6b50ab82744ebc32efba31c78dbccf7 Author: Hendrik Brueckner Date: Thu Mar 26 15:23:54 2009 +0100 [S390] hvc_iucv: Update and add missing kernel messages If the hvc_iucv= kernel parameter specifies a value that is not valid, display an error message. Minor changes to existing kernel messages. Signed-off-by: Hendrik Brueckner Signed-off-by: Martin Schwidefsky commit 5168ce2c647f02756803bef7b74906f485491a1c Author: Heiko Carstens Date: Thu Mar 26 15:23:53 2009 +0100 [S390] cputime: initialize per thread timer values on fork Initialize per thread timer values instead of just copying them from the parent. That way it is easily possible to tell how much time a thread spent in user/system context. Doesn't fix a bug, this is just for debugging purposes. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit cbdc229245e8cf5c201e68221ebf2f33d2aaf029 Author: Heiko Carstens Date: Thu Mar 26 15:23:52 2009 +0100 [S390] arch/s390/kernel/process.c: fix whitespace damage Fix all the whitespace damage in process.c, especially copy_thread(). Next patch will add code to copy_thread() which needs to 'fixed' first. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 082fb301e048e84669234afb80fe27e6fa87efb4 Author: Heiko Carstens Date: Thu Mar 26 15:23:51 2009 +0100 [S390] delete drivers/s390/ebcdic.c Dead file. Seems to be a leftover from the 2.4->2.5 conversion. The used and uptodate version of this file is in arch/s390/kernel. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 94f5b09d97ee1f803c76d0262e0b0d3791825d09 Author: Heiko Carstens Date: Thu Mar 26 15:23:50 2009 +0100 [S390] move sysinfo.c from drivers/s390 to arch/s390/kernel All in sysinfo.c is core kernel code and not driver code. So move it to arch/s390/kernel. Also includes some small cleanups. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit fc19f381b3828aa4f8a3417dbefc3418ec6bbe10 Author: Stefan Haberland Date: Thu Mar 26 15:23:49 2009 +0100 [S390] dasd: message cleanup Moved some Messages into s390 debug feature and changed remaining messages to use the dev_xxx and pr_xxx macros. Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky commit f3eb5384cf0325c02e306b1d81e70f81a03d7432 Author: Stefan Weinhuber Date: Thu Mar 26 15:23:48 2009 +0100 [S390] dasd: add High Performance FICON support To support High Performance FICON, the DASD device driver has to translate I/O requests into the new transport mode control words (TCW) instead of the traditional (command mode) CCW requests. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit b44b0ab3bac16356f03e94b1b49ba9305710c445 Author: Stefan Weinhuber Date: Thu Mar 26 15:23:47 2009 +0100 [S390] dasd: add large volume support The dasd device driver will now support ECKD devices with more then 65520 cylinders. In the traditional ECKD adressing scheme each track is addressed by a 16-bit cylinder and 16-bit head number. The new addressing scheme makes use of the fact that the actual number of heads is never larger then 15, so 12 bits of the head number can be redefined to be part of the cylinder address. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit f9a28f7bc5225af476f8d4bb669038da8801b7c4 Author: Jean-Baptiste Joret Date: Thu Mar 26 15:23:46 2009 +0100 [S390] dasd_eckd / Write format R0 is now allowed BB Permission is now granted to the subsystem to format write R0 with: * an ID = CCHHR, where CC = physical cylinder number, HH = physical head number, and R = 0 * a key length of zero * a data length of eight * a data field containing all zeros Signed-off-by: Jean-Baptiste Joret Signed-off-by: Martin Schwidefsky commit 0000d031703c33b9ea909ad81f03762db66135e1 Author: Heiko Carstens Date: Thu Mar 26 15:23:45 2009 +0100 [S390] dasd: enable compat ioctls All of the ioctls are compatible. Just enable them. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 59fa4392dddae244a1148cbbcb090b5a5728f576 Author: Heiko Carstens Date: Thu Mar 26 15:23:44 2009 +0100 [S390] page fault: invoke oom-killer s390 arch backend for 1c0fe6e3bda0464728c23c8d84aa47567e8b716c "mm: invoke oom-killer from page fault". Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 099b765139929efdcf232f8870804accf8c4cdc5 Author: Frank Munzert Date: Thu Mar 26 15:23:43 2009 +0100 [S390] Automatic IPL after dump Provide new shutdown action "dump_reipl" for automatic ipl after dump. Signed-off-by: Frank Munzert Signed-off-by: Martin Schwidefsky Signed-off-by: Heiko Carstens commit d7fd5f1e3b195a8232b3ed768ac2809ddce8ca46 Author: Christian Borntraeger Date: Thu Mar 26 15:23:42 2009 +0100 [S390] fix dump_stack vs. %p and (null) The s390 implemenation of dump_stack uses %p to display stack content. Since d97106ab53f812910a62d18afb9dbe882819c1ba (Make %p print '(null)' for NULL pointers) this causes a strange output for dump_stack: [...] Process basename (pid: 8822, task: 00000000b2ece038, ksp: 00000000b24d7b38) 04000000b5685c00 00000000b24d7760 0000000000000002 (null) 00000000b24d7800 00000000b24d7778 00000000b24d7778 00000000001052fe (null) 00000000b24d7b38 (null) 000000000000000a 000000000000000d (null) 00000000b24d7760 00000000b24d77d8 000000000051a7e8 00000000001052fe 00000000b24d7760 00000000b24d77b0 Call Trace: [...] This patch changes our dump_stack to use the appropriate %x format. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit a2a9537ac0b37a5da6fbe7e1e9cb06c524d2a9c4 Author: Jens Axboe Date: Tue Mar 17 09:38:40 2009 +0100 Get rid of pdflush_operation() in emergency sync and remount Opencode a cheasy approach with kevent. The idea here is that we'll add some generic delayed work infrastructure, which probably wont be based on pdflush (or maybe it will, in which case we can just add it back). This is in preparation for getting rid of pdflush completely. Signed-off-by: Jens Axboe commit 6933c02e9cc47c2df3c016621a013ec79fb4203f Author: Jens Axboe Date: Tue Mar 17 09:36:37 2009 +0100 btrfs: get rid of current_is_pdflush() in btrfs_btree_balance_dirty Chris says it's safe to kill. Acked-by: Chris Mason Signed-off-by: Jens Axboe commit 26160158d3d3df548f4ee046cc6147fe048cfa9c Author: Jens Axboe Date: Tue Mar 17 09:35:06 2009 +0100 Move the default_backing_dev_info out of readahead.c and into backing-dev.c It really makes no sense to have it in readahead.c, so move it where it belongs. Signed-off-by: Jens Axboe commit 07e86f405addc6436eb969b8279bb14a6dcacce4 Author: Avishay Traeger Date: Tue Mar 24 12:40:18 2009 +0100 block: Repeated lines in switching-sched.txt These lines appear in this file twice - removed one occurrence. Signed-off-by: Avishay Traeger Signed-off-by: Jens Axboe commit e7cbbf1bf17e3c706f874e867f7b744e1c86fed9 Author: Boaz Harrosh Date: Tue Mar 24 12:37:50 2009 +0100 bsg: Remove bogus check against request_queue->max_sectors bsg submits REQ_TYPE_BLOCK_PC so the right check is max_hw_sectors. But I've removed this check because right after, bsg proceeds with calling blk_rq_map_user() which does all the right checks. Signed-off-by: Boaz Harrosh Signed-off-by: Jens Axboe commit 1cd96c242a829d52f7a5ae98f554ca9775429685 Author: Boaz Harrosh Date: Tue Mar 24 12:35:07 2009 +0100 block: WARN in __blk_put_request() for potential bio leak Put a WARN_ON in __blk_put_request if it is about to leak bio(s). This is a serious bug that can happen in error handling code paths. For this to work I have fixed a couple of places in block/ where request->bio != NULL ownership was not honored. And a small cleanup at sg_io() while at it. Signed-off-by: Boaz Harrosh Signed-off-by: Jens Axboe commit f028f3b2f987ebc61cef382ab7a5c449917b728e Author: Nikanth Karthikesan Date: Tue Mar 24 12:33:41 2009 +0100 loop: fix circular locking in loop_clr_fd() With CONFIG_PROVE_LOCKING enabled $ losetup /dev/loop0 file $ losetup -o 32256 /dev/loop1 /dev/loop0 $ losetup -d /dev/loop1 $ losetup -d /dev/loop0 triggers a [ INFO: possible circular locking dependency detected ] I think this warning is a false positive. Open/close on a loop device acquires bd_mutex of the device before acquiring lo_ctl_mutex of the same device. For ioctl(LOOP_CLR_FD) after acquiring lo_ctl_mutex, fput on the backing_file might acquire the bd_mutex of a device, if backing file is a device and this is the last reference to the file being dropped . But it is guaranteed that it is impossible to have a circular list of backing devices.(say loop2->loop1->loop0->loop2 is not possible), which guarantees that this can never deadlock. So this warning should be suppressed. It is very difficult to annotate lockdep not to warn here in the correct way. A simple way to silence lockdep could be to mark the lo_ctl_mutex in ioctl to be a sub class, but this might mask some other real bugs. @@ -1164,7 +1164,7 @@ static int lo_ioctl(struct block_device *bdev, fmode_t mode, struct loop_device *lo = bdev->bd_disk->private_data; int err; - mutex_lock(&lo->lo_ctl_mutex); + mutex_lock_nested(&lo->lo_ctl_mutex, 1); switch (cmd) { case LOOP_SET_FD: err = loop_set_fd(lo, mode, bdev, arg); Or actually marking the bd_mutex after lo_ctl_mutex as a sub class could be a better solution. Luckily it is easy to avoid calling fput on backing file with lo_ctl_mutex held, so no lockdep annotation is required. If you do not like the special handling of the lo_ctl_mutex just for the LOOP_CLR_FD ioctl in lo_ioctl(), the mutex handling could be moved inside each of the individual ioctl handlers and I could send you another patch. Signed-off-by: Jens Axboe commit 86ee79c3dbd48d7430fd81edc1da3516c9f6dabc Author: David S. Miller Date: Thu Mar 26 01:54:46 2009 -0700 sparc64: Flush TLB before releasing pages. tlb_flush_mmu() needs to flush pending TLB entries before processing the mmu_gather ->pages list. Noticed by Benjamin Herrenschmidt. Signed-off-by: David S. Miller commit f0de70f8bb56952f6e016a65a8a8d006918f5bf6 Merge: bb3daa4... cda6d37... Author: David S. Miller Date: Thu Mar 26 01:22:01 2009 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit bb3daa4a5960cd9d39bad88679fcf587b456c05d Author: PJ Waskiewicz Date: Wed Mar 25 22:10:42 2009 +0000 ixgbe: Allow Priority Flow Control settings to survive a device reset When changing DCB parameters, ixgbe needs to have the MAC reset. The way the flow control code is setup today, PFC will be disabled on a reset. This patch adds a new flow control type for PFC, and then has the netlink layer take care of toggling which type of flow control to enable. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit ede5ad0e29b641c3d3a644272a9127bfd98dfcc8 Author: Rami Rosen Date: Thu Mar 26 01:11:48 2009 -0700 net: core: remove unneeded include in net/core/utils.c. Signed-off-by: Rami Rosen Signed-off-by: David S. Miller commit 73afa537926d76dbd550614c3b75e375f1e39f83 Author: Jesse Brandeburg Date: Wed Mar 25 22:06:01 2009 +0000 e1000e: update version number Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit a3c69fef7a7775b0bcfbb8249845a25598cfe951 Author: Jesse Brandeburg Date: Wed Mar 25 22:05:41 2009 +0000 e1000e: fix close interrupt race As noticed by Alan Cox, it is possible for e1000e to exit its interrupt handler or NAPI with interrupts enabled even when the driver is unloading or being configured administratively down. fix related to fix for: http://bugzilla.kernel.org/show_bug.cgi?id=12876 Signed-off-by: Jesse Brandeburg CC: Alan Cox Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit a72d2b2cc63994cb8d592a004bf5331be6905814 Author: Jesse Brandeburg Date: Wed Mar 25 22:05:21 2009 +0000 e1000e: fix loss of multicast packets e1000e (and e1000, igb, ixgbe, ixgb) all do a series of operations each time a multicast address is added. The flow goes something like 1) stack adds one multicast address 2) stack passes whole current list of unicast and multicast addresses to driver 3) driver clears entire list in hardware 4) driver programs each multicast address using iomem in a loop This was causing multicast packets to be lost during the reprogramming process. reference with test program: http://kerneltrap.org/mailarchive/linux-netdev/2009/3/14/5160514/thread Thanks to Dave Boutcher for his report and test program. This driver fix prepares an array all at once in memory and programs it in one shot to the hardware, not requiring an "erase" cycle. It would still be possible for packets to be dropped while the receiver is off during reprogramming. Signed-off-by: Jesse Brandeburg CC: Dave Boutcher Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 12d04a3c12b420f23398b4d650127642469a60a6 Author: Alexander Duyck Date: Wed Mar 25 22:05:03 2009 +0000 e1000e: commonize tx cleanup routine to match e1000 & igb This change updates the e1000e tx cleanup routine to more closely match what already exists in igb and e1000. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 7249dee5bdbe96302b5ff0d9a7701cf3dc8cffe8 Author: Eric Leblond Date: Thu Mar 26 01:04:28 2009 -0700 netfilter: fix nf_logger name in ebt_ulog. This patch renames the ebt_ulog nf_logger from "ulog" to "ebt_ulog" to be in sync with other modules naming. As this name was currently only used for informational purpose, the renaming should be harmless. Signed-off-by: Eric Leblond Signed-off-by: David S. Miller commit 3b334d427cb9c866216820bfad0d8318869cc154 Author: Eric Leblond Date: Thu Mar 26 01:04:02 2009 -0700 netfilter: fix warning in ebt_ulog init function. The ebt_ulog module does not follow the fixed convention about function return. Loading the module is triggering the following message: sys_init_module: 'ebt_ulog'->init suspiciously returned 1, it should follow 0/-E convention sys_init_module: loading module anyway... Pid: 2334, comm: modprobe Not tainted 2.6.29-rc5edenwall0-00883-g199e57b #146 Call Trace: [] ? printk+0xf/0x16 [] sys_init_module+0x107/0x186 [] syscall_call+0x7/0xb The following patch fixes the return treatment in ebt_ulog_init() function. Signed-off-by: Eric Leblond Signed-off-by: David S. Miller commit 704b3ea3b9b4ea0e115208946abd5c8a64080113 Author: Eric Leblond Date: Thu Mar 26 01:03:23 2009 -0700 netfilter: fix warning about invalid const usage This patch fixes the declaration of the logger structure in ebt_log and ebt_ulog: I forgot to remove the const option from their declaration in the commit ca735b3aaa945626ba65a3e51145bfe4ecd9e222 ("netfilter: use a linked list of loggers"). Pointed-out-by: Stephen Rothwell Signed-off-by: Eric Leblond Signed-off-by: David S. Miller commit a6c42322722976ca81e6d02e4a702f33d659d8fc Author: Jesse Brandeburg Date: Wed Mar 25 21:59:22 2009 +0000 e1000: fix close race with interrupt this is in regards to http://bugzilla.kernel.org/show_bug.cgi?id=12876 where it appears that e1000 can leave its interrupt enabled after exiting the driver. Fix the bug by making the interrupt enable paths more aware of the driver exiting. Thanks to Alan Cox for the poke and initial investigation. CC: Alan Cox Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit ccfb342c5cd584f0f3e682280f7152310edf0e39 Author: Alexander Duyck Date: Wed Mar 25 21:59:04 2009 +0000 e1000: cleanup clean_tx_irq routine so that it completely cleans ring The tx cleanup routine was stopping after 64 packets and this was causing issues resulting in the ring not being completely cleaned. This change updates the driver to clean the entire ring and if it doesn't it then will retry on the next pass. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 37e73df8c3f19f4733c60ec53c104ff6f79ba467 Author: Alexander Duyck Date: Wed Mar 25 21:58:45 2009 +0000 e1000: fix tx hang detect logic and address dma mapping issues This patch changes the dma mapping to better support skb_dma_map/skb_dma_unmap and addresses and redefines the tx hang logic to be based off of time stamp instead of if the dma field is populated Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit cda6d377ec6b2ee2e58d563d0bd7eb313e0165df Author: Stephen Hemminger Date: Wed Mar 25 21:01:47 2009 -0700 bridge: bad error handling when adding invalid ether address This fixes an crash when empty bond device is added to a bridge. If an interface with invalid ethernet address (all zero) is added to a bridge, then bridge code detects it when setting up the forward databas entry. But the error unwind is broken, the bridge port object can get freed twice: once when ref count went to zeo, and once by kfree. Since object is never really accessible, just free it. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 5a29f7893fbe681f1334285be7e41e56f0de666c Author: Jiri Pirko Date: Wed Mar 25 17:23:38 2009 -0700 bonding: select current active slave when enslaving device for mode tlb and alb I've hit an issue on my system when I've been using RealTek RTL8139D cards in bonding interface in mode balancing-alb. When I enslave a card, the current active slave (bond->curr_active_slave) is not set and the link is therefore not functional. ---- # cat /proc/net/bonding/bond0 Ethernet Channel Bonding Driver: v3.5.0 (November 4, 2008) Bonding Mode: adaptive load balancing Primary Slave: None Currently Active Slave: None MII Status: up MII Polling Interval (ms): 100 Up Delay (ms): 0 Down Delay (ms): 0 Slave Interface: eth1 MII Status: up Link Failure Count: 0 Permanent HW addr: 00:1f:1f:01:2f:22 ---- The thing that gets it right is when I unplug the cable and then I put it back into the NIC. Then the current active slave is set to eth1 and link is working just fine. Here is dmesg log with bonding DEBUG messages turned on: ---- ADDRCONF(NETDEV_UP): bond0: link is not ready event_dev: bond0, event: 1 IFF_MASTER event_dev: bond0, event: 8 IFF_MASTER bond_ioctl: master=bond0, cmd=35216 slave_dev=cac5d800: slave_dev->name=eth1: eth1: ! NETIF_F_VLAN_CHALLENGED event_dev: eth1, event: 8 eth1: link up, 100Mbps, full-duplex, lpa 0xC5E1 event_dev: eth1, event: 1 event_dev: eth1, event: 8 IFF_SLAVE Initial state of slave_dev is BOND_LINK_UP bonding: bond0: enslaving eth1 as an active interface with an up link. ADDRCONF(NETDEV_CHANGE): bond0: link becomes ready event_dev: bond0, event: 4 IFF_MASTER bond0: no IPv6 routers present <<<>>> eth1: link down event_dev: eth1, event: 4 IFF_SLAVE bonding: bond0: link status definitely down for interface eth1, disabling it event_dev: bond0, event: 4 IFF_MASTER <<<>>> eth1: link up, 100Mbps, full-duplex, lpa 0xC5E1 event_dev: eth1, event: 4 IFF_SLAVE bonding: bond0: link status definitely up for interface eth1. bonding: bond0: making interface eth1 the new active one. event_dev: eth1, event: 8 IFF_SLAVE event_dev: eth1, event: 8 IFF_SLAVE bonding: bond0: first active interface up! event_dev: bond0, event: 4 IFF_MASTER ---- The current active slave is set by calling bond_select_active_slave() function from bond_miimon_commit() function when the slave (eth1) link goes to state up. I also tested this on other machine with Broadcom NetXtreme II BCM5708 1000Base-T NIC and there all works fine. The thing is that this adapter is down and goes up after few seconds after it is enslaved. This patch calls bond_select_active_slave() in bond_enslave() function for modes alb and tlb and makes sure that the current active slave is set up properly even when the slave state is already up. Tested on both systems, works fine. Notice: The same problem can maybe also occrur in mode 8023AD but I'm unable to test that. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 93c1285c5d92c31f9bcc20355f1e86e95bec165e Author: Li Yang Date: Tue Mar 24 23:15:33 2009 +0000 gianfar: reallocate skb when headroom is not enough for fcb Gianfar uses a hardware header FCB for offloading. However when used with bridging or IP forwarding, TX skb might not have enough headroom for the FCB. Reallocate skb for such cases. Signed-off-by: Li Yang Signed-off-by: David S. Miller commit 8ca51986be0c19c8a48ef8f36568c5a3c2c0ac50 Author: Florian Fainelli Date: Tue Mar 24 23:34:38 2009 +0000 Bump release date to 25Mar2009 and version to 0.22 This patch bumps the driver release date to March 25th 2009 and release version to 0.22. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 2a30ca8b1ec0e3c9b4a77113d5e8648b2fd56cae Author: Florian Fainelli Date: Tue Mar 24 23:34:35 2009 +0000 r6040: Fix second PHY address This patch fixes the second PHY address which is strapped to be at PHY address 3 instead of 2. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit b7bb4c9bb01941fe8feb653f3410e7ed0c9bb786 Author: Gautham R Shenoy Date: Wed Mar 25 14:44:27 2009 +0530 sched: Add comments to find_busiest_group() function Impact: cleanup Add /** style comments around find_busiest_group(). Also add a few explanatory comments. This concludes the find_busiest_group() cleanup. The function is now down to 72 lines from the original 313 lines. Signed-off-by: Gautham R Shenoy Acked-by: Peter Zijlstra Cc: Suresh Siddha Cc: "Balbir Singh" Cc: Nick Piggin Cc: "Dhaval Giani" Cc: Bharata B Rao Cc: "Vaidyanathan Srinivasan" LKML-Reference: <20090325091427.13992.18933.stgit@sofia.in.ibm.com> Signed-off-by: Ingo Molnar commit c071df18525a95b37dd5821a6dc4af83bd18675e Author: Gautham R Shenoy Date: Wed Mar 25 14:44:22 2009 +0530 sched: Refactor the power savings balance code Impact: cleanup Create seperate helper functions to initialize the power-savings-balance related variables, to update them and to check if we have a scope for performing power-savings balance. Add no-op inline functions for the !(CONFIG_SCHED_MC || CONFIG_SCHED_SMT) case. This will eliminate all the #ifdef jungle in find_busiest_group() and the other helper functions. Signed-off-by: Gautham R Shenoy Acked-by: Peter Zijlstra Cc: Suresh Siddha Cc: "Balbir Singh" Cc: Nick Piggin Cc: "Dhaval Giani" Cc: Bharata B Rao Cc: "Vaidyanathan Srinivasan" LKML-Reference: <20090325091422.13992.73616.stgit@sofia.in.ibm.com> Signed-off-by: Ingo Molnar commit a021dc03376707c55a3483e32c16b8986d4414cc Author: Gautham R Shenoy Date: Wed Mar 25 14:44:17 2009 +0530 sched: Optimize the !power_savings_balance during fbg() Impact: cleanup, micro-optimization We don't need to perform power_savings balance if either the cpu is NOT_IDLE or if the sched_domain doesn't contain the SD_POWERSAVINGS_BALANCE flag set. Currently, we check for these conditions multiple number of times, even though these variables don't change over the scope of find_busiest_group(). Check once, and store the value in the already exiting "power_savings_balance" variable. Signed-off-by: Gautham R Shenoy Acked-by: Peter Zijlstra Cc: Suresh Siddha Cc: "Balbir Singh" Cc: Nick Piggin Cc: "Dhaval Giani" Cc: Bharata B Rao Cc: "Vaidyanathan Srinivasan" LKML-Reference: <20090325091417.13992.2657.stgit@sofia.in.ibm.com> Signed-off-by: Ingo Molnar commit dbc523a3b86f9e1765b5e70e6886913b99cc5cec Author: Gautham R Shenoy Date: Wed Mar 25 14:44:12 2009 +0530 sched: Create a helper function to calculate imbalance Move all the imbalance calculation out of find_busiest_group() through this helper function. With this change, the structure of find_busiest_group() will be as follows: - update_sched_domain_statistics. - check if imbalance exits. - update imbalance and return busiest. Signed-off-by: Gautham R Shenoy Acked-by: Peter Zijlstra Cc: Suresh Siddha Cc: "Balbir Singh" Cc: Nick Piggin Cc: "Dhaval Giani" Cc: Bharata B Rao Cc: "Vaidyanathan Srinivasan" LKML-Reference: <20090325091411.13992.43293.stgit@sofia.in.ibm.com> Signed-off-by: Ingo Molnar commit 2e6f44aeda426054fc58464df1ad571aecca0c92 Author: Gautham R Shenoy Date: Wed Mar 25 14:44:06 2009 +0530 sched: Create helper to calculate small_imbalance in fbg() Impact: cleanup We have two places in find_busiest_group() where we need to calculate the minor imbalance before returning the busiest group. Encapsulate this functionality into a seperate helper function. Credit: Vaidyanathan Srinivasan Signed-off-by: Gautham R Shenoy Acked-by: Peter Zijlstra Cc: Suresh Siddha Cc: "Balbir Singh" Cc: Nick Piggin Cc: "Dhaval Giani" Cc: Bharata B Rao LKML-Reference: <20090325091406.13992.54316.stgit@sofia.in.ibm.com> Signed-off-by: Ingo Molnar commit 37abe198b1246ddd206319c43502a687db62d347 Author: Gautham R Shenoy Date: Wed Mar 25 14:44:01 2009 +0530 sched: Create a helper function to calculate sched_domain stats for fbg() Impact: cleanup Create a helper function named update_sd_lb_stats() to update the various sched_domain related statistics in find_busiest_group(). With this we would have moved all the statistics computation out of find_busiest_group(). Credit: Vaidyanathan Srinivasan Signed-off-by: Gautham R Shenoy Acked-by: Peter Zijlstra Cc: Suresh Siddha Cc: "Balbir Singh" Cc: Nick Piggin Cc: "Dhaval Giani" Cc: Bharata B Rao LKML-Reference: <20090325091401.13992.88737.stgit@sofia.in.ibm.com> Signed-off-by: Ingo Molnar commit 222d656dea57e4e084fbd1e9383e6fed2ca9fa61 Author: Gautham R Shenoy Date: Wed Mar 25 14:43:56 2009 +0530 sched: Define structure to store the sched_domain statistics for fbg() Impact: cleanup Currently we use a lot of local variables in find_busiest_group() to capture the various statistics related to the sched_domain. Group them together into a single data structure. This will help us to offload the job of updating the sched_domain statistics to a helper function. Credit: Vaidyanathan Srinivasan Signed-off-by: Gautham R Shenoy Acked-by: Peter Zijlstra Cc: Suresh Siddha Cc: "Balbir Singh" Cc: Nick Piggin Cc: "Dhaval Giani" Cc: Bharata B Rao LKML-Reference: <20090325091356.13992.25970.stgit@sofia.in.ibm.com> Signed-off-by: Ingo Molnar commit 1f8c553d0f11d85f7993fe21015695d266771c00 Author: Gautham R Shenoy Date: Wed Mar 25 14:43:51 2009 +0530 sched: Create a helper function to calculate sched_group stats for fbg() Impact: cleanup Create a helper function named update_sg_lb_stats() which can be invoked to calculate the individual group's statistics in find_busiest_group(). This reduces the lenght of find_busiest_group() considerably. Credit: Vaidyanathan Srinivasan Signed-off-by: Gautham R Shenoy Aked-by: Peter Zijlstra Cc: Suresh Siddha Cc: "Balbir Singh" Cc: Nick Piggin Cc: "Dhaval Giani" Cc: Bharata B Rao LKML-Reference: <20090325091351.13992.43461.stgit@sofia.in.ibm.com> Signed-off-by: Ingo Molnar commit 381be78fdc829a22f6327a0ed09f54b6270a976d Author: Gautham R Shenoy Date: Wed Mar 25 14:43:46 2009 +0530 sched: Define structure to store the sched_group statistics for fbg() Impact: cleanup Currently a whole bunch of variables are used to store the various statistics pertaining to the groups we iterate over in find_busiest_group(). Group them together in a single data structure and add appropriate comments. This will be useful later on when we create helper functions to calculate the sched_group statistics. Credit: Vaidyanathan Srinivasan Signed-off-by: Gautham R Shenoy Acked-by: Peter Zijlstra Cc: Suresh Siddha Cc: "Balbir Singh" Cc: Nick Piggin Cc: "Dhaval Giani" Cc: Bharata B Rao LKML-Reference: <20090325091345.13992.20099.stgit@sofia.in.ibm.com> Signed-off-by: Ingo Molnar commit 6dfdb0629019f307ab18864b1fd3e5dbb02f383c Author: Gautham R Shenoy Date: Wed Mar 25 14:43:40 2009 +0530 sched: Fix indentations in find_busiest_group() using gotos Impact: cleanup Some indentations in find_busiest_group() can minimized by using early exits with the help of gotos. This improves readability in a couple of cases. Signed-off-by: Gautham R Shenoy Acked-by: Peter Zijlstra Cc: Suresh Siddha Cc: "Balbir Singh" Cc: Nick Piggin Cc: "Dhaval Giani" Cc: Bharata B Rao Cc: "Vaidyanathan Srinivasan" LKML-Reference: <20090325091340.13992.45062.stgit@sofia.in.ibm.com> Signed-off-by: Ingo Molnar commit 67bb6c036d1fc3d332c8527a36a546e3e72e822c Author: Gautham R Shenoy Date: Wed Mar 25 14:43:35 2009 +0530 sched: Simple helper functions for find_busiest_group() Impact: cleanup Currently the load idx calculation code is in find_busiest_group(). Move that to a static inline helper function. Similary, to find the first cpu of a sched_group we use cpumask_first(sched_group_cpus(group)) Use a helper to that. It improves readability in some cases. Signed-off-by: Gautham R Shenoy Acked-by: Peter Zijlstra Cc: Suresh Siddha Cc: "Balbir Singh" Cc: Nick Piggin Cc: "Dhaval Giani" Cc: Bharata B Rao Cc: "Vaidyanathan Srinivasan" LKML-Reference: <20090325091335.13992.55424.stgit@sofia.in.ibm.com> Signed-off-by: Ingo Molnar commit b6d9842258d1ba27fb978cded74eb4b6aa15edc8 Merge: 67aa0f7... 8e0ee43... Author: Ingo Molnar Date: Wed Mar 25 10:26:51 2009 +0100 Merge branch 'sched/cleanups'; commit 'v2.6.29' into sched/core commit 3b9d49eea1c32e529fa932670a53358e1c8cd67e Author: Wim Van Sebroeck Date: Mon Mar 23 13:50:38 2009 +0000 [WATCHDOG] i6300esb.c: start locking Change the start function in preparation of the generic watchdog code. Also make sure that locking of the start function is OK. Signed-off-by: Wim Van Sebroeck commit 0426fd0d88a595a8ab18e0cd69bdfe82a4d15115 Author: Wim Van Sebroeck Date: Thu Mar 19 19:02:44 2009 +0000 [WATCHDOG] i6300esb.c: convert to platform device driver Convert the Intel 6300ESB watchdog timer to a platform device driver. Signed-off-by: Wim Van Sebroeck commit 04bedfa542d90ac7a1bbf28287e9861d0da21576 Author: Alan Cox Date: Sun Mar 22 10:46:42 2009 +0000 [WATCHDOG] wdt.c: remove #ifdef CONFIG_WDT_501 Change the wdt.c watchdog driver so that the code is the same for both the WDT500 as the WDT501-P card. The selection of the card is now being done via the module parameter: 'type' instead of the config option CONFIG_WDT_501. Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 278aefc51bdbc7f1a3d39c9bd5313c78335b7828 Author: Wim Van Sebroeck Date: Wed Mar 18 09:09:26 2009 +0000 [WATCHDOG] Fix io.h & uaccess.h includes. Fix following includes: * #include should be #include * #include should be #include Signed-off-by: Wim Van Sebroeck commit 143a2e54bf53216674eada16e8953f48b159e08a Author: Wim Van Sebroeck Date: Wed Mar 18 08:35:09 2009 +0000 [WATCHDOG] More coding-style and trivial clean-up Some more cleaning-up of the watchdog drivers. Signed-off-by: Wim Van Sebroeck commit d5c26a597782d4109869abbcc36983969f964864 Author: Wim Van Sebroeck Date: Wed Mar 18 08:18:43 2009 +0000 [WATCHDOG] struct file_operations should be const Fix following warnings: WARNING: struct file_operations should normally be const Signed-off-by: Wim Van Sebroeck commit 927d69611398f046c4447ce5ded992321c8f90ff Author: Wim Van Sebroeck Date: Wed Mar 18 08:05:24 2009 +0000 [WATCHDOG] cpwd.c: Coding style - Clean-up This brings the cpwd.c watchdog driver in line with the kernel's coding style. Signed-off-by: Wim Van Sebroeck commit d8100c3abfd32986a8820ce4e614b0223a2d22a9 Author: Thomas Mingarelli Date: Tue Mar 3 00:17:16 2009 +0000 [WATCHDOG] hpwdt.c: Add new HP BMC controller. Add the PCI-ID for the upcoming new BMC controller for HP hardware. Signed-off-by: Thomas Mingarelli Signed-off-by: Wim Van Sebroeck commit 2855d28a35d14e0087c48cb6f15d0446ea4c54c3 Author: Julia Lawall Date: Mon Dec 29 11:23:47 2008 +0100 [PATCH 13/13] drivers/watchdog: use USB API functions rather than constants This set of patches introduces calls to the following set of functions: usb_endpoint_dir_in(epd) usb_endpoint_dir_out(epd) usb_endpoint_is_bulk_in(epd) usb_endpoint_is_bulk_out(epd) usb_endpoint_is_int_in(epd) usb_endpoint_is_int_out(epd) usb_endpoint_num(epd) usb_endpoint_type(epd) usb_endpoint_xfer_bulk(epd) usb_endpoint_xfer_control(epd) usb_endpoint_xfer_int(epd) usb_endpoint_xfer_isoc(epd) In some cases, introducing one of these functions is not possible, and it just replaces an explicit integer value by one of the following constants: USB_ENDPOINT_XFER_BULK USB_ENDPOINT_XFER_CONTROL USB_ENDPOINT_XFER_INT USB_ENDPOINT_XFER_ISOC An extract of the semantic patch that makes these changes is as follows: (http://www.emn.fr/x-info/coccinelle/) // @r1@ struct usb_endpoint_descriptor *epd; @@ - ((epd->bmAttributes & \(USB_ENDPOINT_XFERTYPE_MASK\|3\)) == - \(USB_ENDPOINT_XFER_CONTROL\|0\)) + usb_endpoint_xfer_control(epd) @r5@ struct usb_endpoint_descriptor *epd; @@ - ((epd->bEndpointAddress & \(USB_ENDPOINT_DIR_MASK\|0x80\)) == - \(USB_DIR_IN\|0x80\)) + usb_endpoint_dir_in(epd) @inc@ @@ #include @depends on !inc && (r1||r5)@ @@ + #include #include // Signed-off-by: Julia Lawall Signed-off-by: Wim Van Sebroeck commit 9e058d4f57751daa008b764735f97fdfccfeab6c Author: Thomas Reitmayr Date: Tue Feb 24 14:59:22 2009 -0800 [WATCHDOG] orion5x_wdt: fix compile issue by providing tclk as platform data The orion5x-wdt driver is now registered as a platform device and receives the tclk value as platform data. This fixes a compile issue cause by a previously removed define "ORION5X_TCLK". Signed-off-by: Thomas Reitmayr Acked-by: Nicolas Pitre Signed-off-by: Kristof Provost Cc: Lennert Buytenhek Cc: Wim Van Sebroeck Cc: Russell King Cc: Martin Michlmayr Cc: Sylver Bruneau Cc: Kunihiko IMAI Signed-off-by: Andrew Morton commit f296b14355a2d0cb170a85236ec391bb0a3fdb3a Author: Wim Van Sebroeck Date: Mon Feb 23 13:08:37 2009 +0000 [WATCHDOG] rc32434_wdt: make sure watchdog is not running at startup Make sure that the watchdog is not running after loading and before it is started by opening /dev/watchdog. Signed-off-by: Wim Van Sebroeck commit e455b6b4ed66be0c2aa6e41fd9027c1ce585a490 Author: Wim Van Sebroeck Date: Mon Feb 23 13:08:36 2009 +0000 [WATCHDOG] rc32434_wdt: add spin_locking Add spin_locks to prevent races. Signed-off-by: Wim Van Sebroeck commit 0aaae66179f269b7b37d0b526029c5783bed1da3 Author: Wim Van Sebroeck Date: Mon Feb 23 13:08:35 2009 +0000 [WATCHDOG] rc32434_wdt: add shutdown method Add shutdown method to the platform driver. Signed-off-by: Wim Van Sebroeck commit 08eb2e0c084778f30691e3f18540cdb754c56530 Author: Phil Sutter Date: Sun Feb 8 16:44:42 2009 +0100 [WATCHDOG] rc32434_wdt: add timeout module parameter The WDT timer ticks quite fast (half of the CPU clock speed, which may be between 198MHz and 330MHz (or 400MHz on newer boards)). Given it's size of 32Bit, the maximum timeout value ranges from about 21s to 43s, depending on the configured CPU clock speed. This patch add's the timeout module parameter and checks that it's not bigger then the maximum timeout for the given clock speed. Signed-off-by: Phil Sutter Signed-off-by: Wim Van Sebroeck commit 9b655e07d77e3b1a00c1c8302e2ef3b7fb719de3 Author: Phil Sutter Date: Sun Feb 8 16:44:42 2009 +0100 [WATCHDOG] rc32434_wdt: clean-up driver Clean-up the rc32434 driver code: - name the platform driver rc32434_wdt_driver - Replace KBUILD_MODNAME ": " with PFX define. - Cleanup include files - Order the ioctl's Signed-off-by: Phil Sutter Signed-off-by: Wim Van Sebroeck commit 371d3525e3b9d57c00ca307f8ee4ca51a2eaa70b Author: Kevin Hilman Date: Thu Jan 29 14:14:30 2009 -0800 [WATCHDOG] davinci: convert to ioremap() + io[read|write] Remove davinci platform-specific IO accessor macros in favor of standard ioremap + io[read|write]* functions. Also, convert printk(KERN_ERR ....) into dev_err(...) Signed-off-by: Kevin Hilman Signed-off-by: Wim Van Sebroeck commit 63bad1452e9087e6f130316c005eb38a8758a267 Author: Eric Lammerts Date: Tue Feb 3 17:45:56 2009 -0500 [WATCHDOG] w83697ug: add error checking I noticed the W83697UG driver tries to register a watchdog even though it already noticed the chip isn't there. WDT driver for the Winbond(TM) W83697UG/UF Super I/O chip initialising. w83697ug/uf WDT: No W83697UG/UF could be found w83697ug/uf WDT: Watchdog already running. Resetting timeout to 60 sec w83697ug/uf WDT: cannot register miscdev on minor=130 (err=-16) Patch propagates the error back to wdt_init(). Signed-off-by: Eric Lammerts Signed-off-by: Wim Van Sebroeck commit 9626dd75c57360666f4cdcb660c1672ee9f952e8 Author: Wim Van Sebroeck Date: Wed Jan 21 11:13:11 2009 +0000 [WATCHDOG] cpwd.c & riowd.c - unlocked_ioctl Switch to unlocked_ioctl Signed-off-by: Wim Van Sebroeck commit 7834cd5ae145c9a74d284cef073b96ee5f7f2295 Author: Heiko Carstens Date: Tue Mar 24 20:57:19 2009 +0000 qeth: fix wait_event_timeout handling wait_event_timeout just takes the numnber of jiffies to wait as an argument. That value does not include jiffies itself. Signed-off-by: Heiko Carstens Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 8e98ac48d06068470f1b954e599cf7b706cfceba Author: Ursula Braun Date: Tue Mar 24 20:57:18 2009 +0000 qeth: check for completion of a running recovery When a recovery is started for a qeth device, additional invocations to change a mac address, to configure a VLAN interface on top, or to add multicast addresses should wait till recovery is finished, otherwise recovery might fail. Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 932e1583c1e52de6757122b92511e69ee0da1c78 Author: Klaus-Dieter Wacker Date: Tue Mar 24 20:57:17 2009 +0000 qeth: unregister MAC addresses during recovery. qeth: Unregister MAC addresses from device (layer 2) during recovery cycle. When the device is set online the MAC addresses are registered again on the device. Signed-off-by: Klaus-Dieter Wacker Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 64ef8957986f6a04f61e7c95fa6ffeb3a86a6661 Author: Frank Blaschka Date: Tue Mar 24 20:57:16 2009 +0000 qeth: remove EDDP Performance measurements showed EDDP does not lower CPU costs but increase them. So we dump out EDDP code from qeth driver. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit f61a0d0538ca62547a127fd270d9f3c6e713027f Author: Frank Blaschka Date: Tue Mar 24 20:57:15 2009 +0000 qeth: add statistics for tx csum Add statistics counter for software tx checksumming. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 7f6d95e7bd82b38e669a43a2d2d410d0b5318684 Author: Kay Sievers Date: Tue Mar 24 20:57:14 2009 +0000 qeth: struct device - replace bus_id with dev_name(), dev_set_name() Cc: Martin Schwidefsky Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers Signed-off-by: Heiko Carstens Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 23d12e2bdd4f73d90c8c29674c531aa45eecf27f Author: David S. Miller Date: Wed Mar 25 00:03:16 2009 -0700 rndis_wlan: Fix build with netdev_ops compat disabled. Instead of storing a private ->set_multicast_list, just have a private netdev ops. Signed-off-by: David S. Miller commit 67fca028f1535e510689d2e444b0289e264e05c1 Author: Daniel Mack Date: Tue Mar 24 23:32:03 2009 -0700 ax88796: Add method to take MAC from platform data Implement a way to provide the MAC address for ax88796 devices from their platform data. Boards might decide to set the address programmatically, taken from boot tags or other sources. Signed-off-by: Daniel Mack Signed-off-by: David S. Miller commit 47cb035560a41bd1bd3db506eeab93088815203e Author: Daniel Mack Date: Tue Mar 24 23:31:22 2009 -0700 drivers/net/ax88796.c: take IRQ flags from platform_device This patch adds support to the ax88796 ethernet driver to take IRQ flags given by the platform_device definition. Signed-off-by: Daniel Mack Signed-off-by: David S. Miller commit bef28b11597a4da9ef3b8a51776b8cb14b427e5e Author: Bruce Allan Date: Tue Mar 24 23:28:02 2009 -0700 e1000e: add support for 82574 device ID 0x10F6 Add device ID for a new variant of the 82574 adapter. Signed-off-by: Bruce Allan Acked-by: John Ronciak Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 09f98bafea792644f2dea39eb080aa57d854f5b3 Merge: d1fbe04... 9c3da09... e538052... 71d98b4... 1aedb77... 4780c19... 6b708b3... a6a4777... 270b8b8... 9d5ab13... 6432f36... Author: Roland Dreier Date: Tue Mar 24 20:44:41 2009 -0700 Merge branches 'cxgb3', 'endian', 'ipath', 'ipoib', 'iser', 'mad', 'misc', 'mlx4', 'mthca', 'nes' and 'sysfs' into for-next commit d1fbe04eee32ed2642cff139b8592866f1d43f41 Author: Steve Wise Date: Tue Mar 24 20:44:18 2009 -0700 RDMA/cxgb3: Enforce required firmware The cxgb3 NIC driver can handle more firmware versions than iw_cxgb3, and since commit 8207befa ("cxgb3: untie strict FW matching") cxgb3 will load with firmware versions that iw_cxgb3 can't handle. The FW major number indicates a specific interface between the FW and iw_cxgb3. Thus if the major number of the running firmware does not match the required version compiled into iw_cxgb3, then iw_cxgb3 must not register that device. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit c96f1732e25362d10ee7bcac1df8412a2e6b7d23 Author: Alan Cox Date: Tue Mar 24 10:23:46 2009 +0000 [libata] Improve timeout handling On a timeout call a device specific handler early in the recovery so that we can complete and process successful commands which timed out due to IRQ loss or the like rather more elegantly. [Revised to exclude the timeout handling on a few devices that inherit from SFF but are not SFF enough to use the default timeout handler] Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit b2f5e7cd3dee2ed721bf0675e1a1ddebb849aee6 Author: Vlad Yasevich Date: Tue Mar 24 16:24:51 2009 +0000 ipv6: Fix conflict resolutions during ipv6 binding The ipv6 version of bind_conflict code calls ipv6_rcv_saddr_equal() which at times wrongly identified intersections between addresses. It particularly broke down under a few instances and caused erroneous bind conflicts. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 63d9950b08184e6531adceb65f64b429909cc101 Author: Vlad Yasevich Date: Tue Mar 24 16:24:50 2009 +0000 ipv6: Make v4-mapped bindings consistent with IPv4 Binding to a v4-mapped address on an AF_INET6 socket should produce the same result as binding to an IPv4 address on AF_INET socket. The two are interchangable as v4-mapped address is really a portability aid. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 0f8d3c7ac3693d7b6c731bf2159273a59bf70e12 Author: Vlad Yasevich Date: Tue Mar 24 16:24:49 2009 +0000 ipv6: Allow ipv4 wildcard binds after ipv6 address binds The IPv4 wildcard (0.0.0.0) address does not intersect in any way with explicit IPv6 addresses. These two should be permitted, but the IPv4 conflict code checks the ipv6only bit as part of the test. Since binding to an explicit IPv6 address restricts the socket to only that IPv6 address, the side-effect is that the socket behaves as v6-only. By explicitely setting ipv6only in this case, allows the 2 binds to succeed. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 783ed5a78373253052bc61a3c5c8b9f17af4e3c6 Author: Vlad Yasevich Date: Tue Mar 24 16:24:48 2009 +0000 ipv6: Disallow binding to v4-mapped address on v6-only socket. A socket marked v6-only, can not receive or send traffic to v4-mapped addresses. Thus allowing binding to v4-mapped address on such a socket makes no sense. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 3d47aa8e7e7b2aa09256590388aa8dddc79280f9 Author: Alan Cox Date: Tue Mar 24 10:23:19 2009 +0000 [libata] Drain data on errors If the device is signalling that there is data to drain after an error we should read the bytes out and throw them away. Without this some devices and controllers get wedged and don't recover. Based on earlier work by Mark Lord Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit c0f2ee34a5a0b79fd98d965ad8ae765d4639bfa5 Author: Alan Cox Date: Tue Mar 24 10:22:25 2009 +0000 pata_sc1200: Activate secondary channel Implement serialize and turn on slave channel Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 140d6fed71a659f39f0b130b6ac8f8d28600bf60 Author: Alan Cox Date: Tue Mar 24 10:21:49 2009 +0000 pata_artop: Serializing support Enable both ports on the 6210 and serialize them Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 208f2a886a2f6cf329c9fcbf8d29a0dd245cc763 Author: David Milburn Date: Fri Mar 20 14:14:23 2009 -0500 [libata] ahci: correct enclosure LED state save ahci_transmit_led_message saves off the led_state with a value that includes the port number OR'd in, this incorrect value maybe reported back in ahci_led_store. For instance, if you turn off all the leds for port 1 and cat the value back it will report 1 instead of 0. # echo 0 > /sys/class/scsi_host/host1/em_message # cat /sys/class/scsi_host/host1/em_message 1 Signed-off-by: David Milburn Signed-off-by: Jeff Garzik commit e18086d69cb5bb864749a0637f6ac573aa89d5ea Author: Mark Lord Date: Thu Mar 19 13:32:21 2009 -0400 [libata] More robust parsing for IDENTIFY DEVICE multi_count field Make libata more robust when parsing the multi_count field from a drive's identify data. This prevents us from attempting to use dubious multi_count values ad infinitum. Reset dev->multi_count to zero and reprobe it each time through this routine, as it can change on device reset. Also ensure that the reported "maximum" value is valid and is a power of two, and that the reported "count" value is valid and also a power of two. And that the "count" value is not greater than the "maximum" value. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 000b344f4ca7828ee43940255c8bbb32e2c7dbec Author: Mark Lord Date: Sun Mar 15 11:33:19 2009 -0400 sata_mv: fix LED blinking for SoC+NCQ For Marvell SoC chips, the HDD LED does not blink when there is disk I/O if NCQ is enabled. Add a quirk that enables blink mode for the LED while NCQ is enabled on any port of a SoC host controller. Normal LED function is restored when NCQ is not enabled on any port. The code to enable the blink mode is based on earlier code and suggestions from Frans Pop, Saeed Bishara, and possibly others. Signed-off-by: Mark Lord Tested-by: Frans Pop Signed-off-by: Jeff Garzik commit 6abf4678261218938ccdac90767d34ce9937634f Author: Mark Lord Date: Wed Mar 11 00:56:00 2009 -0400 sata_mv: optimize IRQ coalescing for 8-port chips Enable use of the "all ports" IRQ coalescing optimization for GEN_II / GEN_IIE chips that have dual host-controllers (8-ports). Currently only the 6081 chip qualifies, but other chips may come along someday. Rather than each half of the chip having to satisfy a local set of coalescing thresholds, use of this feature groups all ports together under a single set of thresholds. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 2b748a0a344847fe6b924407bbe153e1878c9f09 Author: Mark Lord Date: Tue Mar 10 22:01:17 2009 -0400 sata_mv: implement IRQ coalescing (v2) Add IRQ coalescing to sata_mv (off by default). This feature can reduce total interrupt overhead for RAID setups in some situations, by deferring the interrupt signal until one or both of: a) a specified io_count (completed SATA commands) is achieved, or b) a specified time interval elapses after an IO completion. For now, module parameters are used to set the irq_coalescing_io_count and irq_coalescing_usecs (timeout) globally. These may eventually be supplemented with sysfs attributes, so that thresholds can be set on-the-fly and on a per-chip (or even per-host_controller) basis. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 40f21b1124a9552bc093469280eb8239dc5f73d7 Author: Mark Lord Date: Tue Mar 10 18:51:04 2009 -0400 sata_mv: cosmetic preparations for IRQ coalescing Various cosmetic changes in preparation for the IRQ coalescing feature. Note that the various MV_IRQ_COAL_* definitions are restored/renamed in the folloup patch which adds IRQ coalescing to the driver. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 9223d01b2fdf638a73888ad73a1784fca3454c1e Author: Florian Fainelli Date: Fri Mar 13 15:41:43 2009 +0100 pata-rb532-cf: platform_get_irq() fix ignored failure platform_get_irq() can return -ENXIO, but since 'irq' is an unsigned int, it does not show when the IRQ resource wasn't found. Make irq an int so that we can use a single variable to test the platform_get_irq() return value. Signed-off-by: Roel Kluin Signed-off-by: Phil Sutter Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit b2a034cf16a1642e647497c70c1cd9c09bf39412 Author: Erik Inge Bolsø Date: Sat Mar 14 23:08:20 2009 +0100 pata_efar: fix *dma_mask According to Alan: >and yes the EFAR does UDMA66. mwdma: >Yep - wrong comment. The EFAR is a sort of clone of the PIIX and I >copied the comment while EFAR don't appear to have copied the >limitation Signed-off-by: Erik Inge Bolsø Signed-off-by: Jeff Garzik commit aef37d8d80d8c027f03d362a97afe3f6a42bfbb4 Author: Erik Inge Bolsø Date: Sat Mar 14 23:07:33 2009 +0100 pata_radisys: fix mwdma_mask to exclude mwdma0 As noted by Alan: >Your suspicions are correct here btw - the device can only do MWDMA1 and >MWDMA2 (much like some PIIX devices) Signed-off-by: Erik Inge Bolsø Signed-off-by: Jeff Garzik commit 14bdef982caeda19afe34010482867c18217c641 Author: Erik Inge Bolsø Date: Sat Mar 14 21:38:24 2009 +0100 [libata] convert drivers to use ata.h mode mask defines No functional changes in this patch. Signed-off-by: Erik Inge Bolsø Signed-off-by: Jeff Garzik commit 22ddbd1e036ce035c1cccb2496aefafac79aba2c Author: Erik Inge Bolsø Date: Sat Mar 14 21:37:48 2009 +0100 include/linux/ata.h: add some more transfer masks Signed-off-by: Erik Inge Bolsø Signed-off-by: Jeff Garzik commit d2f9c0614e664708978c53eca4a5963e92830e88 Author: Maciej Rutecki Date: Fri Mar 20 00:06:46 2009 +0100 ahci: Blacklist HP Compaq 6720s that spins off disks during ACPI power off Blacklist HP Compaq 6720s so that it doesn't play a "spin down, spin up, spin down" ping-pong with the hard disk during system power off. Signed-off-by: Maciej Rutecki Signed-off-by: Rafael J. Wysocki Signed-off-by: Jeff Garzik commit 70f8b79cf3a2eb892a01271fdfbb1903c0c982a8 Author: Mark Lord Date: Wed Feb 25 15:19:20 2009 -0500 [libata] sata_mv: Implement direct FIS transmission via mv_qc_issue_fis(). This is initially needed to work around NCQ errata, whereby the READ_LOG_EXT command sometimes fails when issued in the traditional (sff) fashion. Portions of this code will likely be reused for implementation of the target mode feature later on. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 1a660164c291f41b2aa853a7269b310933574ef9 Author: Mark Lord Date: Wed Feb 25 15:18:32 2009 -0500 [libata] Export ata_pio_queue_task() so that it can be used from sata_mv. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit d16ab3f633b75aac1cf42b00355cd9aa65033dcc Author: Mark Lord Date: Wed Feb 25 15:17:43 2009 -0500 [libata] sata_mv: Add a new mv_sff_check_status() function to sata_mv. This is necessary for use with the upcoming "mv_qc_issue_fis()" patch, but is being added separately here for easier code review. When using command issue via the "mv_qc_issue_fis()" mechanism, the initial ATA_BUSY bit does not show in the ATA status (shadow) register. This can confuse libata! So here we add a hook to fake ATA_BUSY for that situation, until the first time a BUSY, DRQ, or ERR bit is seen. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 42ed893d8011264f9945c2f54055b47c298ac53e Author: Mark Lord Date: Wed Feb 25 15:15:39 2009 -0500 [libata] sata_mv: Tighten up interrupt masking in mv_qc_issue() so that it doesn't miss any protocols. Handle future cases where a qc is specially marked for polled issue or where a particular chip version prefers interrupts over polling for PIO. This mimics the polling decision logic from ata_sff_qc_issue(). Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit c01e8a23128c746f23088db836bd4c820f3eb0b4 Author: Mark Lord Date: Wed Feb 25 15:14:48 2009 -0500 [libata] sata_mv: Enable use of (basic) DMA for ATAPI on GEN_IIE chips This also gets rid of any need for mv_mode_filter(). Using basic DMA on GEN_IIE requires setting an undocumented bit in an undocumented register. For safety, we clear that bit again when switching back to EDMA mode. To avoid a performance penalty when switching modes, we cache the register in port_priv, as already done for other regs. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 08da175937a35d34a83eaefbb3458472eb1a89d4 Author: Mark Lord Date: Wed Feb 25 15:13:03 2009 -0500 [libata] sata_mv: cache frequently-accessed registers Maintain a local (mv_port_priv) cache of frequently accessed registers, to avoid having to re-read them (very slow) on every transistion between EDMA and non-EDMA modes. This speeds up things like flushing the drive write cache, and anything using basic DMA transfers. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit a5bfc4714b3f01365aef89a92673f2ceb1ccf246 Author: Tejun Heo Date: Fri Jan 23 11:31:39 2009 +0900 ahci: drop intx manipulation on msi enable There's no need to turn off intx explicitly on msi enable. This is automatically handled by pci. Drop it. This might be needed on machines if the BIOS turns intx off during boot. However, there's no evidence of such behavior for ahci and the only such case seems to be ICH5 PATA according to ata_piix. Also, given the way ahci operates, it's highly unlikely BIOS ever disables IRQ for the controller. However, as this change has slight possibility of introducing failure, please schedule it for #upstream. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 6be976e79db3ba691b657476a8bf4a635e5586f9 Author: Phil Sutter Date: Tue Jan 27 14:35:53 2009 +0100 pata-rb532-cf: drop custom freeze and thaw I'm not quite sure what freezing and thawing is used for. Tests showed that the port is being frozen at initialisation state and thawed right afterwards, then the functions were not called anymore. Dropping the complete custom code for handling the frozen state seems to work at least for a standard use case including mounting a partition, copying some files in it (in parallel) and finally removing them and unmounting the partition. Signed-off-by: Phil Sutter Signed-off-by: Jeff Garzik commit 180bd147f18316d92bd5f59aebc9932cabc03edd Author: Phil Sutter Date: Tue Jan 27 14:35:52 2009 +0100 pata-rb532-cf: use ata_sff_data_xfer32() The biggest difference between rb532_pata_data_xfer() and ata_sff_data_xfer32() is the call to ata_sff_pause() at the end of rb532_pata_data_xfer() which I suppose to be unnecessary since it works without. I've also tested using ata_sff_data_xfer() as replacement, but since we know that the driver supports 32bit IO, using the optimised version should be safe. Signed-off-by: Phil Sutter Signed-off-by: Jeff Garzik commit bff9ad3c4c8fff340854d3912196ed470f94602c Author: Phil Sutter Date: Tue Jan 27 14:35:51 2009 +0100 pata-rb532-cf: use ata_sff_exec_command() The only difference between rb532_pata_exec_command() and ata_sff_exec_command() is added debugging output, so it can be dropped and the standard op used instead. Signed-off-by: Phil Sutter Signed-off-by: Jeff Garzik commit 96b34ce7cafa0888580698d199b9fac6ad9f9a2e Author: Phil Sutter Date: Tue Jan 27 14:35:50 2009 +0100 pata-rb532-cf: replace rb532_pata_finish_io() Since the delay used internally is just the same as ata_sff_pause() uses, rb532_pata_finish_io() does exactly the same as ata_sff_pause() and thus can be replaced by the later one. Signed-off-by: Phil Sutter Signed-off-by: Jeff Garzik commit 84bcbeebcfd283c3f4804287ed4610c3a18e1590 Author: Mark Lord Date: Fri Jan 30 21:40:48 2009 -0500 sata_mv: remove leftovers Remove redundant code left over from the earlier patch 04/07. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 66e57a2cb0c538d4f84a7233c224735fe1eaa672 Author: Mark Lord Date: Fri Jan 30 18:52:58 2009 -0500 sata_mv: optimize use of mv_edma_cfg Try and avoid unnecessary reconfiguration of the EDMA config register on every single non-EDMA I/O operation, by moving the call to mv_edma_cfg() into mv_stop_edma(). It must then also be invoked from mv_hardreset() and from mv_port_start(). Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit da14265e776f35067045b8555b5f5f7521e50bc4 Author: Mark Lord Date: Fri Jan 30 18:51:54 2009 -0500 sata_mv: introduce support for ATAPI devices Add ATAPI support to sata_mv, using sff DMA for GEN_II chipsets, and plain old PIO for GEN_IIE. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 32cd11a61007511ddb38783deec8bb1aa6735789 Author: Mark Lord Date: Sun Feb 1 16:50:32 2009 -0500 sata_mv: mv_fill_sg fixes v2 Fix mv_fill_sg() to zero out the reserved word (required for ATAPI), and to include a memory barrier. This may also help with problems reported by Jens on the PPC platform. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 95db505125fb7bc624b7c3b6747bbeaebbffc2e4 Author: Mark Lord Date: Fri Jan 30 18:49:29 2009 -0500 sata_mv: update ata_qc_from_tag Update the logic in ata_qc_from_tag() to match that used in similar places elsewhere in libata. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit f48765ccb48a62596b664aa88a2b0f943c12c0e1 Author: Mark Lord Date: Fri Jan 30 18:48:41 2009 -0500 sata_mv: restructure mv_qc_issue Rearrange logic in mv_qc_issue() to handle protocols other than ATA_PROT_DMA, ATA_PROT_NCQ, and ATA_PROT_PIO. This is in preparation for later enabling ATAPI support. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 00b81235aa0368f84c0e704bec4142cd8c516ad5 Author: Mark Lord Date: Fri Jan 30 18:47:51 2009 -0500 sata_mv: rearrange mv_start_dma() and friends Rearrange mv_start_dma() and friends, in preparation for adding non-EDMA DMA modes, and non-EDMA interrupts, to the driver. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 91b1a84c10869e2e46a576e5367de3166bff8ecc Author: Mark Lord Date: Fri Jan 30 18:46:39 2009 -0500 sata_mv: cleanup chipset GENeration FLAGS Clean up the chipset GENeration FLAGS, and rename them for consistency with other uses of GEN_XX within sata_mv. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 4097f663cbe9e58de7ebed222f8af33267f297a8 Author: Sathya Perla Date: Tue Mar 24 16:40:13 2009 -0700 be2net: cleanup rx/tx rate calculations Hi, Pls accept this patch to cleanup rx/tx rate calculations as follows: - check for jiffies wraparound - remove typecast of a denominator - do rate calculation only in workqueue context periodically Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit c80dd2da736ba235c2ca5dcaa00aac6907786c5b Merge: 142071b... 534f81a... Author: David S. Miller Date: Tue Mar 24 16:38:53 2009 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 commit e6e66b02e11563abdb7f69dcb7a2efbd8d577e77 Author: Greg Banks Date: Wed Mar 11 21:07:28 2009 +1100 Dynamic debug: fix pr_fmt() build error When CONFIG_DYNAMIC_DEBUG is enabled, allow callers of pr_debug() to provide their own definition of pr_fmt() even if that definition uses tricks like #define pr_fmt(fmt) "%s:" fmt, __func__ Signed-off-by: Greg Banks Cc: Jason Baron Acked-by: Geert Uytterhoeven Signed-off-by: Greg Kroah-Hartman commit 9898abb3d23311fa227a7f46bf4e40fd2954057f Author: Greg Banks Date: Fri Feb 6 12:54:26 2009 +1100 Dynamic debug: allow simple quoting of words Allow simple quoting of words in the dynamic debug control language. This allows more natural specification when using the control language to match against printk formats, e.g #echo -n 'format "Setting node for non-present cpu" +p' > /mnt/debugfs/dynamic_debug/control instead of #echo -n 'format Setting\040node\040for\040non-present\040cpu +p' > /mnt/debugfs/dynamic_debug/control Adjust the dynamic debug documention to describe that and provide a new example. Adjust the existing examples in the documentation to reflect the current whitespace escaping behaviour when reading the control file. Fix some minor documentation trailing whitespace. Signed-off-by: Greg Banks Acked-by: Jason Baron Signed-off-by: Greg Kroah-Hartman commit 86151fdf38b3795f292b39defbff39d2684b9c8c Author: Jason Baron Date: Thu Feb 5 11:53:15 2009 -0500 dynamic debug: update docs updates the documentation for 'dynamic debug' feature. Signed-off-by: Greg Banks Signed-off-by: Jason Baron Signed-off-by: Greg Kroah-Hartman commit e9d376f0fa66bd630fe27403669c6ae6c22a868f Author: Jason Baron Date: Thu Feb 5 11:51:38 2009 -0500 dynamic debug: combine dprintk and dynamic printk This patch combines Greg Bank's dprintk() work with the existing dynamic printk patchset, we are now calling it 'dynamic debug'. The new feature of this patchset is a richer /debugfs control file interface, (an example output from my system is at the bottom), which allows fined grained control over the the debug output. The output can be controlled by function, file, module, format string, and line number. for example, enabled all debug messages in module 'nf_conntrack': echo -n 'module nf_conntrack +p' > /mnt/debugfs/dynamic_debug/control to disable them: echo -n 'module nf_conntrack -p' > /mnt/debugfs/dynamic_debug/control A further explanation can be found in the documentation patch. Signed-off-by: Greg Banks Signed-off-by: Jason Baron Signed-off-by: Greg Kroah-Hartman commit 095160aee954688a9bad225952c4bee546541e19 Author: Hugh Dickins Date: Mon Mar 23 01:41:27 2009 +0000 sysfs: fix some bin_vm_ops errors Commit 86c9508eb1c0ce5aa07b5cf1d36b60c54efc3d7a "sysfs: don't block indefinitely for unmapped files" in linux-next crashes the PowerMac G5 when X starts up. It's caught out by the way powerpc's pci_mmap of legacy_mem uses shmem_zero_setup(), substituting a new vma->vm_file whose private_data no longer points to the bin_buffer (substitution done because some versions of X crash if that mmap fails). The fix to this is straightforward: the original vm_file is fput() in that case, so this mmap won't block sysfs at all, so just don't switch over to bin_vm_ops if vm_file has changed. But more fixes made before realizing that was the problem:- It should not be an error if bin_page_mkwrite() finds no underlying page_mkwrite(). Check that a file already mmap'ed has the same underlying vm_ops _before_ pointing vma->vm_ops at bin_vm_ops. If the file being mmap'ed is a shmem/tmpfs file, don't fail the mmap on CONFIG_NUMA=y, just because that has a set_policy and get_policy: provide bin_set_policy, bin_get_policy and bin_migrate. Signed-off-by: Hugh Dickins Acked-by: Eric Biederman Signed-off-by: Greg Kroah-Hartman commit f520360d93cdc37de5d972dac4bf3bdef6a7f6a7 Author: Arjan van de Ven Date: Thu Mar 19 09:09:05 2009 -0700 kobject: don't block for each kobject_uevent Right now, the kobject_uevent code blocks for each uevent that's being generated, due to using (for hystoric reasons) UHM_WAIT_EXEC as flag to call_usermode_helper(). Specifically, the effect is that each uevent that is being sent causes the code to wake up keventd, then block until keventd has processed the work. Needless to say, this happens many times during the system boot. This patches changes that to UHN_NO_WAIT (brilliant name for a constant btw) so that we only schedule the work to fire the uevent message, but do not wait for keventd to process the work. This removes one of the bottlenecks during boot; each one of them is only a small effect, but the sum of them does add up. [Note, distros that need this are broken, they should be setting CONFIG_UEVENT_HELPER_PATH to "", that way this code path will never be excuted at all -- gregkh] Signed-off-by: Arjan van de Ven Signed-off-by: Greg Kroah-Hartman commit 669420644c79c207f83fdf9105ae782867e2991f Author: Alex Chiang Date: Fri Mar 13 12:07:36 2009 -0600 sysfs: only allow one scheduled removal callback per kobj The only way for a sysfs attribute to remove itself (without deadlock) is to use the sysfs_schedule_callback() interface. Vegard Nossum discovered that a poorly written sysfs ->store callback can repeatedly schedule remove callbacks on the same device over and over, e.g. $ while true ; do echo 1 > /sys/devices/.../remove ; done If the 'remove' attribute uses the sysfs_schedule_callback API and also does not protect itself from concurrent accesses, its callback handler will be called multiple times, and will eventually attempt to perform operations on a freed kobject, leading to many problems. Instead of requiring all callers of sysfs_schedule_callback to implement their own synchronization, provide the protection in the infrastructure. Now, sysfs_schedule_callback will only allow one scheduled callback per kobject. On subsequent calls with the same kobject, return -EAGAIN. This is a short term fix. The long term fix is to allow sysfs attributes to remove themselves directly, without any of this callback hokey pokey. [cornelia.huck@de.ibm.com: s390 ccwgroup bits] Reported-by: vegard.nossum@gmail.com Signed-off-by: Alex Chiang Acked-by: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit ffa6a7054d172a2f57248dff2de600ca795c5656 Author: Cornelia Huck Date: Wed Mar 4 12:44:00 2009 +0100 Driver core: Fix device_move() vs. dpm list ordering, v2 dpm_list currently relies on the fact that child devices will be registered after their parents to get a correct suspend order. Using device_move() however destroys this assumption, as an already registered device may be moved under a newly registered one. This patch adds a new argument to device_move(), allowing callers to specify how dpm_list should be adapted. Signed-off-by: Cornelia Huck Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 60530afe1ee8a5532cb09d0ab5bc3f1a6495b780 Author: Zhenwen Xu Date: Tue Mar 3 18:36:02 2009 +0800 Driver core: some cleanup on drivers/base/sys.c do some cleanup on drivers/base/sys.c Signed-off-by: Zhenwen Xu Signed-off-by: Greg Kroah-Hartman commit f67f129e519fa87f8ebd236b6336fe43f31ee141 Author: Ming Lei Date: Sun Mar 1 21:10:49 2009 +0800 Driver core: implement uevent suppress in kobject This patch implements uevent suppress in kobject and removes it from struct device, based on the following ideas: 1,Uevent sending should be one attribute of kobject, so suppressing it in kobject layer is more natural than in device layer. By this way, we can do it for other objects embedded with kobject. 2,It may save several bytes for each instance of struct device.(On my omap3(32bit ARM) based box, can save 8bytes per device object) This patch also introduces dev_set|get_uevent_suppress() helpers to set and query uevent_suppress attribute in case to help kobject as private part of struct device in future. [This version is against the latest driver-core patch set of Greg,please ignore the last version.] Signed-off-by: Ming Lei Signed-off-by: Greg Kroah-Hartman commit 4995f8ef9d3aac72745e12419d7fbaa8d01b1d81 Author: Kay Sievers Date: Mon Mar 9 14:18:52 2009 +0100 vcs: hook sysfs devices into object lifetime instead of "binding" During bootup performance tracing I noticed many occurrences of vca* device creation and removal, leading to the usual userspace uevent processing, which are, in this case, rather pointless. A simple test showing the kernel timing (not including all the work userspace has to do), gives us these numbers: $ time for i in `seq 1000`; do echo a > /dev/tty2; done real 0m1.142s user 0m0.015s sys 0m0.540s If we move the hook for the vcs* driver core devices from the tty "binding" to the vc allocation/deallocation, which is what the vcs* devices represent, we get the following numbers: $ time for i in `seq 1000`; do echo a > /dev/tty2; done real 0m0.152s user 0m0.030s sys 0m0.072s Cc: Alan Cox Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit ce21c7bcd796fc4f45d48781b7e85f493cc55ee5 Author: Ming Lei Date: Fri Mar 13 23:06:59 2009 +0800 driver core: fix passing platform_data We will remove platform_data field from struct device until all platform devices pass its specific data from platfom_device and all platform drivers use platform specific data passed by platform_device->platform_data. This kind of conversion will need a long time, for thousands of files is affected. To make the conversion easily, we allow platform specific data passed by struct device or struct platform_device and platform driver may use it from struct device or struct platform_device. Signed-off-by: Ming Lei Signed-off-by: Greg Kroah-Hartman commit 006f4571a15fae3a0575f2a0f9e9b63b3d1012f8 Author: Ming Lei Date: Sun Mar 8 23:13:32 2009 +0800 driver core: move platform_data into platform_device This patch moves platform_data from struct device into struct platform_device, based on the two ideas: 1. Now all platform_driver is registered by platform_driver_register, which makes probe()/release()/... of platform_driver passed parameter of platform_device *, so platform driver can get platform_data from platform_device; 2. Other kind of devices do not need to use platform_data, we can decrease size of device if moving it to platform_device. Taking into consideration of thousands of files to be fixed and they can't be finished in one night(maybe it will take a long time), so we keep platform_data in device to allow two kind of cases coexist until all platform devices pass its platfrom data from platform_device->platform_data. All patches to do this kind of conversion are welcome. Signed-off-by: Ming Lei Signed-off-by: Greg Kroah-Hartman commit e0edd3c65aa5b53e20280565a7ce11675eb7ed6b Author: Eric W. Biederman Date: Wed Mar 4 11:57:20 2009 -0800 sysfs: don't block indefinitely for unmapped files. Modify sysfs bin files so that we can remove the bin file while they are still mapped. When the kobject is removed we unmap the bin file and arrange for future accesses to the mapping to receive SIGBUS. Implementing this prevents a nasty DOS when pci devices are hot plugged and unplugged. Where if any of their resources were mmaped the kernel could not free up their pci resources or release their pci data structures. [akpm@linux-foundation.org: remove unused var] Signed-off-by: Eric W. Biederman Cc: Jesse Barnes Acked-by: Tejun Heo Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit ae1b41715ee2aae356fbcca032838b71d70b855f Author: Greg Kroah-Hartman Date: Tue Dec 16 12:26:21 2008 -0800 driver core: move knode_bus into private structure Nothing outside of the driver core should ever touch knode_bus, so move it out of the public eye. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 8940b4f312dced51b45004819b776ec3aa7fcd5d Author: Greg Kroah-Hartman Date: Tue Dec 16 12:25:49 2008 -0800 driver core: move knode_driver into private structure Nothing outside of the driver core should ever touch knode_driver, so move it out of the public eye. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit f791b8c836307b58cbf62133a6a772ed1a92fb33 Author: Greg Kroah-Hartman Date: Tue Dec 16 12:24:56 2008 -0800 driver core: move klist_children into private structure Nothing outside of the driver core should ever touch klist_children, or knode_parent, so move them out of the public eye. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit fb069a5d132fb926ed17af3211a114ac7cf27d7a Author: Greg Kroah-Hartman Date: Tue Dec 16 12:23:36 2008 -0800 driver core: create a private portion of struct device This is to be used to move things out of struct device that no code outside of the driver core should ever touch. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit b23530ebc339c4092ae2c9f37341a5398fea8b89 Author: Ming Lei Date: Sat Feb 21 16:45:07 2009 +0800 driver core: remove polling for driver_probe_done(v5) This patch removes 100ms polling for driver_probe_done in wait_for_device_probe(), and uses wait_event() instead. Removing polling in fs initialization may lead to a faster boot. This patch also changes the return type of wait_for_device_done() from int to void. This patch is against Arjan's patch in linux-next tree. Signed-off-by: Ming Lei Acked-by: Cornelia Huck Reviewed-by: Arjan van de Ven Signed-off-by: Greg Kroah-Hartman commit 04256b4a8fc73f54cd14f20867882c299728a446 Author: Eric W. Biederman Date: Wed Feb 11 13:20:23 2009 -0800 sysfs: reference sysfs_dirent from sysfs inodes The sysfs_dirent serves as both an inode and a directory entry for sysfs. To prevent the sysfs inode numbers from being freed prematurely hold a reference to sysfs_dirent from the sysfs inode. [akpm@linux-foundation.org: add comment] Signed-off-by: Eric W. Biederman Cc: Tejun Heo Cc: Al Viro Cc: Cornelia Huck Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 425cb02912d1095febfeaf8d379af7b2ac9e4a89 Author: Alex Chiang Date: Thu Feb 12 10:56:59 2009 -0700 sysfs: sysfs_add_one WARNs with full path to duplicate filename sysfs: sysfs_add_one WARNs with full path to duplicate filename As a debugging aid, it can be useful to know the full path to a duplicate file being created in sysfs. We now will display warnings such as: sysfs: cannot create duplicate filename '/foo' when attempting to create multiple files named 'foo' in the sysfs root, or: sysfs: cannot create duplicate filename '/bus/pci/slots/5/foo' when attempting to create multiple files named 'foo' under a given directory in sysfs. The path displayed is always a relative path to sysfs_root. The leading '/' in the path name refers to the sysfs_root mount point, and should not be confused with the "real" '/'. Thanks to Alex Williamson for essentially writing sysfs_pathname. Cc: Alex Williamson Signed-off-by: Alex Chiang Signed-off-by: Greg Kroah-Hartman commit f48f3febb2cbfd0f2ecee7690835ba745c1034a4 Author: Dave Young Date: Sat Feb 14 21:23:22 2009 +0800 driver-core: do not register a driver with bus_type not registered If the bus_type is not registerd, driver_register to that bus will cause oops. I found this bug when test built-in usb serial drivers (ie. aircable driver) with 'nousb' cmdline params. In this patch: 1. set the bus->p=NULL when bus_register failed and unregisterd. 2. if bus->p is NULL, driver_register BUG_ON will be triggered. Signed-off-by: Dave Young Signed-off-by: Greg Kroah-Hartman commit e5779a583ddb9916b37cfbb916dc53ec2eaf0b9b Author: Geert Uytterhoeven Date: Wed Mar 11 09:23:52 2009 +0100 scsi/m68k: Kill NCR_700_detect() warnings The patch from Ming Lei entitled: platform driver: fix incorrect use of 'platform_bus_type' with 'struct devic introduced the following warnings on m68k, as `dev' is now a `struct platform_device *' instead of a `struct device *': | drivers/scsi/a4000t.c:64: warning: passing argument 3 of 'NCR_700_detect' from incompatible pointer type | drivers/scsi/mvme16x_scsi.c:67: warning: passing argument 3 of 'NCR_700_detect' from incompatible pointer type | drivers/scsi/bvme6000_scsi.c:61: warning: passing argument 3 of 'NCR_700_detect' from incompatible pointer type I think the below is missing (untested on real hardware). Signed-off-by: Geert Uytterhoeven Cc: Ming Lei Signed-off-by: Greg Kroah-Hartman commit 7a192ec334cab9fafe3a8665a65af398b0e24730 Author: Ming Lei Date: Fri Feb 6 23:40:12 2009 +0800 platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver' This patch fixes the bug reported in http://bugzilla.kernel.org/show_bug.cgi?id=11681. "Lots of device drivers register a 'struct device_driver' with the '.bus' member set to '&platform_bus_type'. This is wrong, since the platform_bus functions expect the 'struct device_driver' to be wrapped up in a 'struct platform_driver' which provides some additional callbacks (like suspend_late, resume_early). The effect may be that platform_suspend_late() uses bogus data outside the device_driver struct as a pointer pointer to the device driver's suspend_late() function or other hard to reproduce failures."(Lothar Wassmann) Signed-off-by: Ming Lei Acked-by: Henrique de Moraes Holschuh Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 6da2d377bba06c29d0bc41c8dee014164dec82a7 Author: Ian Abbott Date: Tue Feb 24 17:22:59 2009 +0000 UIO: Take offset into account when determining number of pages that can be mapped If a UIO memory region does not start on a page boundary but straddles one, the number of actual pages that overlap the memory region may be calculated incorrectly because the offset isn't taken into account. If userspace sets the mmap length to offset+size, it may fail with -EINVAL if UIO thinks it's trying to allocate too many pages. Signed-off-by: Ian Abbott Cc: Hans J. Koch Signed-off-by: Greg Kroah-Hartman commit 1bafeb378e915f39b1bf44ee0871823d6f402ea5 Author: Brandon Philips Date: Tue Jan 27 13:00:04 2009 -0800 uio: add the uio_aec driver UIO driver for the Adrienne Electronics Corporation PCI time code device. This device differs from other UIO devices since it uses I/O ports instead of memory mapped I/O. In order to make it possible for UIO to work with this device a utility, uioport, can be used to read and write the ports. uioport is designed to be a setuid program and checks the permissions of the /dev/uio* node and if the user has write permissions it will use iopl and out*/in* to access the device. [1] git clone git://ifup.org/philips/uioport.git Signed-off-by: Brandon Philips Signed-off-by: Hans J. Koch Signed-off-by: Greg Kroah-Hartman commit 8205779114e8f612549d191f8e151526a74ab9f2 Author: Hans J. Koch Date: Wed Jan 7 00:15:39 2009 +0100 UIO: Add name attributes for mappings and port regions If a UIO device has several memory mappings, it can be difficult for userspace to find the right one. The situation becomes even worse if the UIO driver can handle different versions of a card that have different numbers of mappings. Benedikt Spranger has such cards and pointed this out to me. Thanks, Bene! To address this problem, this patch adds "name" sysfs attributes for each mapping. Userspace can use these to clearly identify each mapping. The name string is optional. If a driver doesn't set it, an empty string will be returned, so this patch won't break existing drivers. The same problem exists for port region information, so a "name" attribute is added there, too. Signed-off-by: Hans J. Koch Signed-off-by: Greg Kroah-Hartman commit 57fee4a58fe802272742caae248872c392a60670 Author: Eric Miao Date: Wed Feb 4 11:52:40 2009 +0800 platform: introduce module id table for platform devices Now platform_device is being widely used on SoC processors where the peripherals are attached to the system bus, which is simple enough. However, silicon IPs for these SoCs are usually shared heavily across a family of processors, even products from different companies. This makes the original simple driver name based matching insufficient, or simply not straight-forward. Introduce a module id table for platform devices, and makes it clear that a platform driver is able to support some shared IP and handle slight differences across different platforms (by 'driver_data'). Module alias is handled automatically when a MODULE_DEVICE_TABLE() is defined. To not disturb the current platform drivers too much, the matched id entry is recorded and can be retrieved by platform_get_device_id(). Signed-off-by: Eric Miao Cc: Kay Sievers Cc: Ben Dooks Signed-off-by: Greg Kroah-Hartman commit 71b3e0c1ad90f28e34c105069175cbd4edb43dfa Author: Eric Miao Date: Sat Jan 31 22:47:44 2009 +0800 platform: make better use of to_platform_{device,driver}() macros This helps the code look more consistent and cleaner. Signed-off-by: Eric Miao Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 49b420a13ff95b449947181190b08367348e3e1b Author: Ming Lei Date: Wed Jan 21 23:27:47 2009 +0800 driver core: check bus->match without holding device lock This patch moves bus->match out from driver_probe_device and does not hold device lock to check the match between a device and a driver. The idea has been verified by the commit 6cd495860901, which leads to a faster boot. But the commit 6cd495860901 has the following drawbacks: 1),only does the quick check in the path of __driver_attach->driver_probe_device, not in other paths; 2),for a matched device and driver, check the same match twice. It is a waste of cpu ,especially for some drivers with long device id table (eg. usb-storage driver). This patch adds a helper of driver_match_device to check the match in all paths, and testes the match only once. Signed-off-by: Ming Lei Acked-by: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit 4a67a1bc0b3a0db017b560cee27370d141c58e25 Author: Eric W. Biederman Date: Wed Jan 21 11:55:11 2009 -0800 sysfs: Take sysfs_mutex when fetching the root inode. sysfs_get_inode ultimately calls sysfs_count_nlink when the a directory inode is fectched. sysfs_count_nlink needs to be called under the sysfs_mutex to guard against the unlikely but possible scenario that the root directory is changing as we are counting the number entries in it, and just in general to be consistent. Signed-off-by: Eric W. Biederman Acked-by: Tejun Heo Signed-off-by: Greg Kroah-Hartman commit 8231f2f99a5e5fc45a25e8de09fd1ab9711babf1 Author: Qinghuang Feng Date: Wed Jan 14 15:45:13 2009 +0800 SYSFS: use standard magic.h for sysfs SYSFS_MAGIC has been added into magic.h, so only use that definition in magic.h to avoid potential consistency problem. Signed-off-by: Qinghuang Feng Signed-off-by: Greg Kroah-Hartman commit 1fa5ae857bb14f6046205171d98506d8112dd74e Author: Kay Sievers Date: Sun Jan 25 15:17:37 2009 +0100 driver core: get rid of struct device's bus_id string array Now that all users of bus_id is gone, we can remove it from struct device. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 6866ac9db02ac1ec71f2aa720a1019581f69a725 Author: Sachin Sant Date: Mon Feb 16 19:10:11 2009 +0530 USB: FHCI: use dev_name() in place of bus_id. Replace references to bus_id with dev_name() to fix fhci driver build break. drivers/usb/host/fhci-hcd.c:586: error: struct device has no member named bus_id drivers/usb/host/fhci-hcd.c:653: error: struct device has no member named bus_id drivers/usb/host/fhci-dbg.c:111: error: struct device has no member named bus_id Signed-off-by: Sachin Sant Acked-by: Anton Vorontsov Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 54ca5412b5576fdb0a4ea4fedf6565bd6f34150c Author: Greg Kroah-Hartman Date: Mon Jan 26 09:12:12 2009 -0800 PS3: replace bus_id usage These simple debug statments should be using dev_dbg() instead of accessing bus_id directly (or they should use device_name). As bus_id is going away, this patch is necessary. Acked-by: Geoff Levand Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 5df5852446196c9713e897ab5f9b8a168d971a00 Author: Kay Sievers Date: Tue Mar 24 16:38:23 2009 -0700 usb: struct device - replace bus_id with dev_name(), dev_set_name() Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit 2c0f3e96f3fc7bbd1cb3caa601f19cf030c2b958 Author: Kay Sievers Date: Tue Mar 24 16:38:23 2009 -0700 wimax: struct device - replace bus_id with dev_name(), dev_set_name() Cc: inaky.perez-gonzalez@intel.com Cc: linux-wimax@intel.com Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit b2bf61f23f74d5b5aa35f242a2fe2f08ce4a53e7 Author: Kay Sievers Date: Tue Mar 24 16:38:23 2009 -0700 mfd: struct device - replace bus_id with dev_name(), dev_set_name() Cc: sameo@openedhand.com Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit cf43f4ab3a065296822bb245975d006707ccde8d Author: Kay Sievers Date: Tue Mar 24 16:38:23 2009 -0700 mca: struct device - replace bus_id with dev_name(), dev_set_name() Cc: James.Bottomley@HansenPartnership.com Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit 3e274bd02b04064632492a86fe99d3b613c74d84 Author: Kay Sievers Date: Tue Mar 24 16:38:23 2009 -0700 gpio: struct device - replace bus_id with dev_name(), dev_set_name() Cc: Michael Buesch Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit e537b2453ccf8884513201d6afcb62ca0763ecf0 Author: Kay Sievers Date: Tue Mar 24 16:38:22 2009 -0700 eisa: struct device - replace bus_id with dev_name(), dev_set_name() Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit dfbc90196dfb9a814e7f2e1f4c47aa425452d313 Author: Kay Sievers Date: Tue Mar 24 16:38:22 2009 -0700 dma: struct device - replace bus_id with dev_name(), dev_set_name() Cc: Dan Williams Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit 9591463af7ea3a2d723c7e39c08aa05ad27e7bfc Author: Kay Sievers Date: Tue Mar 24 16:38:22 2009 -0700 dio: struct device - replace bus_id with dev_name(), dev_set_name() Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit 9d6b4c82bffbe6de624ff86cb279166867f46365 Author: Kay Sievers Date: Tue Mar 24 16:38:22 2009 -0700 amba: struct device - replace bus_id with dev_name(), dev_set_name() Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit c3ef01ce4f73f41e99b2a5f0796f1f1a1daaaaa2 Author: Kay Sievers Date: Tue Mar 24 16:38:22 2009 -0700 v4l: struct device - replace bus_id with dev_name(), dev_set_name() Cc: mchehab@infradead.org Cc: linux-media@vger.kernel.org Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit 2ead054cd26752c7ce47dfbf320dd021ef70682d Author: Kay Sievers Date: Tue Mar 24 16:38:22 2009 -0700 drm: struct device - replace bus_id with dev_name(), dev_set_name() Cc: airlied@linux.ie Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit c23135573f37facd18edb2e8e8512c67928c54ac Author: Kay Sievers Date: Tue Mar 24 16:38:22 2009 -0700 net: struct device - replace bus_id with dev_name(), dev_set_name() Cc: davem@davemloft.net Cc: netdev@vger.kernel.org Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit 744bcb13d376b38ff1df3bbcc810493e1b999502 Author: Kay Sievers Date: Tue Mar 24 16:38:22 2009 -0700 rtc: struct device - replace bus_id with dev_name(), dev_set_name() Cc: a.zummo@towertech.it Cc: rtc-linux@googlegroups.com Signed-off-by: Kay Sievers Signed-off-by: Alessandro Zummo Signed-off-by: Greg Kroah-Hartman commit f2fecec51ad593cce1b07a2b54830a8412a441ea Author: Kay Sievers Date: Tue Mar 24 16:38:22 2009 -0700 pcmcia: struct device - replace bus_id with dev_name(), dev_set_name() Cc: Dominik Brodowski Cc: linux-pcmcia@lists.infradead.org Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit df388556d7d845983c0da3a4a49873472c466275 Author: Kay Sievers Date: Tue Mar 24 16:38:22 2009 -0700 tc: struct device - replace bus_id with dev_name(), dev_set_name() Cc: macro@linux-mips.org Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit 1692713ee94e8d26f592a8e90b817ef66354246c Author: Kay Sievers Date: Tue Mar 24 16:38:21 2009 -0700 sh: struct device - replace bus_id with dev_name(), dev_set_name() Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit 65a212dd71ffd99c83ad780205932fcb96a973b6 Author: Kay Sievers Date: Tue Mar 24 16:38:21 2009 -0700 serial: struct device - replace bus_id with dev_name(), dev_set_name() Cc: davem@davemloft.net Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit 1173960b0e85761811a421eb0bbcefb117eb7535 Author: Kay Sievers Date: Tue Mar 24 16:38:21 2009 -0700 s390: struct device - replace bus_id with dev_name(), dev_set_name() Cc: schwidefsky@de.ibm.com Cc: linux-s390@vger.kernel.org Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit 37f105448eac49073c3ff9f101553aad845d24eb Author: Kay Sievers Date: Tue Mar 24 16:38:21 2009 -0700 rapidio: struct device - replace bus_id with dev_name(), dev_set_name() Cc: mporter@kernel.crashing.org Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit 54cc6954a431dad42fb73e0a50b6d318a70594f6 Author: Kay Sievers Date: Tue Mar 24 16:38:21 2009 -0700 pci: struct device - replace bus_id with dev_name(), dev_set_name() Cc: jbarnes@virtuousgeek.org Cc: linux-pci@vger.kernel.org Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit c36f1e3301ee9d8045938a2741da7f8e4c7fbbff Author: Kay Sievers Date: Tue Mar 24 16:38:21 2009 -0700 mtd: struct device - replace bus_id with dev_name(), dev_set_name() Cc: dwmw2@infradead.org Cc: linux-mtd@lists.infradead.org Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit 48f8151ea68ad78391ef6ff12a83e6fbdb6094f6 Author: Kay Sievers Date: Tue Mar 24 16:38:21 2009 -0700 mmc: struct device - replace bus_id with dev_name(), dev_set_name() Cc: drzeus-mmc@drzeus.cx Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit 2796872c40c462bacf2d09bb99faa6dcd640a620 Author: Kay Sievers Date: Tue Mar 24 16:38:21 2009 -0700 zorro: struct device - replace bus_id with dev_name(), dev_set_name() Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit 7ad33e74857f16f1202cbc5746faf52e88e8b376 Author: Kay Sievers Date: Tue Mar 24 16:38:21 2009 -0700 video: struct device - replace bus_id with dev_name(), dev_set_name() Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit 6c7377ab6814c247d7600955a4ead2e3db490697 Author: Kay Sievers Date: Tue Mar 24 16:38:21 2009 -0700 spi: struct device - replace bus_id with dev_name(), dev_set_name() Cc: dbrownell@users.sourceforge.net Cc: spi-devel-general@lists.sourceforge.net Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit 031d5518591006efd13a33a86909b9477b22917b Author: Kay Sievers Date: Tue Mar 24 16:38:21 2009 -0700 edac: struct device - replace bus_id with dev_name(), dev_set_name() Cc: dougthompson@xmission.com Cc: bluesmoke-devel@lists.sourceforge.net Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers commit 38938bfe3489394e2eed5e40c9bb8f66a2ce1405 Author: Pablo Neira Ayuso Date: Tue Mar 24 16:37:55 2009 -0700 netlink: add NETLINK_NO_ENOBUFS socket flag This patch adds the NETLINK_NO_ENOBUFS socket flag. This flag can be used by unicast and broadcast listeners to avoid receiving ENOBUFS errors. Generally speaking, ENOBUFS errors are useful to notify two things to the listener: a) You may increase the receiver buffer size via setsockopt(). b) You have lost messages, you may be out of sync. In some cases, ignoring ENOBUFS errors can be useful. For example: a) nfnetlink_queue: this subsystem does not have any sort of resync method and you can decide to ignore ENOBUFS once you have set a given buffer size. b) ctnetlink: you can use this together with the socket flag NETLINK_BROADCAST_SEND_ERROR to stop getting ENOBUFS errors as you do not need to resync (packets whose event are not delivered are drop to provide reliable logging and state-synchronization). Moreover, the use of NETLINK_NO_ENOBUFS also reduces a "go up, go down" effect in terms of performance which is due to the netlink congestion control when the listener cannot back off. The effect is the following: 1) throughput rate goes up and netlink messages are inserted in the receiver buffer. 2) Then, netlink buffer fills and overruns (set on nlk->state bit 0). 3) While the listener empties the receiver buffer, netlink keeps dropping messages. Thus, throughput goes dramatically down. 4) Then, once the listener has emptied the buffer (nlk->state bit 0 is set off), goto step 1. This effect is easy to trigger with netlink broadcast under heavy load, and it is more noticeable when using a big receiver buffer. You can find some results in [1] that show this problem. [1] http://1984.lsi.us.es/linux/netlink/ This patch also includes the use of sk_drop to account the number of netlink messages drop due to overrun. This value is shown in /proc/net/netlink. Signed-off-by: Pablo Neira Ayuso Signed-off-by: David S. Miller commit 7f649269c318c41030e492fc35f03d38c6e3b39b Author: Brice Goglin Date: Tue Mar 24 16:32:13 2009 -0700 myri10ge: update firmware headers to 1.4.41 Update myri10ge firmware headers to firmware version 1.4.41. Signed-off-by: Brice Goglin Signed-off-by: David S. Miller commit de7927457a2e12d89f37b744fb258d2ae68cdb56 Author: vibi sreenivasan Date: Tue Mar 24 16:30:20 2009 -0700 macb: fix warning "warning: unused variable `dev' " Removed unused variable dev Signed-off-by: vibi sreenivasan Signed-off-by: Haavard Skinnemoen Signed-off-by: David S. Miller commit a9dbae78506b2099985c4ca9975f079c94cb8165 Author: Joakim Tjernlund Date: Fri Mar 20 21:09:14 2009 +0100 ucc_geth: Convert to net_device_ops Signed-off-by: David S. Miller commit fd8345f8dea93691b0ceba55146088d8c05415f6 Author: Alexander Shumakovitch Date: Sat Mar 21 00:50:16 2009 -0400 USB: qcserial: add device id for HP devices Signed-off-by: Greg Kroah-Hartman commit e6bdfe36e52f0e552b50acf49a82851eeb122fde Author: Catalin Marinas Date: Mon Mar 23 12:38:16 2009 +0000 USB: isp1760: Add a delay before reading the SKIPMAP registers in isp1760-hcd.c The data read from the SKIPMAP registers is not immediately available after writing and the driver panics when a packet is enqueued from the interrupt handler. This patch adds an ndelay(195) before these registers are read (delay value mentioned in section 15.1.1.3 of the ISP1760 data sheet). Signed-off-by: Catalin Marinas Acked-by: Sebastian Andrzej Siewior Signed-off-by: Greg Kroah-Hartman commit b7af0bb26899bb47ae16fb41d2296111b0784a56 Author: Daniel Mack Date: Fri Mar 20 19:58:57 2009 +0100 USB: allow malformed LANGID descriptors When an USB hardware does not provide a valid LANGID, fall back to value zero which is still a reasonable default for most devices. Signed-off-by: Daniel Mack Signed-off-by: Greg Kroah-Hartman commit 4c24b6d045a9d355c95ca4e6beb10ce2fd263390 Author: Vernon Sauder Date: Fri Mar 20 01:44:50 2009 -0700 USB: pxa27x_udc: typo fixes and code cleanups This patch is a merge of patches : - fix function doc and debug - cleanup loop count - optimize code to remove local variable and extra check - init 'req' before use - add missing iounmap call [dbrownell@users.sourceforge.net: capitalize IN/OUT directions in doc] Signed-off-by: Vernon Sauder [folded by Robert Jarzmik Signed-off-by: Robert Jarzmik Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit ab943a2e125b098489ccaa0166c2c52f8266d9ed Author: David Brownell Date: Thu Mar 19 14:16:09 2009 -0700 USB: gadget: gadget zero uses new suspend/resume hooks Use the new device-level suspend/resume hooks for Gadget Zero; always enable them with the OTG test mode; and support remote wakeup on both configurations even in non-OTG mode. This ensures that both configurations can pass the USBCV remote wakeup tests when the OTG test mode is enabled. This changes behavior by adding autoresume support to the loopback config even in non-OTG mode; the test failure was that it didn't work in OTG mode. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 8942939a6c83f34615de5ae041cc9ca846923f94 Author: David Brownell Date: Thu Mar 19 14:14:17 2009 -0700 USB: gadget: composite device-level suspend/resume hooks Address one open question in the composite gadget framework: Yes, we should have device-level suspend/resume callbacks in addition to the function-level ones. We have at least one scenario (with gadget zero in OTG test mode) that's awkward to handle without it. Signed-off-by: David Brownell Cc: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit e1e609be49c9d345e8b67a122a7cdae48ad27c7e Author: Yoshihiro Shimoda Date: Thu Mar 19 14:18:15 2009 +0900 USB: r8a66597-hcd: suspend/resume support Fix the problem that system cannot suspend. Signed-off-by: Yoshihiro Shimoda Signed-off-by: Greg Kroah-Hartman commit 71d2718f2507dc17501d04e2bdca7b8e694ce365 Author: Roel Kluin Date: Fri Mar 13 12:19:18 2009 +0100 USB: more u32 conversion after transfer_buffer_length and actual_length transfer_buffer_length and actual_length have become unsigned, therefore some additional conversion of local variables, function arguments and print specifications is desired. A test for a negative urb->transfer_buffer_length became obsolete; instead we ensure that it does not exceed INT_MAX. Also, urb->actual_length is always less than urb->transfer_buffer_length. rh_string() does no longer return -EPIPE in the case of an unsupported ID. Instead its only caller, rh_call_control() does the check. Signed-off-by: Roel Kluin Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit d2ad67b3fa61eed52b22491210c668a94c7bf17e Author: VomLehn Date: Thu Mar 12 14:37:42 2009 -0700 USB: Fix cp2101 USB serial device driver termios functions for console use This is really a follow up to the modifications Alan Cox made for commit 95da310e66ee8090119596c70ca8432e57f9a97f to pass a tty_struct to various interface functions, which broke the serial configuration (termios) functions when the device is being used as a console. These changes restore the configuration to proper functioning both as a tty and as a console. As Alan notes in that commit, these changes will need to be tweaked when we have a proper console abstraction. Signed-off-by: David VomLehn Signed-off-by: Greg Kroah-Hartman commit d23bac9f8b3cf1ad674d6390364d559103013213 Author: Alex Stephens Date: Tue Mar 17 00:06:19 2009 +0000 USB: CP2101 New Device ID One new device ID for CP2101 driver. Signed-off-by: Alex Stephens alex@miranova.com commit 1b8fb4141eb52f4aace9f152dad3e4c1609b76fe Author: Mark Ellis Date: Mon Mar 9 22:24:29 2009 +0000 USB: ipaq: handle 4 endpoint devices The ipaq driver currently enforces one port on all devices. This is correct for 2 and 3 endpoint devices, but with 4 endpoint devices meaningful communication occurs on the second pair. This patch allows 2 ports for 4 endpoint devices. Signed-off-by: Mark Ellis Signed-off-by: Greg Kroah-Hartman commit 49121aa14c2a372a5fd01982df900257784be63d Author: Ben Dooks Date: Sat Mar 7 11:44:21 2009 +0000 USB: S3C: Move usb-control.h to platform include The usb-control.h is needed by ohci-s3c2410.c for both S3C24XX and S3C64XX architectures, so move it to Signed-off-by: Ben Dooks Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 3ba5f38f3d5143a879de132a9df71814d1f3cff0 Author: Ben Dooks Date: Sat Mar 7 11:44:10 2009 +0000 USB: ohci-hcd: Add ARCH_S3C24XX to the ohci-s3c2410.c glue The ohci-s3c2410.c glue supports both CONFIG_ARCH_S3C2410 and CONFIG_ARCH_S3C64XX so add it to the build of ohci-s3c2410.c Signed-off-by: Ben Dooks Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 64a3a25f440c65510cb0d15080dcd2f0032d6051 Author: D.J. Capelis Date: Wed Mar 4 10:27:52 2009 -0800 USB: pedantic: spelling correction in comment for ch9.h Just noticed this during a grep, figured I might as well send it in. From: D.J. Capelis Signed-off-by: Greg Kroah-Hartman commit a9f8ec4db1d308643e13ec7638ccb5ace4d34982 Author: Hannes Eder Date: Fri Feb 27 02:04:31 2009 +0100 USB: host: fix sparse warning: Using plain integer as NULL pointer Fix this sparse warning:  drivers/usb/host/oxu210hp-hcd.c:2687:42: warning: Using plain integer as NULL pointer Signed-off-by: Hannes Eder Signed-off-by: Greg Kroah-Hartman commit 2dfa319a649b9de029777994b6af201c1fe81d53 Author: Ben Dooks Date: Thu Feb 26 23:03:15 2009 +0000 USB: ohci-s3c2410: fix name of bus clock The USB bus clock is usb-bus-host, so print the correct name in the dev_err() statement if we cannot find it. Signed-off-by: Ben Dooks Acked-by: David Brownell commit 3edb8a208b5be90c829f7b19058cb63e947b1d18 Author: Ben Dooks Date: Thu Feb 26 23:02:19 2009 +0000 USB: ohci-s3c2410: remove include Remove the include of , as no definitions from it are used by the OHCI driver. Signed-off-by: Ben Dooks Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 03ee251546a9360cbb4c27c250d128dcbcfd9931 Author: Greg Kroah-Hartman Date: Wed Mar 11 11:03:49 2009 -0700 USB: serial: rename cp2101 driver to cp210x Lots of users are getting confused about the cp2101 driver. It really does support more than just the cp2101 device, so rename it to cp210x to try to prevent confusion. Cc: Craig Shelley Signed-off-by: Greg Kroah-Hartman commit 97324955c62aaa104edea2ef4370dc8882a5ab82 Author: Craig Shelley Date: Thu Feb 26 22:21:51 2009 +0000 USB: CP2101 Reduce Error Logging This patch lowers the logging priority of certain messages to prevent users from flooding the log files. Signed-off-by: Craig Shelley Signed-off-by: Greg Kroah-Hartman commit ef8b6bcb39559d956f897acf7ebe600d5105d479 Author: Craig Shelley Date: Thu Feb 26 22:19:22 2009 +0000 USB: CP2101 Support AN205 baud rates This patch adds support for the extended range of baud rates supported by CP2102 and CP2103 devices described in SiLabs AN205. An additional function cp2101_quantise_baudrate rounds the baud rate as per AN205 Table 1. A modification to the baud rate calculation removes a rounding error, allowing the full range of baud rates to be used. Signed-off-by: Craig Shelley Signed-off-by: Greg Kroah-Hartman commit 31dbb803464d75b96212cce9052dfeaeac0819de Author: Johannes Weiner Date: Wed Mar 4 12:06:15 2009 -0800 USB: use kzfree() Use kzfree() instead of memset() + kfree(). Signed-off-by: Johannes Weiner Reviewed-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit d34d9721a559fd11ec682bd9ef17220de0162060 Author: Alan Stern Date: Mon Mar 9 13:44:48 2009 -0400 USB: usbfs: remove unneeded "inline" annotations This patch (as1223) removes a bunch of unnecessary "inline" annotations from the usbfs driver. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 4fe0387afa893b44c5a21b9bfbb0888354ef4656 Author: Alan Stern Date: Thu Feb 26 10:21:02 2009 -0500 USB: don't send Set-Interface after reset This patch (as1221) changes the way usbcore reinitializes a device following a reset or a reset-resume. Currently we call usb_set_interface() for every interface in the active configuration; this is to put the interface into the same altsetting as before the reset and to make sure that the host's endpoint state matches the device's endpoint state. However, sending a Set-Interface request is a waste of time if an interface was already in altsetting 0 before the reset, since it is certainly in altsetting 0 afterward. In addition, many devices can't handle Set-Interface requests -- they crash when they receive them. So instead, the patch adds code to check each interface. If the interface wasn't in altsetting 0 before the reset, we go head with the Set-Interface request as before. But if it was then we skip sending the Set-Interface request, and we clear out the host-side endpoint state by calling usb_disable_interface() followed by usb_enable_interface(). The patch also adds a couple of new comments to explain what's going on. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 77aa2b5878f48d6ab6e0c412cc9214c845483475 Author: Greg Kroah-Hartman Date: Wed Mar 4 16:23:31 2009 -0800 USB: remove phidget drivers from kernel tree. These devices are better controlled with the LGPL userspace library found at: http://www.phidgets.com/downloads.php?os_id=3 and full documentation at: http://www.phidgets.com/documentation/web/cdoc/index.html Cc: Chester Fitchett Acked-by: Sean Young Signed-off-by: Greg Kroah-Hartman commit 8c209e6782ca0e3046803fc04a5ac01c8c10437a Author: Greg Kroah-Hartman Date: Fri Mar 6 21:31:03 2009 -0800 USB: make actual_length in struct urb field u32 actual_length should also be a u32 and not a signed value. This patch changes this field to be 'u32' to prevent any potential negative conversion and comparison errors. This triggered a few compiler warning messages when these fields were being used with the min macro, so they have also been fixed up in this patch. Cc: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit 16e2e5f634f86ccda18366967c4e592eb61bc9cc Author: Greg Kroah-Hartman Date: Tue Mar 3 16:44:13 2009 -0800 USB: make transfer_buffer_lengths in struct urb field u32 Roel Kluin pointed out that transfer_buffer_lengths in struct urb was declared as an 'int'. This patch changes this field to be 'u32' to prevent any potential negative conversion and comparison errors. This triggered a few compiler warning messages when these fields were being used with the min macro, so they have also been fixed up in this patch. Cc: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit 7ea0a2bcfe40b1c525e63e931b7142ab22b64269 Author: Alan Stern Date: Thu Mar 5 11:01:11 2009 -0500 USB: uhci: don't use pseudo negative values The code in uhci-q.c doesn't have to use pseudo-negative values. I did it that way because it was easy and because it would give the expected output during debugging. But it doesn't have to work that way. Here's another approach. Signed-off-by: Alan Stern Cc: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit 66760169492445395c530c812443f58e2cfdb3dc Author: Jouni Hogander Date: Fri Feb 20 14:02:31 2009 +0200 USB: TWL: disable VUSB regulators when cable unplugged This patch disables USB regulators VUSB1V5, VUSB1V8, and VUSB3V1 when the USB cable is unplugged to reduce power consumption. Added a depencency from twl4030 usb driver to TWL_REGULATOR. Signed-off-by: Jouni Hogander Signed-off-by: Kalle Jokiniemi Signed-off-by: Greg Kroah-Hartman commit 471c604daf73ff549d374ee54f9e6bfd5a54d4e8 Author: Pete Zaitcev Date: Thu Feb 19 22:54:45 2009 -0700 USB: usbmon: Add binary API v1 This patch adds an extension to the binary API so it reaches parity with existing text API (so-called "1u"). The extension delivers additional data, such as ISO descriptors and the interrupt interval. Signed-Off-By: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 1ded7ea47b8829a06068c3bb5e3ebe471076617a Author: Ming Lei Date: Fri Feb 20 21:23:09 2009 +0800 USB: ch341 serial: fix port number changed after resume This patch fixes the following bug: .plug ch341 usb serial port into a hub port; .ch341 driver bound to the device and /dev/ttyUSB0 comes .open /dev/ttyUSB0 by minicom and we can use the serial successfully .suspend the ch341 usb serial device(such as: echo suspend > power/level) .resume the ch341 usb serial device (such as: echo on > power/level) .new port /dev/ttyUSB1 comes ,and the original /dev/ttyUSB0 still exists, but is no longer usable by minicom The patch adds suspend and resume callback to ch341 usb driver to prevent it from unbinding during suspend. The /dev/ttyUSB0 is not released until being closed, so /dev/ttyUSB1 comes after resume, and the original /dev/ttyUSB0 is no longer usable by minicom. It is really a mess for a minicom user. This patch also adds the reset_resume callback to make it usable after resuming from STR or hibernation, for generally STR or hibernation will make the vbus of root-hub lost. Finally enable the driver's supports_autosuspend, for the device is in working order with it. Signed-off-by: Ming Lei Signed-off-by: Greg Kroah-Hartman commit a227fd7db74fa05d866790a4b29ba049bb5035cc Author: David Brownell Date: Tue Feb 24 15:31:54 2009 -0800 USB: musb: partial DaVinci dm355 support Partial support for DaVinci DM355, on the EVM board; peripheral mode should work, once mainline merges DM355 support. Missing: (a) renumbering the GPIO for DRVVBUS on the DM6446 EVM, when DAVINCI_N_GPIO increases; (b) disabling DM355_DEEPSLEEP.DRVVBUS_OVERRIDE so VBUS is driven according to the ID signal, if cpu_is_..._dm355() The new PHY control bits are ignored on DM6446. Signed-off-by: David Brownell Cc: Kevin Hilman Signed-off-by: Greg Kroah-Hartman commit 743821717c611913a5a3f95010b141f0b4cb5463 Author: Ajay Kumar Gupta Date: Tue Feb 24 15:29:04 2009 -0800 USB: musb: only turn off vbus in OTG hosts Except on DaVinci, VBUS is now switched off as part of idling the USB link (after a_wait_bcon) whenever a device is disconnected from host. This is correct for OTG hosts, where either SRP or an ID interrupt could turn VBUS on again. However, for non-OTG hosts there's no way to turn VBUS on again, so the host becomes unusable. And the procfs entry which once allowed a manual workaround for this is now gone. This patch adds an is_otg_enabled() check before scheduling the switch-off timer in disconnect path, supporting a "classic host" mode where SRP is unavailable. [ dbrownell@users.sourceforge.net: tweak patch description ] Signed-off-by: Ajay Kumar Gupta Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 322337168f22e8245aae7f38e84c5711cd4c1265 Author: Giuseppe GORGOGLIONE Date: Tue Feb 24 15:27:34 2009 -0800 USB: musb: fix init oops crash with static FIFO config Correct musb_read_fifosize() and musb_configure_ep0() functions for the #ifndef BLACKFIN branch when the silicon uses static FIFO configuration. (Most current silicon configures this controller to use dynamic FIFO configuration; some parts from ST don't, like the STM STA2062.) Signed-off-by: Giuseppe GORGOGLIONE Signed-off-by: Felipe Balbi Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 1e0320f0d46022d12ddc84516cbdb8865e8cd744 Author: Ajay Kumar Gupta Date: Tue Feb 24 15:26:13 2009 -0800 USB: musb: NAK timeout scheme on bulk RX endpoint Fixes endpoint starvation issue when more than one bulk QH is multiplexed on the reserved bulk RX endpoint, which is normal for cases like serial and ethernet adapters. This patch sets the NAK timeout interval for such QHs, and when a timeout triggers the next QH will be scheduled. (This resembles the bulk scheduling done in hardware by EHCI, OHCI, and UHCI.) This scheme doesn't work for devices which are connected to a high to full speed tree (transaction translator) as there is no NAK timeout interrupt from the musb controller from such devices. Tested with PIO, Inventra DMA, CPPI DMA. [ dbrownell@users.sourceforge.net: fold in start_urb() update; clarify only for bulk RX; don't accidentally clear WZC bits ] Signed-off-by: Ajay Kumar Gupta Cc: Felipe Balbi Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 5d67a851bca63d30cde0474bfc4fc4f03db1a1b8 Author: Sergei Shtylyov Date: Tue Feb 24 15:23:34 2009 -0800 USB: musb: rewrite host periodic endpoint allocation The current MUSB host code doesn't make use of all the available FIFOs in for periodic transfers since it wrongly assumes the RX and TX sides of any given hw_ep always share one FIFO. Change: use 'in_qh' and 'out_qh' fields of the 'struct musb_hw_ep' to check the endpoint's business; get rid of the now-unused 'periodic' array in the 'struct musb'. Also optimize a loop induction variable in the endpoint lookup code. (Based on a previous patch from Ajay Kumar Gupta ) [ dbrownell@users.sourceforge.net: clarify description and origin of this fix; whitespace ] Signed-off-by: Sergei Shtylyov Signed-off-by: David Brownell Cc: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit b2bdf3a789162aa6ff9c6f139bee9cc7954bc5b4 Author: Felipe Balbi Date: Thu Feb 12 15:09:47 2009 +0200 USB: composite: avoid inconsistent lock state Avoid the following INFO from lock debugging: [ 369.126112] ================================= [ 369.132063] [ INFO: inconsistent lock state ] [ 369.136457] 2.6.28-maemo1 #1 [ 369.139387] --------------------------------- [ 369.143782] inconsistent {hardirq-on-W} -> {in-hardirq-W} usage. [ 369.149855] swapper/0 [HC1[1]:SC0[0]:HE0:SE1] takes: [ 369.154890] (&cdev->lock){+-..}, at: [] composite_disconnect+0x1c/0] [ 369.163404] {hardirq-on-W} state was registered at: [ 369.168348] [] __lock_acquire+0x5d0/0x7d8 [ 369.173506] [] lock_acquire+0x64/0x78 [ 369.178266] [] _spin_lock+0x4c/0x80 [ 369.182905] [] usb_function_deactivate+0x20/0x70 [g_nokia] [ 369.189527] [] 0xbf1a0a88 [ 369.193281] [] 0xbf19f450 [ 369.197004] [] 0xbf19fa3c [ 369.200758] [] 0xbf1a03a0 [ 369.204481] [] 0xbf19f254 [ 369.208204] [] 0xbf1a0158 [ 369.211927] [] 0xbf1a130c [ 369.215650] [] usb_gadget_register_driver+0x12c/0x28c [ 369.221846] [] 0xbf1a06bc [ 369.225569] [] 0xbf1a06e8 [ 369.229322] [] __exception_text_end+0x64/0x19c [ 369.234877] [] sys_init_module+0x9c/0x194 [ 369.240004] [] ret_fast_syscall+0x0/0x2c [ 369.245039] [] 0xffffffff [ 369.248793] irq event stamp: 218356 [ 369.252302] hardirqs last enabled at (218355): [] omap3_enter_idle+8 [ 369.260420] hardirqs last disabled at (218356): [] __irq_svc+0x34/0x0 [ 369.267927] softirqs last enabled at (218348): [] __do_softirq+0x134 [ 369.275892] softirqs last disabled at (218335): [] irq_exit+0x60/0xb0 [ 369.283308] [ 369.283308] other info that might help us debug this: [ 369.289930] no locks held by swapper/0. Cc: David Brownell Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 6da9c99059bf24fb1faae6b9613bae64ea50c05e Author: David Vrabel Date: Wed Feb 18 14:43:47 2009 +0000 USB: allow libusb to talk to unauthenticated WUSB devices To permit a userspace application to associate with WUSB devices using numeric association, control transfers to unauthenticated WUSB devices must be allowed. This requires that wusbcore correctly sets the device state to UNAUTHENTICATED, DEFAULT and ADDRESS and that control transfers can be performed to UNAUTHENTICATED devices. Signed-off-by: David Vrabel Signed-off-by: Greg Kroah-Hartman commit 4246b06a33ebdd6593dccaab3aa01eb0c9f8c1c8 Author: Maciej Grela Date: Sat Feb 28 12:39:20 2009 -0800 USB: usb-storage: added missing MODULE_LICENSE("GPL") for usb-storage ums-* modules The lack of a MODULE_LICENSE macro in ums-* subdrivers prevented them from loading. Needs to be applied after Alan Stern's usb-storage subdriver separation patchset. Also added missing MODULE_DESCRIPTION and MODULE_AUTHOR entries. Signed-off-by: Maciej Grela Acked-by: Alan Stern Acked-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 9cfb95ef72c637bc9b90260e0f98a23f3f49b1bb Author: Alan Stern Date: Thu Feb 12 14:48:33 2009 -0500 usb-storage: make onetouch a separate module This patch (as1217) converts usb-storage's onetouch subdriver into a separate module. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit c10337846c93bd914dd3003ffb001adc583b313e Author: Alan Stern Date: Thu Feb 12 14:48:26 2009 -0500 usb-storage: make karma a separate module This patch (as1216) converts usb-storage's karma subdriver into a separate module. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit a74bba3bf92cb6425789ae5050bdcca1283bc6f4 Author: Alan Stern Date: Thu Feb 12 14:48:22 2009 -0500 usb-storage: make alauda a separate module This patch (as1215) converts usb-storage's alauda subdriver into a separate module. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit a9fb6d05d59c9e118ad8c355adfdf88c970c61bc Author: Alan Stern Date: Thu Feb 12 14:48:19 2009 -0500 usb-storage: make jumpshot a separate module This patch (as1214) converts usb-storage's jumpshot subdriver into a separate module. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 2cbbf3576aa9eae9a92f2669f38a453b6cb8e956 Author: Alan Stern Date: Thu Feb 12 14:48:15 2009 -0500 usb-storage: make datafab a separate module This patch (as1213) converts usb-storage's datafab subdriver into a separate module. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 0d62939fab3cf28a23ac6934cec599793d3a1d9d Author: Alan Stern Date: Thu Feb 12 14:48:11 2009 -0500 usb-storage: make freecom a separate module This patch (as1212) converts usb-storage's freecom subdriver into a separate module. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 26d6818f19d0ab018f28a20d699511c1efdf508b Author: Alan Stern Date: Thu Feb 12 14:48:08 2009 -0500 usb-storage: make shuttle_usbat a separate module This patch (as1211) converts usb-storage's shuttle_usbat subdriver into a separate module. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit fcdb51401f7f695b7fb782721b2e33372c5a06ce Author: Alan Stern Date: Thu Feb 12 14:48:04 2009 -0500 usb-storage: make cypress_atacb a separate module This patch (as1210) converts usb-storage's cypress_atacb subdriver into a separate module. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 70fcc0050733a7cd1b452cfa3de3a9b376412565 Author: Alan Stern Date: Thu Feb 12 14:47:59 2009 -0500 usb-storage: make sddr55 a separate module This patch (as1209) converts usb-storage's sddr55 subdriver into a separate module. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 32d5493eb83a217c3b1eba4b98cd6d19864f71a8 Author: Alan Stern Date: Thu Feb 12 14:47:54 2009 -0500 usb-storage: make isd200 a separate module This patch (as1208) converts usb-storage's isd200 subdriver into a separate module. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 0ff71883b2d60136430458413c135d545c69b0c4 Author: Alan Stern Date: Thu Feb 12 14:47:49 2009 -0500 usb-storage: make sddr09 a separate module This patch (as1207) converts usb-storage's sddr09 subdriver into a separate module. An unexpected complication arises because of DPCM devices, in which one LUN uses the sddr09 transport and one uses the standard CB transport. Since these devices can be used even when USB_STORAGE_SDDR09 isn't configured, their entries in unusual_devs.h require special treatment. If SDDR09 isn't configured then the entries remain in unusual_devs.h; if it is then the entries are present in unusual_sddr09.h instead. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit e6e244b6cb1f70e7109381626293cd40a8334ed3 Author: Alan Stern Date: Thu Feb 12 14:47:44 2009 -0500 usb-storage: prepare for subdriver separation This patch (as1206) is the first step in converting usb-storage's subdrivers into separate modules. It makes the following large-scale changes: Remove a bunch of unnecessary #ifdef's from usb_usual.h. Not truly necessary, but it does clean things up. Move the USB device-ID table (which is duplicated between libusual and usb-storage) into its own source file, usual-tables.c, and arrange for this to be linked with either libusual or usb-storage according to whether USB_LIBUSUAL is configured. Add to usual-tables.c a new usb_usual_ignore_device() function to detect whether a particular device needs to be managed by a subdriver and not by the standard handlers in usb-storage. Export a whole bunch of functions in usb-storage, renaming some of them because their names don't already begin with "usb_stor_". These functions will be needed by the new subdriver modules. Split usb-storage's probe routine into two functions. The subdrivers will call the probe1 routine, then fill in their transport and protocol settings, and then call the probe2 routine. Take the default cases and error checking out of get_transport() and get_protocol(), which run during probe1, and instead put a check for invalid transport or protocol values into the probe2 function. Add a new probe routine to be used for standard devices, i.e., those that don't need a subdriver. This new routine checks whether the device should be ignored (because it should be handled by ub or by a subdriver), and if not, calls the probe1 and probe2 functions. Signed-off-by: Alan Stern CC: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit e4abe6658aa17a5d7e7321dfda807d287255511b Author: Dave Young Date: Sat Feb 14 21:21:13 2009 +0800 usb-serial: fix usb_serial_register bug when boot with nousb param With "nousb" cmdline booting, built-in serial drivers (ie. airecable) will trigger kernel oops. Indeed, if nousb, usb_serial_init will failed, and the usb serial bus type will not be registerd, then usb_serial_register call driver_register which try to register the driver to a not registered bus. Here add usb_disabled() check in usb_serial_register to fix it. Signed-off-by: Dave Young Signed-off-by: Greg Kroah-Hartman commit d0626808f7a6181c1c750d261da9a7a845c29e13 Author: Randy Dunlap Date: Fri Feb 13 11:22:06 2009 -0800 USB: fix ehci printk formats Fix ehci printk formats: drivers/usb/host/ehci-q.c:351: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' drivers/usb/host/ehci-q.c:351: warning: format '%d' expects type 'int', but argument 5 has type 'size_t' Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 551509d267905705f6d723e51ec706916f06b859 Author: Harvey Harrison Date: Wed Feb 11 14:11:36 2009 -0800 USB: replace uses of __constant_{endian} The base versions handle constant folding now. Signed-off-by: Harvey Harrison Signed-off-by: Greg Kroah-Hartman commit a78b42824dd7c2b40d72fb01f1b1842f7e845f3a Author: Greg Kroah-Hartman Date: Tue Feb 17 22:39:56 2009 -0800 USB: serial: add qualcomm wireless modem driver Driver originally written by Qualcomm, but rewritten by me due to the totally different coding style. Cleaned up the probe logic to make a bit more sense, this is one wierd device. They could have prevented all of this by just writing sane firmware for the modem. Cc: Tamm Liu Signed-off-by: Greg Kroah-Hartman commit 3d940b7d27c5fec35de66449836ab9a01575447c Author: Greg Kroah-Hartman Date: Fri Mar 20 20:26:30 2009 -0700 USB: symbolserial: log the ioctl commands We need to figure out what userspace programs are expecting from this driver, so log them so we can try to get it right. Signed-off-by: Greg Kroah-Hartman commit 68b44eaed5def7b6490c23c3e88c6f2ccec57beb Author: Greg Kroah-Hartman Date: Fri Feb 13 17:25:46 2009 -0800 USB: serial: add symbol serial driver This is for the Symbol 6608 barcode scanner in a fake "HID" mode. Thanks to Dalibor Grgec for working with me to get this to start to work properly. Cc: Dalibor Grgec Signed-off-by: Greg Kroah-Hartman commit f7e7aa5850839faa5eb7c7c177da5fd6bca8949b Author: Catalin Marinas Date: Tue Feb 10 16:55:51 2009 +0000 USB: Add platform device support for the ISP1760 USB chip Currently, the driver only supports PCI and PPC_OF but there are boards like ARM RealView where this is a platform device. The patch adds the necessary functions and registration to the isp1760-if.c file and modifies the corresponding Makefile and Kconfig to be able to use this driver even if PCI and PPC_OF are not enabled. Signed-off-by: Catalin Marinas Cc: Sebastian Siewior Cc: Russell King Signed-off-by: Greg Kroah-Hartman commit f9031f2c4237abfe75d9ad33f5c0f0dde96f7d09 Author: Catalin Marinas Date: Tue Feb 10 16:55:45 2009 +0000 USB: Make the isp1760_register function prototype more generic The patch changes the prototype of the isp1760_register() function to use predefined types like phys_addr_t and resource_size_t rather than u64 Signed-off-by: Catalin Marinas Cc: Sebastian Siewior Cc: Russell King Signed-off-by: Greg Kroah-Hartman commit a2c2706e1043c17139c2dafd171c4a5cf008ef7e Author: Alan Stern Date: Tue Feb 10 10:16:58 2009 -0500 USB: EHCI: add software retry for transaction errors This patch (as1204) adds a software retry mechanism to ehci-hcd. It gets invoked when the driver encounters transaction errors on an asynchronous endpoint. On many systems, hardware deficiencies cause such errors to occur if one device is unplugged while the host is communicating with another device. With the patch, the failed transactions are retried and generally succeed the second or third time through. This is based on code originally written by Koichiro Saito. Signed-off-by: Alan Stern Tested by: Koichiro Saito CC: David Brownell Cc: stable Signed-off-by: Greg Kroah-Hartman commit 1f4159c1620f74377e26d8a569d10ca5907ef475 Author: Boaz Harrosh Date: Wed Feb 11 09:54:31 2009 +0200 USB: fix USB_STORAGE_CYPRESS_ATACB commit 64a87b24: [SCSI] Let scsi_cmnd->cmnd use request->cmd buffer changed the scsi_eh_prep_cmnd logic by making it clear the ->cmnd buffer. But the sat to cypress atacb translation supposed the ->cmnd buffer wasn't modified. This patch makes it set the ->cmnd buffer after scsi_eh_prep_cmnd call. The problem and a fix was reported by Matthieu CASTET It also removes all the hackery fiddling of scsi_cmnd and scsi_eh_save by requesting from scsi_eh_prep_cmnd to prepare a read into ->sense_buffer, which is much more suitable a buffer for HW transfers, then after the command execution the regs read is copied into regs buffer before actual preparation of sense_buffer. Also fix an alien comment character to my utf-8 editor. Signed-off-by: Boaz Harrosh Signed-off-by: Matthieu CASTET Cc: stable Cc: James Bottomley Cc: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit bc29847e16cb6b571157220ec9b20a7d86e58046 Author: Alan Stern Date: Wed Feb 11 14:26:38 2009 -0500 USB: EHCI: Make timer_action out-of-line This patch (as1205) moves timer_action() from ehci.h to ehci-hcd.c and makes it out-of-line. Over the years it has grown too big to be inline any more. Signed-off-by: Alan Stern Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit b967c88ed1b48bc353ea83e0cacb2249a3bb1a51 Author: Thierry Vignaud Date: Wed Feb 11 13:31:05 2009 -0800 usb: kill prehistorical comments about USB_EHCI_HCD Remove old comments about USB_EHCI_HCD. Cc: Alan Stern Signed-off-by: Andrew Morton Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 331879fd6f584d60327ba802616d41bfa636b873 Author: James Woodcock Date: Wed Feb 11 15:06:53 2009 +0000 USB: serial: refuse to open recently removed USB Serial devices A USB-serial converter device is plugged into a system, and a process opens it's device node. If the device is physically removed whilst the process still has its device node open, then other processes can sucessfully open the now non-existent device's node. I would expect that open() on a device that has been physically removed should return ENODEV. This is manifesting itself with getty on my system. I do the following: 1. set up inittab to spawn getty on ttyUSB0, eg: T1:23:respawn:/sbin/getty -L ttyUSB0 115200 vt100 2. Plug in USB-serial converter cable 3. Wait for a login prompt on a terminal program attached to the serial cable 4. Login 5. Pull the USB-serial converter cable from the box 6. getty doesn't realise that ttyUSB0 no longer exists as /dev/ttyUSB0 can still be opened. 7. Re-insert the USB-serial converter cable 8. You should no longer get a login prompt over the serial cable, as the the USB-serial cable now shows up as /dev/ttyUSB1, and getty is trying to talk to /dev/ttyUSB0. The attached patch will cause open("/dev/ttyUSB0", O_RDONLY) to return ENODEV after the USB-serial converter has been pulled. The patch was created against 2.6.28.1. I can supply it against something else if needs be. It is fairly simple, so should be OK. I am using a pl2303 device, although I don't think that makes any difference. From: James Woodcock Signed-off-by: Greg Kroah-Hartman commit 1c27ae671e6b465e04544450276c88f4dba8de60 Author: Oliver Neukum Date: Mon Feb 9 10:03:49 2009 +0100 USB: serial: remove recourse to generic method This removes the fallback to the generic method. It is cleaner to explicitely request it. Introducing this was my mistake. This will be solved by an explicit test and the driver being allowed to request what it needs to be done upon resumption. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit a5f5ea230d70f5dde4d787208855fa3c3cd7b31e Author: Matt Kraai Date: Fri Feb 6 19:38:51 2009 -0800 USB: skeleton: Use dev_info instead of info 338b67b0c1a97ca705023a8189cf41aa0828d294 removed the info macro and replaced its uses with dev_info. This patch does so for usb-skeleton.c, which was missed. Signed-off-by: Matt Kraai Signed-off-by: Greg Kroah-Hartman commit 0eb526b96ced3759e7d4445fc55204f314e33d8c Author: Borislav Petkov Date: Sat Feb 7 20:20:42 2009 +0100 usb_storage: make Kconfig note visible in the console Make lines about usb_storage depending on SCSI visible when configuring the kernel in a 80x25 console Signed-off-by: Borislav Petkov Signed-off-by: Greg Kroah-Hartman commit faac64ad9c7b1aa56a10be6b5f9b813789e81dfd Author: Greg Kroah-Hartman Date: Fri Feb 6 18:31:46 2009 -0800 USB: serial: opticon: add serial line ioctls This lets userspace determine what the state of the RTS line is, which is what is needed to properly handle data flow for this device (it raises RTS when there is data to be sent from it.) Cc: Kees Stoop Signed-off-by: Greg Kroah-Hartman commit 648d4e16567eae4c643bd2125e91128f06c0d3ad Author: Greg Kroah-Hartman Date: Fri Feb 6 18:30:56 2009 -0800 USB: serial: opticon: add write support This patch allows data to be sent to the scanner. Cc: Kees Stoop Signed-off-by: Greg Kroah-Hartman commit f6d92a05c86754d62eabc84856d2035d0de3ddc3 Author: Ajay Kumar Gupta Date: Fri Feb 6 17:32:35 2009 +0530 USB: otg: adding nop usb transceiver NOP transceiver is used by all the usb transceiver which are mostly autonomous and doesn't require any programming or which are built into the usb ip itself.NOP transceiver only allocates the memory for struct xceiv and calls otg_set_transceiver() so function call to otg_get_transceiver() will return a valid transceiver. NOP transceiver device should be registered by calling usb_nop_xceiv_register() from platform files. Signed-off-by: Ajay Kumar Gupta Cc: Felipe Balbi Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 5d1ca6cf7f80644b07c348d6be870ccd8e3a92ed Author: David Brownell Date: Fri Feb 6 02:39:11 2009 -0800 USB: ftdi_sio: remove pointless syslog spew Remove some pointless messages from the FTDI serial driver; I found these filling up syslog on one system. Also remove a pointless "break" after a "return" in the same area. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 6f8aa65b52037123beab573432e371c0f70b7b9a Author: Frank Seidel Date: Thu Feb 5 16:16:24 2009 +0100 USB: add missing KERN_* constants to printks According to kerneljanitors todo list all printk calls (beginning a new line) should have an according KERN_* constant. Those are the missing peaces here for the usb subsystem. Signed-off-by: Frank Seidel Signed-off-by: Greg Kroah-Hartman commit c49cfa9170256295f4a0fd1668a2411fc05d6b33 Author: Oliver Neukum Date: Fri Feb 6 18:06:43 2009 +0100 USB: serial: use generic method if no alternative is provided in usb serial layer This patch makes use of the generic method if a serial driver provides no implementation. This simplifies implementing suspend/resume support in serial drivers. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 81d043c2f30b157b96cb8ef2b570d12c112e395d Author: Oliver Neukum Date: Fri Feb 6 15:37:14 2009 +0100 USB: serial: export symbol of usb_serial_generic_resume This exports a symbol for usb_serial_generic_resume, so that modules can use it. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit d55c0ae6b243bb8e247259089b3a2e47ebfabdf6 Author: Oliver Neukum Date: Fri Feb 6 15:01:54 2009 +0100 USB: serial generic resume function fix This removes an unnecessary check for autoresume from the generic resume method. The check has been obsoleted by the now delayed increase of the usage counter which makes the error this check prevented impossible. This change allows drivers which only use the bulk read URB the use of the generic method even if they support autosuspend. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit f8bece8d91f9ed9cff3c98920802f1b3046b7560 Author: Oliver Neukum Date: Thu Feb 5 16:54:25 2009 +0100 USB: serial: introduce a flag into the usb serial layer to tell drivers that their URBs are killed due to suspension This patch introduces a flag into the usb serial layer to tell drivers that their URBs are killed due to suspension. That is necessary to let drivers know whether they should report an error back. Signed-off-by: Oliver Neukum Hi Greg, this is for 2.6.30. Patches to use this in drivers are under development. Regards Oliver commit 6e14bda1b18b2e3c16258427fc43ceb43e1bc1d5 Author: Roel Kluin Date: Sat Jan 31 12:37:04 2009 +0100 USB: count reaches -1, tested 0 With a postfix decrement count will reach -1 rather than 0, so the warning will not be issued. Signed-off-by: Roel Kluin Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit d1c0713daea5d1d881ecc8707458ca6746031376 Author: Oliver Neukum Date: Wed Jan 14 18:34:06 2009 +0100 USB: suspend/resume for opticon driver this does the standard support for suspend/resume for the opticon driver. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 4901b2c34ecb6fc45909228ad269c8126efe4401 Author: Oliver Neukum Date: Tue Jan 27 17:21:40 2009 +0100 USB: suspend/resume support for option driver This patch implements suspend and resume methods for the option driver. With my hardware I can even suspend the system and keep up a connection for a short time. Signed-off-by: Oliver Neukum Signed-Off-By: Matthias Urlichs Signed-off-by: Greg Kroah-Hartman commit b633d28e2c5fbe1c8d163892644f57df04aa1421 Author: Darius Augulis Date: Wed Jan 21 15:19:19 2009 +0200 USB: imx_udc: Fix IMX UDC gadget general irq handling Workaround of hw bug in IMX UDC. This bug causes wrong handling of CFG_CHG interrupt. Workaround is documented inline source code. Signed-off-by: Darius Augulis Signed-off-by: Greg Kroah-Hartman commit d24921a36df31332c32e1bb539671284d9e36bfa Author: Darius Augulis Date: Wed Jan 21 15:18:33 2009 +0200 USB: imx_udc: Fix IMX UDC gadget ep0 irq handling Fix ep0 interrupt handling in IMX UDC Gadget. Signed-off-by: Darius Augulis Signed-off-by: Greg Kroah-Hartman commit 593bef6c75e11d2edb5396bd9775cf49a4cda659 Author: Darius Augulis Date: Wed Jan 21 15:17:55 2009 +0200 USB: imx_udc: Fix IMX UDC gadget code style Fix code style errors in IMX UDC Gadget. Signed-off-by: Darius Augulis Signed-off-by: Greg Kroah-Hartman commit 8f182e5ddc84a30d7014a753ae359d85b1238e7f Author: Darius Augulis Date: Wed Jan 21 15:17:25 2009 +0200 USB: imx_udc: Fix IMX UDC gadget bugs Fix small bugs and add some omptimization in IMX UDC Gadget. Signed-off-by: Darius Augulis Signed-off-by: Greg Kroah-Hartman commit 664d5df92e88b6ef091048a802b3750f4e989180 Author: Werner Cornelius Date: Fri Jan 16 21:02:41 2009 +0100 USB: usb-serial ch341: support for DTR/RTS/CTS Fixup of Werner Cornelius patch to the ch341 USB-serial driver, which adds: - support all baudrates, not just a hard-coded set - support for controlling DTR, RTS and CTS Features still missing: - character length other than 8 bits - parity settings - break control I adapted his patch for the new usb_serial API introduced in 2.6.25-git8 by Alan Cox on 22 July 2008. Non-compliance to the new API was a reason for refusing a similar patch from Tollef Fog Heen. Usage example by Tollef Fog Heen : TEMPer USB thermometer Signed-off-by: Werner Cornelius Signed-off-by: Boris Hajduk Signed-off-by: Greg Kroah-Hartman commit bcbbbfc169e837f0bf54dd4a6ef0a6494fb14925 Author: Huang Weiyi Date: Sun Jan 11 17:25:13 2009 +0800 USB: gadget: remove duplicated #include Removed duplicated #include in drivers/usb/gadget/ci13xxx_udc.c Signed-off-by: Huang Weiyi Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 2e0fe709687470637a0709b930ccc9e993d2dad5 Author: Julia Lawall Date: Mon Dec 29 11:22:14 2008 +0100 USB: drivers: use USB API functions rather than constants This set of patches introduces calls to the following set of functions: usb_endpoint_dir_in(epd) usb_endpoint_dir_out(epd) usb_endpoint_is_bulk_in(epd) usb_endpoint_is_bulk_out(epd) usb_endpoint_is_int_in(epd) usb_endpoint_is_int_out(epd) usb_endpoint_num(epd) usb_endpoint_type(epd) usb_endpoint_xfer_bulk(epd) usb_endpoint_xfer_control(epd) usb_endpoint_xfer_int(epd) usb_endpoint_xfer_isoc(epd) In some cases, introducing one of these functions is not possible, and it just replaces an explicit integer value by one of the following constants: USB_ENDPOINT_XFER_BULK USB_ENDPOINT_XFER_CONTROL USB_ENDPOINT_XFER_INT USB_ENDPOINT_XFER_ISOC An extract of the semantic patch that makes these changes is as follows: (http://www.emn.fr/x-info/coccinelle/) // @r1@ struct usb_endpoint_descriptor *epd; @@ - ((epd->bmAttributes & \(USB_ENDPOINT_XFERTYPE_MASK\|3\)) == - \(USB_ENDPOINT_XFER_CONTROL\|0\)) + usb_endpoint_xfer_control(epd) @r5@ struct usb_endpoint_descriptor *epd; @@ - ((epd->bEndpointAddress & \(USB_ENDPOINT_DIR_MASK\|0x80\)) == - \(USB_DIR_IN\|0x80\)) + usb_endpoint_dir_in(epd) @inc@ @@ #include @depends on !inc && (r1||r5)@ @@ + #include #include // Signed-off-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman commit 00185a60c37549531b9eee562d3eba19020875d5 Author: Julia Lawall Date: Sun Dec 21 16:41:36 2008 +0100 USB: Remove redundant test in pxa27x_udc and ftdi_sio priv is checked not to be NULL near the beginning of the function and not changed subsequently, making the test redundant. A simplified version of the semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @r exists@ local idexpression x; expression E; position p1,p2; @@ if (x@p1 == NULL || ...) { ... when forall return ...; } ... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\) ( x@p2 == NULL | x@p2 != NULL ) // another path to the test that is not through p1? @s exists@ local idexpression r.x; position r.p1,r.p2; @@ ... when != x@p1 ( x@p2 == NULL | x@p2 != NULL ) @fix depends on !s@ position r.p1,r.p2; expression x,E; statement S1,S2; @@ ( - if ((x@p2 != NULL) || ...) S1 | - if ((x@p2 == NULL) && ...) S1 | - BUG_ON(x@p2 == NULL); ) // Signed-off-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman commit db5e6df172309c382982790aafa8cd87dc0b6292 Author: Julia Lawall Date: Mon Dec 29 11:19:10 2008 +0100 USB: ub: use USB API functions rather than constants This set of patches introduces calls to the following set of functions: usb_endpoint_dir_in(epd) usb_endpoint_dir_out(epd) usb_endpoint_is_bulk_in(epd) usb_endpoint_is_bulk_out(epd) usb_endpoint_is_int_in(epd) usb_endpoint_is_int_out(epd) usb_endpoint_num(epd) usb_endpoint_type(epd) usb_endpoint_xfer_bulk(epd) usb_endpoint_xfer_control(epd) usb_endpoint_xfer_int(epd) usb_endpoint_xfer_isoc(epd) In some cases, introducing one of these functions is not possible, and it just replaces an explicit integer value by one of the following constants: USB_ENDPOINT_XFER_BULK USB_ENDPOINT_XFER_CONTROL USB_ENDPOINT_XFER_INT USB_ENDPOINT_XFER_ISOC An extract of the semantic patch that makes these changes is as follows: (http://www.emn.fr/x-info/coccinelle/) // @r1@ struct usb_endpoint_descriptor *epd; @@ - ((epd->bmAttributes & \(USB_ENDPOINT_XFERTYPE_MASK\|3\)) == - \(USB_ENDPOINT_XFER_CONTROL\|0\)) + usb_endpoint_xfer_control(epd) @r5@ struct usb_endpoint_descriptor *epd; @@ - ((epd->bEndpointAddress & \(USB_ENDPOINT_DIR_MASK\|0x80\)) == - \(USB_DIR_IN\|0x80\)) + usb_endpoint_dir_in(epd) @inc@ @@ #include @depends on !inc && (r1||r5)@ @@ + #include #include // Signed-off-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman commit 4d6914b72966862f37de634299a80ca2a4b1829f Author: Julia Lawall Date: Mon Dec 29 22:48:19 2008 +0100 USB: Move definitions from usb.h to usb/ch9.h The functions: usb_endpoint_dir_in(epd) usb_endpoint_dir_out(epd) usb_endpoint_is_bulk_in(epd) usb_endpoint_is_bulk_out(epd) usb_endpoint_is_int_in(epd) usb_endpoint_is_int_out(epd) usb_endpoint_is_isoc_in(epd) usb_endpoint_is_isoc_out(epd) usb_endpoint_num(epd) usb_endpoint_type(epd) usb_endpoint_xfer_bulk(epd) usb_endpoint_xfer_control(epd) usb_endpoint_xfer_int(epd) usb_endpoint_xfer_isoc(epd) are moved from include/linux/usb.h to include/linux/usb/ch9.h. include/linux/usb/ch9.h makes more sense for these functions because they only depend on constants that are defined in this file. Signed-off-by: Julia Lawall Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit ee069fb1185895e725ad942c7a529f947e25166d Author: Robert Jarzmik Date: Sat Jan 24 23:59:38 2009 -0800 USB: pxa27x_udc: add vbus_draw callback Add the vbus_draw() callback to inform the transceiver, if it exists, how much current may be drawn. The decision is taken on gadget driver side using the configuration chosen by the host and its bMaxPower field. Some systems can use the host's VBUS supply to augment or recharge a battery. (There's also a default of 100 mA for unconfigured devices, or 8 mA if they're OTG devices.) Signed-off-by: Robert Jarzmik Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 7fec3c25b773883bd50c4078bcccdd23d3dadeac Author: Robert Jarzmik Date: Sat Jan 24 23:57:30 2009 -0800 USB: pxa27x_udc: add otg transceiver support When a transceiver driver is used, no automatic udc enable is done. The transceiver (OTG or not) should : - take care of VBus sensing - call usb_gadget_vbus_connect() - call usb_gadget_vbus_disconnect() The pullup should remain within this driver's management, either by gpio_pullup of udc_command() fields. Signed-off-by: Robert Jarzmik Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit b799a7eb68082af620b7e37b6f41c98802e831f6 Author: Robert Jarzmik Date: Sat Jan 24 23:56:42 2009 -0800 USB: pxa27x_udc: add vbus session handling On vbus_session() call, optionally activate D+ pullup resistor and enable the udc, or deactivate D+ pullup resistor and disable the udc. It is intentional to not handle any VBus sense related irq. An external transceiver driver (like gpio_vbus) should catch VBus sense signal, and call usb_gadget_vbus_connect() or usb_gadget_vbus_disconnect(). Signed-off-by: Robert Jarzmik Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit eb50702539f9be3765127d927d3e9ccfeb65f26e Author: Robert Jarzmik Date: Sat Jan 24 23:55:34 2009 -0800 USB: pxa27x_udc: factor pullup code to prepare otg transceiver Prepare pxa27x_udc to handle usb D+ pullup properly : it should connect the pullup resistor and disconnect it only if no external transceiver is handling it. [ dbrownell@users.sourceforge.net: kerneldoc and gpio fixes ] Signed-off-by: Robert Jarzmik Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit c2344f13b59e007d782a3e591ebc551bc583a8b7 Author: Robert Jarzmik Date: Sat Jan 24 23:54:31 2009 -0800 USB: gpio_vbus: add delayed vbus_session calls Call usb_gadget_vbus_connect() and ...disconnect() from a workqueue rather than from an irq handler, allowing msleep() calls in vbus_session. Update kerneldoc to match. [ dbrownell@users.sourceforge.net: more kerneldoc updates ] Signed-off-by: Robert Jarzmik Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit dd44be6b17ac52238aa6c7f46b906d9fb76e7052 Author: Pete Zaitcev Date: Tue Jan 6 17:20:42 2009 -0700 usblp: continuously poll for status The usblp in 2.6.18 polled for status regardless if we actually needed it. At some point I dropped it, to save the batteries if nothing else. As it turned out, printers exist (e.g. Canon BJC-3000) that need prodding this way or else they stop. This patch restores the old behaviour. If you want to save battery, don't leave jobs in the print queue. I tested this on my printers by printing and examining usbmon traces to make sure status is being requested and printers continue to print. Tuomas Jäntti verified the fix on BJC-3000. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 5c16034d73da2c1b663aa25dedadbc533b3d811c Author: Alan Stern Date: Mon Mar 23 09:51:02 2009 -0400 USB: usb-storage: increase max_sectors for tape drives This patch (as1203) increases the max_sector limit for USB tape drives. By default usb-storage sets max_sectors to 240 (i.e., 120 KB) for all devices. But tape drives need a higher limit, since tapes can and do have very large block sizes. Without the ability to transfer an entire large block in a single command, such tapes can't be used. This fixes Bugzilla #12207. Signed-off-by: Alan Stern Reported-and-tested-by: Phil Mitchell Cc: stable Signed-off-by: Greg Kroah-Hartman commit 090b90118207e786d2990310d063fda5d52cce6e Author: David Brownell Date: Fri Mar 20 01:08:20 2009 -0700 USB: gadget: fix rndis regression Restore some code that was wrongly dropped from the RNDIS driver, and caused interop problems observed with OpenMoko. The issue is with hardware which needs help conforming to part of the USB 2.0 spec (section 8.5.3.2); some can automagically send a ZLP in response to an unexpected IN, but not all chips will do that. We don't need to check the packet length ourselves the way earlier code did, since the UDC must already check it. But we do need to tell the UDC when it must force a short packet termination of the data stage. (Based on a patch from Aric D. Blumer ) Signed-off-by: David Brownell Cc: stable Signed-off-by: Greg Kroah-Hartman commit 1662e3a7f076e51e3073faf9ce77157b529c475b Author: Alan Stern Date: Wed Mar 18 14:28:53 2009 -0400 USB: add quirk to avoid config and interface strings Apparently the Configuration and Interface strings aren't used as often as the Vendor, Product, and Serial strings. In at least one device (a Saitek Cyborg Gold 3D joystick), attempts to read the Configuration string cause the device to stop responding to Control requests. This patch (as1226) adds a quirks flag, telling the kernel not to read a device's Configuration or Interface strings, together with a new quirk for the offending joystick. Reported-by: Melchior FRANZ Tested-by: Melchior FRANZ Signed-off-by: Alan Stern Cc: stable [2.6.28 and 2.6.29, nothing earlier] Signed-off-by: Greg Kroah-Hartman commit b9d2fceecb6afd9dead4fd2488a543b302a3272e Author: Andrew H. Richter Date: Tue Mar 24 03:27:51 2009 +0000 claw: fix minor findings from code analysis tool This patch fixes two problems in the claw driver identified by static code analysis: o Change in case differentiation of received sense codes o Use correct data length in claw hard_start_xmit routine Signed-off-by: Andrew H. Richter Signed-off-by: Ursula Braun Signed-off-by: David S. Miller commit e2fc8cb4fedf57a63c05cd1e0f6e4f0e0238614a Author: Joel A. Fowler Date: Tue Mar 24 03:27:49 2009 +0000 ctcm: fix minor findings from code analysis tool From: Ursula Braun This patch fixes problems in the ctcm driver identified by static code analysis: o remove an unnecessary always true condition in ctcm_unpack_skb o remove duplicate assignment in ctc_mpc_alloc_channel o remove an unnecessary always true condition in ctcmpc_send_sweep_resp o remove duplicate initialization in ctcmpc_unpack_skb o shorten if condition in mpc_action_go_inop o remove INOP event if mpc group is undefined in mpc_action_doxid7 Signed-off-by: Joel A. Fowler Signed-off-by: Ursula Braun Signed-off-by: David S. Miller commit fb8585fc3f9b39153e0bdaf03f00a02dde9c03c6 Author: Roel Kluin Date: Tue Mar 24 03:27:48 2009 +0000 ctcm: avoid wraparound in length of incoming data Since the receive code should tolerate any incoming garbage, it should be protected against a potential wraparound when manipulating length values within incoming data. block_len is unsigned, so a too large subtraction will cause a wraparound. Signed-off-by: Roel Kluin Signed-off-by: Ursula Braun Signed-off-by: David S. Miller commit 3a05d1404d91efd63f0654a4bf59b8803c32efdd Author: Ursula Braun Date: Tue Mar 24 03:27:47 2009 +0000 ctcm: invalid return code from hard_start_xmit Avoid kernel warning by using the correct hard_start_xmit return code NETDEV_TX_BUSY for skb requeuing. Signed-off-by: Ursula Braun Signed-off-by: David S. Miller commit 8f0c40d4b6a6207ef2105d94544a9d1c0835c4ab Author: Ursula Braun Date: Tue Mar 24 03:27:46 2009 +0000 claw: invalid return codes from hard_start_xmit Avoid kernel warnings by using the correct hard_start_xmit return code NETDEV_TX_BUSY for skb requeuing. Signed-off-by: Ursula Braun Signed-off-by: David S. Miller commit 4e584d66ea60cf3d921aea78372f4e4d48a9155d Author: Ursula Braun Date: Tue Mar 24 03:27:45 2009 +0000 netiucv: invalid return code from hard_start_xmit Avoid kernel warning by using the correct hard_start_xmit return code NETDEV_TX_BUSY for skb requeuing. Signed-off-by: Ursula Braun Signed-off-by: David S. Miller commit 9e669d327a873bbab51e7e95ee9f9c3c49755594 Author: Klaus-Dieter Wacker Date: Tue Mar 24 03:27:44 2009 +0000 lcs: invalid return codes from hard_start_xmit. Lcs hard_start_xmit routine issued return codes other than defined for this interface. Now lcs returns only either NETDEV_TX_OK or NETDEV_TX_BUSY. Signed-off-by: Klaus-Dieter Wacker Signed-off-by: Ursula Braun Signed-off-by: David S. Miller commit e5b5719b06d3c614e904bc817177bd3c49c52edb Author: Klaus-Dieter Wacker Date: Tue Mar 24 03:27:43 2009 +0000 Use kthread instead of kernel_thread Lcs uses low-level kernel_thread implementation. All drivers should use API instead. Signed-off-by: Klaus-Dieter Wacker Signed-off-by: Ursula Braun Signed-off-by: David S. Miller commit 2ebe1d9efed5f232afc8d00901d0959c9814bce3 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:59 2009 +0100 ide: use try_to_identify() in ide_driveid_update() * Pass pointer to buffer for IDENTIFY data to do_identify() and try_to_identify(). * Un-static try_to_identify() and use it in ide_driveid_update(). * Rename try_to_identify() to ide_dev_read_id(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit ff18b89bef76d291db594af3e27b6c91e6600b57 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:58 2009 +0100 ide: clear drive IRQ after re-enabling local IRQs in ide_driveid_update() Clear drive IRQ after re-enabling local IRQs in ide_driveid_update() to match try_to_identify(). Also remove superfluous local_irq_enable() call while at it. Signed-off-by: Bartlomiej Zolnierkiewicz commit f323b80dceaca858f8e240ca098681fcfe7fd3c4 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:58 2009 +0100 ide: sanitize SELECT_MASK() usage in ide_driveid_update() Call SELECT_MASK() after ide_fix_driveid(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 1bd4c1f4fe6607a0253d1318847b618a2a598612 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:58 2009 +0100 ide: classify device type in do_probe() Defer classifying device type from do_identify() to do_probe(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 552d3a99bdce8a0d7f9abe3766fb3655ef5757dc Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:58 2009 +0100 ide: remove broken EXABYTENEST support do_identify() marks EXABYTENEST device as non-present and frees drive->id so enable_nest() has absolutely no chance of working. The code was like this since at least 2.6.12-rc2 and nobody has noticed so just remove broken EXABYTENEST support. Signed-off-by: Bartlomiej Zolnierkiewicz commit 4cda15a0995f2da5727514f84ec26d8b7420e1f9 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:57 2009 +0100 ide: shorten timeout value in ide_driveid_update() Shorten timeout value in ide_driveid_update() (30s -> 15s) to match try_to_identify(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 62bd0441a60b0499db339b3dc1be039f8ed9fd35 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:55 2009 +0100 ide: propagate AltStatus workarounds to ide_driveid_update() Propagate AltStatus workarounds from try_to_identify() to ide_driveid_update(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 2f40c9b0b65b5635e2e13dfa068bd56fe7a8ff98 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:54 2009 +0100 ide: fix kmalloc() failure handling in ide_driveid_update() * Doing kmalloc() in the middle of command execution is not only ugly but leaves drive waiting to send data on kmalloc() failure. Fix it. While at it: * Unify error code paths. * Fixup error message to be more useful and add missing KERN_ERR level. * Rename 'stat' variable to 's'. Signed-off-by: Bartlomiej Zolnierkiewicz commit d45b70ab9bbf1a46ae52972d532f9e267b8d39d9 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:54 2009 +0100 mn10300: remove * Remove superfluous include. * Remove no longer used SUPPORT_SLOW_DATA_PORTS define. * Move defining SUPPORT_VLB_SYNC to . * Use __ide_mm_*() macros from (MN10300 uses only memory-mapped I/O). * Remove . While at it: * Remove superfluous SPARC64 #ifdef from . Cc: David Howells Signed-off-by: Bartlomiej Zolnierkiewicz commit 662641d98b4396b48f513726d141c5f646c08259 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:54 2009 +0100 frv: remove * Remove superfluous includes. * Remove . Cc: David Howells Signed-off-by: Bartlomiej Zolnierkiewicz commit 86ccf37c6acd74cf7e4b7751ee045de19943c5a0 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:53 2009 +0100 ide: remove pciirq argument from ide_pci_setup_ports() * Set ->irq explicitly in cs5520.c. * Remove irq argument from ide_hw_configure(). * Remove pciirq argument from ide_pci_setup_ports(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 2ed0ef543ae3f3ea4f8bd0433fb1fed22625a309 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:53 2009 +0100 ide: fix ->init_chipset method to return 'int' value * Return 0 instead of dev->irq in ->init_chipset implementations. * Fix ->init_chipset method to return 'int' value instead of 'unsigned int' one. This fixes ->init_chipset handling for host drivers (cs5530, hpt366 and pdc202xx_new) for which it is possible for this method to fail. Signed-off-by: Bartlomiej Zolnierkiewicz commit a182807a89946bd531122bb2da60fa9ceee90343 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:53 2009 +0100 ide: remove try_to_identify() wrapper There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit f77e03c68f11f54509cd660ddb5a0badfdfc61cb Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:53 2009 +0100 ide: remove no longer needed IRQ auto-probing from try_to_identify() (v2) v2: Update actual_try_to_identify() documentation. Signed-off-by: Bartlomiej Zolnierkiewicz commit 8b07ed26f8eb73d4f55a9d852712cd588c45ff51 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:52 2009 +0100 ide: remove no longer needed IRQ fallback code from hwif_init() Then remove no longer used __ide_default_irq(). Signed-off-by: Bartlomiej Zolnierkiewicz commit bd0c08470fcded75d3904734ee22ae5b363737db Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:52 2009 +0100 amd74xx: remove no longer needed ->init_hwif method This is now handled by core IDE PCI code. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 2467922a560bb7e6eb4635435760ad0a2197ffcc Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:52 2009 +0100 ide: remove no longer needed IDE_HFLAG[_FORCE]_LEGACY_IRQS There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit f65dedfd7b75f19bde42bafbe84fddce18c42499 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:51 2009 +0100 ide: use ide_pci_is_in_compatibility_mode() in ide_pci_init_{one,two}() Signed-off-by: Bartlomiej Zolnierkiewicz commit 5bae8bf4508004d46487b3a18769d0ccff01c532 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:49 2009 +0100 ide: use pci_get_legacy_ide_irq() in ide_pci_init_{one,two}() Signed-off-by: Bartlomiej Zolnierkiewicz commit 80d15a607ae95dd0514ab1ab5ea1058a3a585f2b Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:49 2009 +0100 ide: handle IDE_HFLAG[_FORCE]_LEGACY_IRQS in ide_pci_init_{one,two}() Move handling of IDE_HFLAG[_FORCE]_LEGACY_IRQS from ide_init_port() to ide_pci_init_{one,two}(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 1b166ae7bb9610cdd3c4c66b960aa04004054e41 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:49 2009 +0100 trm290: small ->init_hwif cleanup Core IDE PCI code takes care of assigning hwif->irq for both ports. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 49727e3d20ba10921572e35bc99b2c2e1b8c1dba Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:49 2009 +0100 ns87415: small ->init_hwif cleanup Core IDE PCI code takes care of assigning hwif->irq for both ports. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 973d9e743979d4d3f06d8071c22187b2bdc0ef24 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:48 2009 +0100 ns87415: use pci_get_legacy_ide_irq() Fix ->init_hwif to use pci_get_legacy_ide_irq() instead of __ide_default_irq(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 213e4b0a3483b8cc99c4578923b9899e84e086e0 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:48 2009 +0100 amd74xx: use ide_pci_is_in_compatibility_mode() Fix ->init_hwif to check if IDE PCI controller is in compatibility mode instead of checking for hwif->irq == 0. Signed-off-by: Bartlomiej Zolnierkiewicz commit b75aa122edd91599e0cf2ae57a5de1e84d9895c2 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:48 2009 +0100 mn10300: add pci_get_legacy_ide_irq() to Add missing pci_get_legacy_ide_irq() implementation before it becomes required by core IDE PCI code. Cc: David Howells Signed-off-by: Bartlomiej Zolnierkiewicz commit 327fa1c29466b8fe471a91fc11e9c6171163c81a Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:47 2009 +0100 ide: move error handling code to ide-eh.c (v2) Do some CodingStyle fixups in while at it. v2: Add missing include (reported by Stephen Rothwell). Signed-off-by: Bartlomiej Zolnierkiewicz commit 122f06f8bce406169d61242a3eb667027e27cca7 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:47 2009 +0100 ide: checkpatch.pl fixes for ide-iops.c Fix following checkpatch.pl warnings/errors: - WARNING: space prohibited between function name and open parenthesis '(' - WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable - WARNING: line over 80 characters - ERROR: trailing whitespace - ERROR: space required before the open parenthesis '(' Signed-off-by: Bartlomiej Zolnierkiewicz commit ee1b1cc974816b59af2ba0be1912e1c2a200ae11 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:47 2009 +0100 ide: fix comments in ide_config_drive_speed() Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 4d7bb471ce0283f586817abea81254b67598aae6 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:47 2009 +0100 ide: fix printk() levels in [atapi_]reset_pollfunc() Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 1574cf6cb4800525be769ee6023c567113fa2d18 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:46 2009 +0100 ide: move standard I/O code to ide-io-std.c Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 0d6a9754c06e173552b0ad5fad45f69786b6de99 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:46 2009 +0100 ide: move ide_read_bcount_and_ireason() to ide-atapi.c Signed-off-by: Bartlomiej Zolnierkiewicz commit 7eeaaaa52285d5e6cb79f515e99c591dcb9d04fe Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:46 2009 +0100 ide: move xfer mode tuning code to ide-xfer-mode.c * Move xfer mode tuning code to ide-xfer-mode.c. * Add CONFIG_IDE_XFER_MODE config option to be selected by host drivers that support xfer mode tuning. * Add CONFIG_IDE_XFER_MODE=n static inline versions of ide_set_pio() and ide_set_xfer_rate(). * Make IDE_TIMINGS and BLK_DEV_IDEDMA config options select IDE_XFER_MODE, also add explicit selects for few host drivers that need it. * Build/link ide-xfer-mode.o and ide-pio-blacklist.o (it is needed only by ide-xfer-mode.o) only if CONFIG_IDE_XFER_MODE=y. Signed-off-by: Bartlomiej Zolnierkiewicz commit 11938c929022bb92b1a42f5e1289524a1e465dc0 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:44 2009 +0100 ide: move device settings code to ide-devsets.c Remove stale comment from ide.c while at it. Signed-off-by: Bartlomiej Zolnierkiewicz commit c4e66c36cce3f23d68013c4112013123ffe80bdb Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:44 2009 +0100 ide: move ide_do_park_unpark() to ide-park.c Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 1bc6daae4aba9194f8ff6801af8367a1a4718965 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:44 2009 +0100 ide: factor out processing of special commands from ide_special_rq() Factor out processing of special commands from ide_special_rq() to ide_do_devset() and ide_do_park_unpark(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 1866082339597930c5b77aad8de34ab4fbb5724f Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:44 2009 +0100 ide: remove ide_do_drive_cmd() * Use elv_add_request() instead of __elv_add_request() in ide_do_drive_cmd(). * ide_do_drive_cmd() is used only in ide-{atapi,cd}.c so inline it there. There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 65ca5377322c7543163066f373ae9e6b0ad8de8a Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:43 2009 +0100 ide: move ide_dma_timeout_retry() to ide-dma.c Move ide_dma_timeout_retry() to ide-dma.c and add static inline version for CONFIG_BLK_DEV_IDEDMA=n. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit b6a45a0b1e9a358b81201659cf87b023e3ec73e0 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:43 2009 +0100 ide: move drive_is_ready() to ide-io.c Move drive_is_ready() to ide-io.c, then make it static. Also make some minor CodingStyle fixups while at it. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 75a0cff4e8ed47584dd15fbde2172ebc4c051bb2 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:43 2009 +0100 ide: unexport ide_devset_execute() There are no modular ide_devset_execute() users left so unexport it. Signed-off-by: Bartlomiej Zolnierkiewicz commit 2b9ae4608ffbdb57c1d5fe9db440810a995a91fa Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:42 2009 +0100 ide: remove stale comments from drive_is_ready() Signed-off-by: Bartlomiej Zolnierkiewicz commit b0b391430bea405ced6038e4cf4d8cf831511935 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:42 2009 +0100 ide-acpi: remove taskfile_load_raw() * taskfile_load_raw() is used only by do_drive_set_taskfiles() so inline it there. While at it: - rename 'args' variable to 'task' - remove struct taskfile_array - do ide_acpigtf check early - use REGS_PER_GTF Signed-off-by: Bartlomiej Zolnierkiewicz commit 1f5892a5d21c905b1614cbd6bd8c5ad2cfbc106f Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:42 2009 +0100 ide-acpi: cleanup do_drive_set_taskfiles() * ide_noacpi is already checked by ide_acpi_exec_tfs() which is the only user of do_drive_set_taskfiles(). * ide_acpi_exec_tfs() prints sufficient debug info about the device so no need to do it again. * do_drive_get_GTF() + ide_acpi_exec_tfs() make sure that this function will never be called with incorrect gtf_length argument or if device is not present. Signed-off-by: Bartlomiej Zolnierkiewicz commit 2f0d0fd2a605666d38e290c5c0d2907484352dc4 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:42 2009 +0100 ide-acpi: cleanup do_drive_get_GTF() * ide_noacpi is already checked by ide_acpi_exec_tfs() which is the only user of do_drive_get_GTF(). * ide_acpi_exec_tfs() prints sufficient debug info about the device so no need to have excessive data about port/host. * It is sufficient to check for drive->acpidata->obj_handle as it will be NULL if dev == NULL or hwif->acpidata == NULL or device is not present. Signed-off-by: Bartlomiej Zolnierkiewicz commit 8b803bd184e3f6892284d4b50801b9ec85cd9b96 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:41 2009 +0100 ide: sanitize ACPI initialization * ide_acpi_init() -> ide_acpi_init_port() * ide_acpi_blacklist() -> ide_acpi_init() * Call ide_acpi_init() only once (do it during IDE core initialization) and cleanup the function accordingly. Signed-off-by: Bartlomiej Zolnierkiewicz commit 7ed5b157d9dff55bf477b4c8b4708d5d45476677 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:41 2009 +0100 ide: add ide_for_each_present_dev() iterator * Add ide_for_each_present_dev() iterator and convert IDE code to use it. * Do some drive-by CodingStyle fixups in ide-acpi.c while at it. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 8cd3c605624035b7f57deb8894e17c5ba6d05b2e Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:41 2009 +0100 ide-acpi: init ACPI handles early for devices Init ACPI handles for devices in ide_acpi_port_init_devices() and remove no longer needed ide_acpi_drive_get_handle(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 94635d3ecfd478ada7cedcffd9d53709074444fc Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:41 2009 +0100 ide-acpi: no need to zero ->acpidata for devices ide_acpi_init() takes care of it. Signed-off-by: Bartlomiej Zolnierkiewicz commit 1902a253e4b14378405de761cb444dfeef15e500 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:40 2009 +0100 ide: remove superfluous check from ide_proc_port_register_devices() Signed-off-by: Bartlomiej Zolnierkiewicz commit 0688d3a6ba9bf4e1df62ce627ad1daa0e2bf9148 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:39 2009 +0100 ide: init_irq() doesn't need to hold ide_cfg_mtx Signed-off-by: Bartlomiej Zolnierkiewicz commit 7362951b4818763b6abaecd3f870739125145cc1 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:39 2009 +0100 ide: move ->lock and ->timer init from init_irq() to ide_init_port_data() Signed-off-by: Bartlomiej Zolnierkiewicz commit d336ae3cf567185fb8fc03c10e9394920f7d5ab1 Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:39 2009 +0100 ide: no need to touch local IRQs in ide_probe_port() Remove superfluous local_save_flags() local_irq_enable_in_hardirq() ... local_irq_restore() combo. Signed-off-by: Bartlomiej Zolnierkiewicz commit 7a254df007b3db88bd430474030fec92e7bab22a Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:39 2009 +0100 ide: move ide_pktcmd_tf_load() to ide-atapi.c Then make it static and remove 'dma' argument. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 7610c4f5efc495d8e15ef608c4a66932f895379a Author: Bartlomiej Zolnierkiewicz Date: Tue Mar 24 23:22:38 2009 +0100 ide: fix IDE_DFLAG_NO_IO_32BIT handling * IDE_DFLAG_NO_IO_32BIT may be set by cmd640's ->init_dev method so don't clear it in ide_port_tune_devices() (+ no need to do it). * Move IDE_DFLAG_NO_IO_32BIT handling to ide_port_init_devices(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 67aa0f767af488a7f1e41cccb4f7a4893f24a1ab Author: Luis Henriques Date: Tue Mar 24 22:10:02 2009 +0000 sched: remove unused fields from struct rq Impact: cleanup, new schedstat ABI Since they are used on in statistics and are always set to zero, the following fields from struct rq have been removed: yld_exp_empty, yld_act_empty and yld_both_empty. Both Sched Debug and SCHEDSTAT_VERSION versions has also been incremented since ABIs have been changed. The schedtop tool has been updated to properly handle new version of schedstat: http://rt.wiki.kernel.org/index.php/Schedtop_utility Signed-off-by: Luis Henriques Acked-by: Gregory Haskins Acked-by: Peter Zijlstra LKML-Reference: <20090324221002.GA10061@hades.domain.com> Signed-off-by: Ingo Molnar commit 5393f3162d3a85317e1e22c33539905fa5258e5f Author: Josh Stone Date: Tue Mar 24 09:44:28 2009 +0000 net: Add dependent headers to trace/skb.h The tracing header needs to include definitions for the macros used and the types referenced. This lets automated tracing tools like SystemTap make use of the tracepoint without any specific knowledge of its meaning (leaving that to the user). Signed-off-by: Josh Stone CC: Neil Horman Signed-off-by: David S. Miller commit 35c7f6de7339f40a591a8aeccacdc429b1953674 Author: Eric Dumazet Date: Tue Mar 24 14:15:22 2009 -0700 arp_tables: ifname_compare() can assume 16bit alignment Arches without efficient unaligned access can still perform a loop assuming 16bit alignment in ifname_compare() Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 8dd1d0471bcf634f2cd6a6cf4b6531bb61f0af47 Author: Jan Engelhardt Date: Tue Mar 24 13:35:27 2009 -0700 netfilter: trivial Kconfig spelling fixes Supplements commit 67c0d57930ff9a24c6c34abee1b01f7716a9b0e2. Signed-off-by: Jan Engelhardt Signed-off-by: David S. Miller commit b5bb14386eabcb4229ade2bc0a2b237ca166d37d Merge: bb4f92b... 1d45209... Author: David S. Miller Date: Tue Mar 24 13:24:36 2009 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 commit 142071b83426674ef2dab98cf2a6627328d0988e Author: Geert Uytterhoeven Date: Tue Mar 24 13:19:50 2009 -0700 dnet: drivers/net/dnet.c needs On m68k: | drivers/net/dnet.c: In function 'dnet_readw_mac': | drivers/net/dnet.c:36: error: implicit declaration of function 'writel' | drivers/net/dnet.c:43: error: implicit declaration of function 'readl' | drivers/net/dnet.c: In function 'dnet_probe': | drivers/net/dnet.c:873: error: implicit declaration of function 'ioremap' | drivers/net/dnet.c:873: warning: assignment makes pointer from integer without a cast | drivers/net/dnet.c:939: error: implicit declaration of function 'iounmap' Signed-off-by: Geert Uytterhoeven Signed-off-by: David S. Miller commit bb4f92b3a33bfc31f55098da85be44702bea2d16 Author: Anton Vorontsov Date: Tue Mar 24 12:06:46 2009 -0700 ucc_geth: Fix build breakage caused by a merge This patch fixes following build error: CC ucc_geth.o ucc_geth.c: In function 'ucc_geth_probe': ucc_geth.c:3644: error: implicit declaration of function 'uec_mdio_bus_name' make[2]: *** [ucc_geth.o] Error 1 Signed-off-by: Anton Vorontsov Signed-off-by: David S. Miller commit 1d45209d89e647e9f27e4afa1f47338df73bc112 Author: Eric Dumazet Date: Tue Mar 24 14:26:50 2009 +0100 netfilter: nf_conntrack: Reduce conntrack count in nf_conntrack_free() We use RCU to defer freeing of conntrack structures. In DOS situation, RCU might accumulate about 10.000 elements per CPU in its internal queues. To get accurate conntrack counts (at the expense of slightly more RAM used), we might consider conntrack counter not taking into account "about to be freed elements, waiting in RCU queues". We thus decrement it in nf_conntrack_free(), not in the RCU callback. Signed-off-by: Eric Dumazet Tested-by: Joakim Tjernlund Signed-off-by: Patrick McHardy commit 68db1961bbf4e16c220ccec4a780e966bc1fece3 Author: Nikanth Karthikesan Date: Tue Mar 24 12:29:54 2009 +0100 loop: support barrier writes Honour barrier requests in the loop back block device driver. In case of barrier bios, flush the backing file once before processing the barrier and once after to guarantee ordering. In case of filesystems that does not support fsync, barrier bios would be failed with -EOPNOTSUPP. Signed-off-by: Nikanth Karthikesan Signed-off-by: Jens Axboe commit 05378940caf979a8655c18b18a17213dcfa52412 Author: Boaz Harrosh Date: Tue Mar 24 12:23:40 2009 +0100 bsg: add support for tail queuing Currently inherited from sg.c bsg will submit asynchronous request at the head-of-the-queue, (using "at_head" set in the call to blk_execute_rq_nowait()). This is bad in situation where the queues are full, requests will execute out of order, and can cause starvation of the first submitted requests. The sg_io_v4->flags member is used and a bit is allocated to denote the Q_AT_TAIL. Zero is to queue at_head as before, to be compatible with old code at the write/read path. SG_IO code path behavior was changed so to be the same as write/read behavior. SG_IO was very rarely used and breaking compatibility with it is OK at this stage. sg_io_hdr at sg.h also has a flags member and uses 3 bits from the first nibble and one bit from the last nibble. Even though none of these bits are supported by bsg, The second nibble is allocated for use by bsg. Just in case. Signed-off-by: Boaz Harrosh CC: Douglas Gilbert Signed-off-by: Jens Axboe commit 0061d38642244892e17156f005bd7055fe744644 Author: Dave Jones Date: Mon Mar 16 10:06:05 2009 +0100 cpqarray: enable bus mastering We've been carrying this patch for the last 3 years in Fedora, long past time we got it upstream... Call pci_set_master to enable bus-mastering if the BIOS hasn't done it already. Signed-off-by: Kyle McMartin Signed-off-by: Dave Jones Signed-off-by: Jens Axboe commit d399228646e26db315d6233bed65ec9d08c57f57 Author: Petros Koutoupis Date: Wed Mar 11 10:49:35 2009 +0100 block: genhd.h cleanup patch In include/linux/genhd.h: Line 335 has a comment that needs to be updated from: /* drivers/block/ll_rw_blk.c */ to /* block/blk-core.c */. Also as of kernel 2.6.16, the function definition for get_blkdev_list was removed from block/genhd.c but the function declaration is still present on line 339. This patch addresses both those fixes, by updating the comment and removing the declaration. Signed-off-by: Petros Koutoupis Signed-off-by: Jens Axboe commit 6d2a78e783416ba99e36beb1d4395b785b34e867 Author: Martin K. Petersen Date: Tue Mar 10 08:27:39 2009 +0100 block: add private bio_set for bio integrity allocations The integrity bio allocation needs its own bio_set to avoid violating the mempool allocation rules and risking deadlocks. Signed-off-by: Martin K. Petersen Signed-off-by: Jens Axboe commit 32ca163c9cdb33151d79e95a7cf244f62b5d4418 Author: Petros Koutoupis Date: Tue Mar 10 08:25:54 2009 +0100 block: genhd.h comment needs updating The include/linux/genhd.h file, on line 338-352 declares some function prototypes in which the comment on line 338 states that the definition of these prototypes are to be found at drivers/block/genhd.c. The problem is that genhd.c has been relocated to block/genhd.c. See attached patch to correct this minor cosmetic typo. Signed-off-by: Petros Koutoupis Signed-off-by: Jens Axboe commit 50e174931051bf4849cd7931667bb0a4d681ff60 Author: Jens Axboe Date: Fri Mar 6 11:12:17 2009 +0100 block: get rid of unused blkdev_free_rq() define Signed-off-by: Jens Axboe commit f3b144aa7f2861e1024682af3bf3dbf1c29184b9 Author: Jens Axboe Date: Fri Mar 6 08:48:33 2009 +0100 block: remove various blk_queue_*() setting functions in blk_init_queue_node() It calls blk_queue_make_request(), which sets the identical set of limits. Signed-off-by: Jens Axboe commit 10cbda97e73c7d537d7174eadb2d098484f8f1da Author: Jens Axboe Date: Fri Feb 27 20:14:20 2009 +0100 cciss: add BUILD_BUG_ON() for catching bad CommandList_struct alignment The hardware requires 64-bit alignment of commands, so add a build bug check for that. The recent commit 8a3173de4ab4cdacc43675dc5c077f9a5bf17f5f didn't change the size of the command, but other additions/changes may and thus break badly at runtime. Signed-off-by: Jens Axboe commit a7fcd37cdcb47806fb8a9070f006ee34061defa6 Author: Jens Axboe Date: Fri Dec 5 16:10:29 2008 +0100 block: don't create bio_vec slabs of less than the inline number If we don't have CONFIG_BLK_DEV_INTEGRITY set, then we don't have any external dependencies on the bio_vec slabs. So don't create the ones that we will inline anyway. Signed-off-by: Jens Axboe commit 34053979fb1d923217685cf166349f1899980581 Author: Ingo Molnar Date: Sat Feb 21 11:16:36 2009 +0100 block: cleanup bio_alloc_bioset() this warning (which got fixed by commit b2bf968): fs/bio.c: In function ‘bio_alloc_bioset’: fs/bio.c:305: warning: ‘p’ may be used uninitialized in this function Triggered because the code flow in bio_alloc_bioset() is correct but a bit complex for the compiler to see through. Streamline it a bit - this also makes the code a tiny bit more compact: text data bss dec hex filename 7540 256 40 7836 1e9c bio.o.before 7539 256 40 7835 1e9b bio.o.after Also remove an older compiler-warnings annotation from this function, it's not needed. Signed-off-by: Ingo Molnar Signed-off-by: Jens Axboe commit df3647b24510e23523f81a77bb179cd9ae3d613b Author: Steven Whitehouse Date: Mon Mar 23 11:38:55 2009 +0000 GFS2: Fix freeze issue This removes some old code that was causing issues during filesystem freeze. Reported-by: Andrew Price Tested-by: Andrew Price Signed-off-by: Steven Whitehouse commit 9c538837d844574787c95bd5665f684559fb7065 Author: Steven Whitehouse Date: Thu Mar 19 13:15:44 2009 +0000 Fix a minor bug in the previous patch The logic requires that we mark the glock dirty in page_mkwrite otherwise we might not flush correctly in the case that no allocation was required in the process of dirying the page. Also we need to set the shared write flag early for the same reason. Signed-off-by: Steven Whitehouse commit 6bac243f0793499782267342eba852a8a6cc7ac4 Author: Steven Whitehouse Date: Mon Mar 9 09:03:51 2009 +0000 GFS2: Clean up of glops.c This cleans up a number of bits of code mostly based in glops.c. A couple of simple functions have been merged into the callers to make it more obvious what is going on, the mysterious raising of i_writecount around the truncate_inode_pages() call has been removed. The meta_go_* operations have been renamed rgrp_go_* since that is the only lock type that they are used with. The unused argument of gfs2_read_sb has been removed. Also a bug has been fixed where a check for the rindex inode was in the wrong callback. More comments are added, and the debugging code is improved too. Signed-off-by: Steven Whitehouse commit 02ffad08e838997fad3de05c85560a57e5fd92de Author: Benjamin Marzinski Date: Fri Mar 6 10:03:20 2009 -0600 GFS2: Fix locking bug in failed shared to exclusive conversion After calling out to the dlm, GFS2 sets the new state of a glock to gl_target in gdlm_ast(). However, gl_target is not always the lock state that was requested. If a conversion from shared to exclusive fails, finish_xmote() will call do_xmote() with LM_ST_UNLOCKED, instead of gl->gl_target, so that it can reacquire the lock in exlusive the next time around. In this case, setting the lock to gl_target in gdlm_ast() will make GFS2 think that it has the glock in exclusive mode, when really, it doesn't have the glock locked at all. This patch adds a new field to the gfs2_glock structure, gl_req, to track the mode that was requested. Signed-off-by: Benjamin Marzinski Signed-off-by: Steven Whitehouse commit 229615def3f573fc448d20f62c6ec1bc9340cefb Author: Hisashi Hifumi Date: Tue Mar 3 11:45:20 2009 +0900 GFS2: Pagecache usage optimization on GFS2 I introduced "is_partially_uptodate" aops for GFS2. A page can have multiple buffers and even if a page is not uptodate, some buffers can be uptodate on pagesize != blocksize environment. This aops checks that all buffers which correspond to a part of a file that we want to read are uptodate. If so, we do not have to issue actual read IO to HDD even if a page is not uptodate because the portion we want to read are uptodate. "block_is_partially_uptodate" function is already used by ext2/3/4. With the following patch random read/write mixed workloads or random read after random write workloads can be optimized and we can get performance improvement. I did a performance test using the sysbench. #sysbench --num-threads=16 --max-requests=200000 --test=fileio --file-num=1 --file-block-size=8K --file-total-size=2G --file-test-mode=rndrw --file-fsync-freq=0 --file-rw-ratio=1 run -2.6.29-rc6 Test execution summary: total time: 202.6389s total number of events: 200000 total time taken by event execution: 2580.0480 per-request statistics: min: 0.0000s avg: 0.0129s max: 49.5852s approx. 95 percentile: 0.0462s -2.6.29-rc6-patched Test execution summary: total time: 177.8639s total number of events: 200000 total time taken by event execution: 2419.0199 per-request statistics: min: 0.0000s avg: 0.0121s max: 52.4306s approx. 95 percentile: 0.0444s arch: ia64 pagesize: 16k blocksize: 4k Signed-off-by: Hisashi Hifumi Signed-off-by: Steven Whitehouse commit 02ab1721591f7ac1f632fc74b301513bd6f5849f Author: Hannes Eder Date: Sat Feb 21 02:12:05 2009 +0100 GFS2: fix sparse warning: Should it be static? Impact: Make symbol static. Fix this sparse warning: fs/gfs2/rgrp.c:188:5: warning: symbol 'gfs2_bitfit' was not declared. Should it be static? Signed-off-by: Hannes Eder Signed-off-by: Steven Whitehouse commit 075ac44875323941210335b3b0abc1895356d919 Author: Hannes Eder Date: Sat Feb 21 02:11:42 2009 +0100 GFS2: fix sparse warnings: constant is so big it is ... Fix this sparse warnings: fs/gfs2/rgrp.c:156:23: warning: constant 0xffffffffffffffff is so big it is unsigned long long fs/gfs2/rgrp.c:157:23: warning: constant 0xaaaaaaaaaaaaaaaa is so big it is unsigned long long fs/gfs2/rgrp.c:158:23: warning: constant 0x5555555555555555 is so big it is long long fs/gfs2/rgrp.c:194:20: warning: constant 0x5555555555555555 is so big it is long long fs/gfs2/rgrp.c:204:44: warning: constant 0x5555555555555555 is so big it is long long Signed-off-by: Hannes Eder Signed-off-by: Steven Whitehouse commit b9a9694570756e689068f0450cf3c570f74b2b01 Author: Steven Whitehouse Date: Thu Feb 19 10:32:35 2009 +0000 GFS2: Support quota/noquota mount arguments This adds support for "quota" and "noquota" mount options in addition to the existing "quota=on/off/account" so that we are compatible with the names by which these options are more generally known. Signed-off-by: Steven Whitehouse commit 223b2b889f379dcea9cef722336a57e8b398bc95 Author: Steven Whitehouse Date: Tue Feb 17 14:13:35 2009 +0000 GFS2: Fix alignment issue and tidy gfs2_bitfit An alignment issue with the existing bitfit algorithm was reported on IA64. This patch attempts to fix that, and also to tidy up the code a bit. There is now more documentation about how this works and it has survived a number of different tests. Signed-off-by: Steven Whitehouse commit 64d576ba23bfd9b770cbb0279200f479272eb859 Author: Steven Whitehouse Date: Thu Feb 12 13:31:58 2009 +0000 GFS2: Add a "demote a glock" interface to sysfs This adds a sysfs file called demote_rq to GFS2's per filesystem directory. Its possible to use this file to demote arbitrary glocks in exactly the same way as if a request had come in from a remote node. This is intended for testing issues relating to caching of data under glocks. Despite that, the interface is generic enough to send requests to any type of glock, but be careful as its not always safe to send an arbitrary message to an arbitrary glock. For that reason and to prevent DoS, this interface is restricted to root only. The messages look like this: : Example: echo -n "2:13324 EX" >/sys/fs/gfs2/unity:myfs/demote_rq Which means "please demote inode glock (type 2) number 13324 so that I can get an EX (exclusive) lock". The lock modes are those which would normally be sent by a remote node in its callback so if you want to unlock a glock, you use EX, to demote to shared, use SH or PR (depending on whether you like GFS2 or DLM lock modes better!). If the glock doesn't exist, you'll get -ENOENT returned. If the arguments don't make sense, you'll get -EINVAL returned. The plan is that this interface will be used in combination with the blktrace patch which I recently posted for comments although it is, of course, still useful in its own right. Signed-off-by: Steven Whitehouse commit 02e3cc70ecbd4352ae4d26459929f43ab1547251 Author: Steven Whitehouse Date: Tue Feb 10 13:48:30 2009 +0000 GFS2: Expose UUID via sysfs/uevent Since we have a UUID, we ought to expose it to the user via sysfs and uevents. We already have the fs name in both of these places (a combination of the lock proto and lock table name) so if we add the UUID as well, we have a full set. For older filesystems (i.e. those created before mkfs.gfs2 was writing UUIDs by default) the sysfs file will appear zero length, and no UUID env var will be added to the uevents. Signed-off-by: Steven Whitehouse commit f15ab5619d8068a321094f4705147764d689e88e Author: Steven Whitehouse Date: Mon Feb 9 09:25:01 2009 +0000 GFS2: Support generation of discard requests This patch allows GFS2 to generate discard requests for blocks which are no longer useful to the filesystem (i.e. those which have been freed as the result of an unlink operation). The requests are generated at the time which those blocks become available for reuse in the filesystem. In order to use this new feature, you have to specify the "discard" mount option. The code coalesces adjacent blocks into a single extent when generating the discard requests, thus generating the minimum number. If an error occurs when the request has been sent to the block device, then it will print a message and turn off the requests for that filesystem. If the problem is temporary, then you can use remount to turn the option back on again. There is also a nodiscard mount option so that you can use remount to turn discard requests off, if required. Signed-off-by: Steven Whitehouse commit d8348de06f704fc34d24ec068546ecb1045fc11a Author: Steven Whitehouse Date: Thu Feb 5 10:12:38 2009 +0000 GFS2: Fix deadlock on journal flush This patch fixes a deadlock when the journal is flushed and there are dirty inodes other than the one which caused the journal flush. Originally the journal flushing code was trying to obtain the transaction glock while running the flush code for an inode glock. We no longer require the transaction glock at this point in time since we know that any attempt to get the transaction glock from another node will result in a journal flush. So if we are flushing the journal, we can be sure that the transaction lock is still cached from when the transaction was started. By inlining a version of gfs2_trans_begin() (minus the bit which gets the transaction glock) we can avoid the deadlock problems caused if there is a demote request queued up on the transaction glock. In addition I've also moved the umount rwsem so that it covers the glock workqueue, since it all demotions are done by this workqueue now. That fixes a bug on umount which I came across while fixing the original problem. Reported-by: David Teigland Signed-off-by: Steven Whitehouse commit e7c8707ea2b9106f0f78c43348ff5d5e82ba7961 Author: Steven Whitehouse Date: Tue Jan 20 16:39:23 2009 +0000 GFS2: Fix error path ref counting for root inode We were keeping hold of an extra ref to the root inode in one of the error paths, that resulted in a hang. Reported-by: Nate Straz Signed-off-by: Steven Whitehouse Tested-by: Robert Peterson commit ac2425e7d319dec0523e52ee120a158ce6668cbd Author: Steven Whitehouse Date: Tue Jan 13 09:53:43 2009 +0000 GFS2: Remove unused field from glock The time stamp field is unused in the glock now that we are using a shrinker, so that we can remove it and save sizeof(unsigned long) bytes in each glock. Signed-off-by: Steven Whitehouse commit f057f6cdf64175db1151b1f5d110e29904f119a1 Author: Steven Whitehouse Date: Mon Jan 12 10:43:39 2009 +0000 GFS2: Merge lock_dlm module into GFS2 This is the big patch that I've been working on for some time now. There are many reasons for wanting to make this change such as: o Reducing overhead by eliminating duplicated fields between structures o Simplifcation of the code (reduces the code size by a fair bit) o The locking interface is now the DLM interface itself as proposed some time ago. o Fewer lookups of glocks when processing replies from the DLM o Fewer memory allocations/deallocations for each glock o Scope to do further optimisations in the future (but this patch is more than big enough for now!) Please note that (a) this patch relates to the lock_dlm module and not the DLM itself, that is still a separate module; and (b) that we retain the ability to build GFS2 as a standalone single node filesystem with out requiring the DLM. This patch needs a lot of testing, hence my keeping it I restarted my -git tree after the last merge window. That way, this has the maximum exposure before its merged. This is (modulo a few minor bug fixes) the same patch that I've been posting on and off the the last three months and its passed a number of different tests so far. Signed-off-by: Steven Whitehouse commit 22077f57dec8fcbeb1112b35313961c0902ff038 Author: Steven Whitehouse Date: Thu Jan 8 14:28:42 2009 +0000 GFS2: Remove "double" locking in quota We only really need a single spin lock for the quota data, so lets just use the lru lock for now. Signed-off-by: Steven Whitehouse Cc: Abhijith Das commit 0a7ab79c5b5a16035e09b466c9013c8afc3b4bff Author: Abhijith Das Date: Wed Jan 7 16:03:37 2009 -0600 GFS2: change gfs2_quota_scan into a shrinker Deallocation of gfs2_quota_data objects now happens on-demand through a shrinker instead of routinely deallocating through the quotad daemon. Signed-off-by: Abhijith Das Signed-off-by: Steven Whitehouse commit 2db2aac255c38e75ad17c0b24feb589ccfccc0ae Author: Abhijith Das Date: Wed Jan 7 10:21:34 2009 -0600 GFS2: Bring back lvb-related stuff to lock_nolock to support quotas The quota code uses lvbs and this is currently not implemented in lock_nolock, thereby causing panics when quota is enabled with lock_nolock. This patch adds the relevant bits. Signed-off-by: Abhijith Das Signed-off-by: Steven Whitehouse commit 6f04c1c7fe9566d777fb7961391690866839e722 Author: Steven Whitehouse Date: Tue Jan 6 11:52:25 2009 +0000 GFS2: Fix remount argument parsing The following patch fixes an issue relating to remount and argument parsing. After this fix is applied, remount becomes atomic in that it either succeeds changing the mount to the new state, or it fails and leaves it in the old state. Previously it was possible for the parsing of options to fail part way though and for the fs to be left in a state where some of the new arguments had been applied, but some had not. Signed-off-by: Steven Whitehouse commit 16175a796d061833aacfbd9672235f2d2725df65 Author: Avi Kivity Date: Mon Mar 23 22:13:44 2009 +0200 KVM: VMX: Don't allow uninhibited access to EFER on i386 vmx_set_msr() does not allow i386 guests to touch EFER, but they can still do so through the default: label in the switch. If they set EFER_LME, they can oops the host. Fix by having EFER access through the normal channel (which will check for EFER_LME) even on i386. Reported-and-tested-by: Benjamin Gilbert Cc: stable@kernel.org Signed-off-by: Avi Kivity commit bc7a8660df62da3fb5cad025322eda75fbee8731 Author: Sheng Yang Date: Tue Mar 17 19:27:19 2009 +0800 KVM: Correct deassign device ioctl to IOW It's IOR by mistake, so fix it before release. Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit 046a48b35baa7c66d0d0331256ba12ca51665411 Author: Liu Yu Date: Tue Mar 17 16:57:46 2009 +0800 KVM: ppc: e500: Fix the bug that KVM is unstable in SMP TLB entry should enable memory coherence in SMP. And like commit 631fba9dd3aca519355322cef035730609e91593, remove guard attribute to enable the prefetch of guest memory. Signed-off-by: Liu Yu Signed-off-by: Avi Kivity commit bc35cbc85cd78213590761618a13da6a9707652c Author: Liu Yu Date: Tue Mar 17 16:57:45 2009 +0800 KVM: ppc: e500: Fix the bug that mas0 update to wrong value when read TLB entry Should clear and then update the next victim area here. Guest kernel only read TLB1 when startup kernel, this bug result in an extra 4K TLB1 mapping in guest from 0x0 to 0x0. As the problem has no impact to bootup a guest, we didn't notice it before. Signed-off-by: Liu Yu Signed-off-by: Avi Kivity commit 4539b35881ae9664b0e2953438dd83f5ee02c0b4 Author: Andrea Arcangeli Date: Thu Mar 12 18:18:43 2009 +0100 KVM: Fix missing smp tlb flush in invlpg When kvm emulates an invlpg instruction, it can drop a shadow pte, but leaves the guest tlbs intact. This can cause memory corruption when swapping out. Without this the other cpu can still write to a freed host physical page. tlb smp flush must happen if rmap_remove is called always before mmu_lock is released because the VM will take the mmu_lock before it can finally add the page to the freelist after swapout. mmu notifier makes it safe to flush the tlb after freeing the page (otherwise it would never be safe) so we can do a single flush for multiple sptes invalidated. Cc: stable@kernel.org Signed-off-by: Andrea Arcangeli Acked-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit 36463146ffb7eee4582ed785a8c8be213b8ed110 Author: Sheng Yang Date: Mon Mar 16 16:33:43 2009 +0800 KVM: Get support IRQ routing entry counts In capability probing ioctl. Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit cded19f396bc3c9d299331709d0a9fbc6ecc148a Author: Hannes Eder Date: Sat Feb 21 02:19:13 2009 +0100 KVM: fix sparse warnings: Should it be static? Impact: Make symbols static. Fix this sparse warnings: arch/x86/kvm/mmu.c:992:5: warning: symbol 'mmu_pages_add' was not declared. Should it be static? arch/x86/kvm/mmu.c:1124:5: warning: symbol 'mmu_pages_next' was not declared. Should it be static? arch/x86/kvm/mmu.c:1144:6: warning: symbol 'mmu_pages_clear_parents' was not declared. Should it be static? arch/x86/kvm/x86.c:2037:5: warning: symbol 'kvm_read_guest_virt' was not declared. Should it be static? arch/x86/kvm/x86.c:2067:5: warning: symbol 'kvm_write_guest_virt' was not declared. Should it be static? virt/kvm/irq_comm.c:220:5: warning: symbol 'setup_routing_entry' was not declared. Should it be static? Signed-off-by: Hannes Eder Signed-off-by: Avi Kivity commit d7364a29b305862cbc92b3f8b6ad9968270d068c Author: Hannes Eder Date: Sat Feb 21 02:18:13 2009 +0100 KVM: fix sparse warnings: context imbalance Impact: Attribute function with __acquires(...) resp. __releases(...). Fix this sparse warnings: arch/x86/kvm/i8259.c:34:13: warning: context imbalance in 'pic_lock' - wrong count at exit arch/x86/kvm/i8259.c:39:13: warning: context imbalance in 'pic_unlock' - unexpected unlock Signed-off-by: Hannes Eder Signed-off-by: Avi Kivity commit 41d6af119206e98764b4ae6d264d63acefcf851e Author: Amit Shah Date: Thu Feb 28 16:06:15 2008 +0530 KVM: is_long_mode() should check for EFER.LMA is_long_mode currently checks the LongModeEnable bit in EFER instead of the LongModeActive bit. This is wrong, but we survived this till now since it wasn't triggered. This breaks guests that go from long mode to compatibility mode. This is noticed on a solaris guest and fixes bug #1842160 Signed-off-by: Amit Shah Signed-off-by: Avi Kivity commit 401d10dee083bda281f2fdcdf654080313ba30ec Author: Amit Shah Date: Fri Feb 20 22:53:37 2009 +0530 KVM: VMX: Update necessary state when guest enters long mode setup_msrs() should be called when entering long mode to save the shadow state for the 64-bit guest state. Using vmx_set_efer() in enter_lmode() removes some duplicated code and also ensures we call setup_msrs(). We can safely pass the value of shadow_efer to vmx_set_efer() as no other bits in the efer change while enabling long mode (guest first sets EFER.LME, then sets CR0.PG which causes a vmexit where we activate long mode). With this fix, is_long_mode() can check for EFER.LMA set instead of EFER.LME and 5e23049e86dd298b72e206b420513dbc3a240cd9 can be reverted. Signed-off-by: Amit Shah Signed-off-by: Avi Kivity commit 6b08035f3e64d8e474be166d682b52c95941662e Author: Xiantao Zhang Date: Mon Feb 16 15:24:05 2009 +0800 KVM: ia64: Fix the build errors due to lack of macros related to MSI. Include the newly introduced msidef.h to solve the build issues. Signed-off-by: Xiantao Zhang Signed-off-by: Avi Kivity commit 2fa8937f3af8873e006ce324e7b2d3f9b2077b87 Author: Xiantao Zhang Date: Mon Feb 16 15:14:48 2009 +0800 ia64: Move the macro definitions related to MSI to one header file. For kvm's MSI support, it needs these macros defined in ia64_msi.c, and to avoid duplicate them, move them to one header file and share with kvm. Signed-off-by: Xiantao Zhang Acked-by: Tony Luck Signed-off-by: Avi Kivity commit 4a906e49f103c2e544148a209ba1db316510799f Author: Weidong Han Date: Fri Feb 13 17:27:51 2009 +0800 KVM: fix kvm_vm_ioctl_deassign_device only need to set assigned_dev_id for deassignment, use match->flags to judge and deassign it. Acked-by: Mark McLoughlin Signed-off-by: Weidong Han Signed-off-by: Avi Kivity commit 2df8a40bccf5999261d0d3a82eac5a77678e61bd Author: Weidong Han Date: Fri Feb 13 10:50:56 2009 +0800 KVM: define KVM_CAP_DEVICE_DEASSIGNMENT define KVM_CAP_DEVICE_DEASSIGNMENT and KVM_DEASSIGN_PCI_DEVICE for device deassignment. the ioctl has been already implemented in the commit: 0a920356748df4fb06e86c21c23d2ed6d31d37ad Acked-by: Mark McLoughlin Signed-off-by: Weidong Han Signed-off-by: Avi Kivity commit b0a1835d53c57bc38b36867c04436b60454cb610 Author: Liu Yu Date: Tue Feb 17 16:52:08 2009 +0800 KVM: ppc: Add emulation of E500 register mmucsr0 Latest kernel flushes TLB via mmucsr0. Signed-off-by: Liu Yu Acked-by: Hollis Blanchard Signed-off-by: Avi Kivity commit 71450f78853b82d55cda4e182c9db6e26b631485 Author: Gleb Natapov Date: Mon Feb 23 12:57:11 2009 +0200 KVM: Report IRQ injection status for MSI delivered interrupts Return number of CPUs interrupt was successfully injected into or -1 if none. Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity commit c5bc22424021cabda862727fb3f5098b866f074d Author: Joerg Roedel Date: Thu Feb 19 12:18:56 2009 +0100 KVM: MMU: Fix another largepage memory leak In the paging_fetch function rmap_remove is called after setting a large pte to non-present. This causes rmap_remove to not drop the reference to the large page. The result is a memory leak of that page. Cc: stable@kernel.org Signed-off-by: Joerg Roedel Acked-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit 1fbdc7a58512a6283e10fd27108197679db95ffa Author: Andre Przywara Date: Sun Jan 11 22:39:44 2009 +0100 KVM: SVM: set accessed bit for VMCB segment selectors In the segment descriptor _cache_ the accessed bit is always set (although it can be cleared in the descriptor itself). Since Intel checks for this condition on a VMENTRY, set this bit in the AMD path to enable cross vendor migration. Cc: stable@kernel.org Signed-off-by: Andre Przywara Acked-By: Amit Shah Signed-off-by: Avi Kivity commit 4925663a079c77d95d8685228ad6675fc5639c8e Author: Gleb Natapov Date: Wed Feb 4 17:28:14 2009 +0200 KVM: Report IRQ injection status to userspace. IRQ injection status is either -1 (if there was no CPU found that should except the interrupt because IRQ was masked or ioapic was misconfigured or ...) or >= 0 in that case the number indicates to how many CPUs interrupt was injected. If the value is 0 it means that the interrupt was coalesced and probably should be reinjected. Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity commit 452425dbaa1974e9fc489e64a8de46a47b4c2754 Author: Joerg Roedel Date: Wed Feb 18 14:54:37 2009 +0100 KVM: MMU: remove assertion in kvm_mmu_alloc_page The assertion no longer makes sense since we don't clear page tables on allocation; instead we clear them during prefetch. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit 6bed6b9e84bf5e6b468847a50c0751389fdd01d4 Author: Joerg Roedel Date: Wed Feb 18 14:08:59 2009 +0100 KVM: MMU: remove redundant check in mmu_set_spte The following code flow is unnecessary: if (largepage) was_rmapped = is_large_pte(*shadow_pte); else was_rmapped = 1; The is_large_pte() function will always evaluate to one here because the (largepage && !is_large_pte) case is already handled in the first if-clause. So we can remove this check and set was_rmapped to one always here. Signed-off-by: Joerg Roedel Acked-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit fc5659c8c6b6c4e02ac354b369017c1bf231f347 Author: Joerg Roedel Date: Wed Feb 18 14:08:58 2009 +0100 KVM: MMU: handle compound pages in kvm_is_mmio_pfn The function kvm_is_mmio_pfn is called before put_page is called on a page by KVM. This is a problem when when this function is called on some struct page which is part of a compund page. It does not test the reserved flag of the compound page but of the struct page within the compount page. This is a problem when KVM works with hugepages allocated at boot time. These pages have the reserved bit set in all tail pages. Only the flag in the compount head is cleared. KVM would not put such a page which results in a memory leak. Signed-off-by: Joerg Roedel Acked-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit c807660407a695f390034e402edfe544a1d2e40c Author: Gerd Hoffmann Date: Wed Feb 4 17:52:04 2009 +0100 KVM: Fix kvmclock on !constant_tsc boxes kvmclock currently falls apart on machines without constant tsc. This patch fixes it. Changes: * keep tsc frequency in a per-cpu variable. * handle kvmclock update using a new request flag, thus checking whenever we need an update each time we enter guest context. * use a cpufreq notifier to track frequency changes and force kvmclock updates. * send ipis to kick cpu out of guest context if needed to make sure the guest doesn't see stale values. Signed-off-by: Gerd Hoffmann Signed-off-by: Avi Kivity commit 49cd7d2238e44f7ee4269481cd8a1261cc8f93a5 Author: Sheng Yang Date: Wed Feb 11 13:50:40 2009 +0800 KVM: VMX: Use kvm_mmu_page_fault() handle EPT violation mmio Removed duplicated code. Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit 79950e1073150909619b7c0f9a39a2fea83a42d8 Author: Sheng Yang Date: Tue Feb 10 13:57:06 2009 +0800 KVM: Use irq routing API for MSI Merge MSI userspace interface with IRQ routing table. Notice the API have been changed, and using IRQ routing table would be the only interface kvm-userspace supported. Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit 34c33d163fe509da8414a736c6328855f8c164e5 Author: Jan Kiszka Date: Sun Feb 8 13:28:15 2009 +0100 KVM: Drop unused evaluations from string pio handlers Looks like neither the direction nor the rep prefix are used anymore. Drop related evaluations from SVM's and VMX's I/O exit handlers. Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity commit 1b2fd70c4eddef53f32639296818c0253e7ca48d Author: Alexander Graf Date: Mon Feb 2 16:23:51 2009 +0100 KVM: Add FFXSR support AMD K10 CPUs implement the FFXSR feature that gets enabled using EFER. Let's check if the virtual CPU description includes that CPUID feature bit and allow enabling it then. This is required for Windows Server 2008 in Hyper-V mode. v2 adds CPUID capability exposure Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit d20626936dd6aa783760e780dae5abb127564316 Author: Alexander Graf Date: Mon Feb 2 16:23:50 2009 +0100 x86: Add EFER descriptions for FFXSR AMD k10 includes support for the FFXSR feature, which leaves out XMM registers on FXSAVE/FXSAVE when the EFER_FFXSR bit is set in EFER. The CPUID feature bit exists already, but the EFER bit is missing currently, so this patch adds it to the list of known EFER bits. Signed-off-by: Alexander Graf CC: Joerg Roedel Signed-off-by: Avi Kivity commit 44882eed2ebe7f75f8cdae5671ab1d6e0fa40dbc Author: Marcelo Tosatti Date: Tue Jan 27 15:12:38 2009 -0200 KVM: make irq ack notifications aware of routing table IRQ ack notifications assume an identity mapping between pin->gsi, which might not be the case with, for example, HPET. Translate before acking. Signed-off-by: Marcelo Tosatti Acked-by: Gleb Natapov commit 934d534f8a5a39e20d5682b3a3a45ff351706b59 Author: Jes Sorensen Date: Wed Jan 21 15:16:43 2009 +0100 KVM: ia64: dynamic nr online cpus Account for number of online cpus and use that in loops iterating over the list of vpus instead of scanning the full array unconditionally. This patch is a building block to facilitate allowing to bump up the size of MAX_VCPUS significantly. Signed-off-by: Jes Sorensen Acked-by : Xiantao Zhang Signed-off-by: Avi Kivity commit b7e6e4d3602c738b8f61225d9f4514945df52f07 Author: Christian Borntraeger Date: Thu Jan 22 10:29:08 2009 +0100 KVM: s390: Fix SIGP set prefix ioctl This patch fixes the SET PREFIX interrupt if triggered by userspace. Until now, it was not necessary, but life migration will need it. In addition, it helped me creating SMP support for my kvm_crashme tool (lets kvm execute random guest memory content). Signed-off-by: Christian Borntraeger Signed-off-by: Avi Kivity commit 70455a36a073cbb83ca17f92d135a6128c73cb3c Author: Christian Borntraeger Date: Thu Jan 22 10:28:29 2009 +0100 KVM: s390: Fix problem state check for b2 intercepts The kernel handles some priviledged instruction exits. While I was unable to trigger such an exit from guest userspace, the code should check for supervisor state before emulating a priviledged instruction. I also renamed kvm_s390_handle_priv to kvm_s390_handle_b2. After all there are non priviledged b2 instructions like stck (store clock). Signed-off-by: Christian Borntraeger Signed-off-by: Avi Kivity commit 2c411b48af3e3c534b9cfb6a79be1df384d1ca1a Author: Christian Borntraeger Date: Thu Jan 22 14:20:27 2009 +0100 KVM: s390: Fix printk on SIGP set arch KVM on s390 does not support the ESA/390 architecture. We refuse to change the architecture mode and print a warning. This patch removes the printk for several reasons: o A malicious guest can flood host dmesg o The old message had no newline o there is no connection between the message and the failing guest This patch simply removes the printk. We already set the condition code to 3 - the guest knows that something went wrong. Reported-by: Heiko Carstens Signed-off-by: Christian Borntraeger Signed-off-by: Avi Kivity commit 7d656bd996b68737d5d07643bc57311059038d67 Author: Xiantao Zhang Date: Wed Jan 21 11:21:27 2009 +0800 KVM: ia64: Implement some pal calls needed for windows 2008 For windows 2008, it needs more pal calls to implement for booting. In addition, also changes the name of set_{sal, pal}_call_result to get_{sal,pal}_call_result for readability. Signed-off-by: Xiantao Zhang Signed-off-by: Avi Kivity commit 4b7bb626e3133eab131328a0770864b322c1bfe6 Author: Xiantao Zhang Date: Thu Jan 15 18:08:36 2009 +0800 KVM: ia64: Add the support for translating PAL Call's pointer args Add the support to translate PAL Call's pointer args. Signed-off-by: Xiantao Zhang Signed-off-by: Avi Kivity commit 27d146449ccaad16480888129bb32a000ee33717 Author: Xiantao Zhang Date: Thu Jan 15 17:58:19 2009 +0800 KVM: ia64: vTLB change for enabling windows 2008 boot Simply the logic of hash vTLB, and export kvm_gpa_to_mpa. Signed-off-by: Xiantao Zhang Signed-off-by: Avi Kivity commit 91b2ae773d3b168b763237fac33f75b13d891f20 Author: Avi Kivity Date: Mon Jan 19 14:57:52 2009 +0200 KVM: Avoid using CONFIG_ in userspace visible headers Kconfig symbols are not available in userspace, and are not stripped by headers-install. Avoid their use by adding #defines in to suit each architecture. Signed-off-by: Avi Kivity commit 399ec807ddc38ecccf8c06dbde04531cbdc63e11 Author: Avi Kivity Date: Wed Nov 19 13:58:46 2008 +0200 KVM: Userspace controlled irq routing Currently KVM has a static routing from GSI numbers to interrupts (namely, 0-15 are mapped 1:1 to both PIC and IOAPIC, and 16:23 are mapped 1:1 to the IOAPIC). This is insufficient for several reasons: - HPET requires non 1:1 mapping for the timer interrupt - MSIs need a new method to assign interrupt numbers and dispatch them - ACPI APIC mode needs to be able to reassign the PCI LINK interrupts to the ioapics This patch implements an interrupt routing table (as a linked list, but this can be easily changed) and a userspace interface to replace the table. The routing table is initialized according to the current hardwired mapping. Signed-off-by: Avi Kivity commit 193554750441d91e127dd5066b8aebe0f769101c Author: Amit Shah Date: Wed Jan 14 16:56:00 2009 +0000 KVM: x86: Fix typos and whitespace errors Some typos, comments, whitespace errors corrected in the cpuid code Signed-off-by: Amit Shah Signed-off-by: Avi Kivity commit 9aa4dd5e5f47a5feb96fc394fccf0265ab7d85a4 Author: Liu Yu Date: Wed Jan 14 10:47:38 2009 -0600 KVM: ppc: Move to new TLB invalidate interface Commit 2a4aca1144394653269720ffbb5a325a77abd5fa removed old method _tlbia(). Signed-off-by: Liu Yu Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit fb2838d446f6ee7e13e4149e08ec138753c5c450 Author: Liu Yu Date: Wed Jan 14 10:47:37 2009 -0600 KVM: ppc: Fix e500 warnings and some spelling problems Signed-off-by: Avi Kivity commit 87c656b4147cd08c6efba95d8d70c12cba181255 Author: Liu Yu Date: Wed Jan 14 10:47:36 2009 -0600 powerpc/fsl-booke: declare tlbcam_index for use in c So, KVM needs to read tlbcam_index to know exactly which TLB1 entry is unused by host. Signed-off-by: Liu Yu Acked-by: Kumar Gala Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit 5a41accd3f69c6ef1d58f0c148980bae70515937 Author: Avi Kivity Date: Sun Jan 11 17:19:35 2009 +0200 KVM: MMU: Only enable cr4_pge role in shadow mode Two dimensional paging is only confused by it. Signed-off-by: Avi Kivity commit f6e2c02b6d28ddabe99377c5640a833407a62632 Author: Avi Kivity Date: Sun Jan 11 13:02:10 2009 +0200 KVM: MMU: Rename "metaphysical" attribute to "direct" This actually describes what is going on, rather than alerting the reader that something strange is going on. Signed-off-by: Avi Kivity commit 9903a927a4aea4b1ea42356a8453fca664df0b18 Author: Marcelo Tosatti Date: Thu Jan 8 17:44:19 2009 -0200 KVM: MMU: drop zeroing on mmu_memory_cache_alloc Zeroing on mmu_memory_cache_alloc is unnecessary since: - Smaller areas are pre-allocated with kmem_cache_zalloc. - Page pointed by ->spt is overwritten with prefetch_page and entries in page pointed by ->gfns are initialized before reading. [avi: zeroing pages is unnecessary] Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit ff81ff10b4417952919dcc0bd67effa9ceb411c0 Author: Joe Perches Date: Thu Jan 8 11:05:17 2009 -0800 KVM: SVM: Fix typo in has_svm() Signed-off-by: Joe Perches Acked-by: Joerg Roedel Signed-off-by: Avi Kivity commit a26b73ad5e763db1b01cca6965ac3b65fe36e82a Author: Jes Sorensen Date: Thu Jan 8 13:58:48 2009 +0100 KVM: ia64: expose registers in struct kvm_regs Provide register layout for struct kvm_regs exposed to userland. Signed-off-by: Jes Sorensen Signed-off-by: Avi Kivity commit 4780c65904f0fc4e312ee2da9383eacbe04e61ea Author: Avi Kivity Date: Sun Jan 4 18:06:06 2009 +0200 KVM: Reset PIT irq injection logic when the PIT IRQ is unmasked While the PIT is masked the guest cannot ack the irq, so the reinject logic will never allow the interrupt to be injected. Fix by resetting the reinjection counters on unmask. Unbreaks Xen. Signed-off-by: Avi Kivity commit 75858a84a6207f5e60196f6bbd18fde4250e5759 Author: Avi Kivity Date: Sun Jan 4 17:10:50 2009 +0200 KVM: Interrupt mask notifiers for ioapic Allow clients to request notifications when the guest masks or unmasks a particular irq line. This complements irq ack notifications, as the guest will not ack an irq line that is masked. Currently implemented for the ioapic only. Signed-off-by: Avi Kivity commit 5d9b8e30f543a9f21a968a4cda71e8f6d1c66a61 Author: Avi Kivity Date: Sun Jan 4 18:04:18 2009 +0200 KVM: Add CONFIG_HAVE_KVM_IRQCHIP Two KVM archs support irqchips and two don't. Add a Kconfig item to make selecting between the two models easier. Signed-off-by: Avi Kivity commit 4677a3b693e035f186e2875259b9a0bb94c42fbe Author: Avi Kivity Date: Tue Jan 6 13:00:27 2009 +0200 KVM: MMU: Optimize page unshadowing Using kvm_mmu_lookup_page() will result in multiple scans of the hash chains; use hlist_for_each_entry_safe() to achieve a single scan instead. Signed-off-by: Avi Kivity commit c8a73f186bf62235b6fb5dd52601d641917dd50b Author: Alexander Graf Date: Mon Jan 5 16:02:47 2009 +0100 KVM: SVM: Add microcode patch level dummy VMware ESX checks if the microcode level is correct when using a barcelona CPU, in order to see if it actually can use SVM. Let's tell it we're on the safe side... Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit 17071fe74fe0fbfdb03cd9b82f2490447cf1f986 Author: Sheng Yang Date: Tue Jan 6 16:25:11 2009 +0800 KVM: Add support to disable MSI for assigned device MSI is always enabled by default for msi2intx=1. But if msi2intx=0, we have to disable MSI if guest require to do so. The patch also discard unnecessary msi2intx judgment if guest want to update MSI state. Notice KVM_DEV_IRQ_ASSIGN_MSI_ACTION is a mask which should cover all MSI related operations, though we only got one for now. Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit 67346440e83d2a2f2e9801f370b6240317c7d9bd Author: Sheng Yang Date: Tue Jan 6 10:03:01 2009 +0800 KVM: Remove duplicated prototype of kvm_arch_destroy_vm Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit f5d0906b5bafd7faea553ed1cc92bd06755b66b9 Author: Hollis Blanchard Date: Sun Jan 4 13:51:09 2009 -0600 KVM: ppc: remove debug support broken by KVM debug rewrite After the rewrite of KVM's debug support, this code doesn't even build any more. Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit 269e05e48502f1cc06802e9fba90f5100dd6bb0d Author: Avi Kivity Date: Mon Jan 5 15:21:42 2009 +0200 KVM: Properly lock PIT creation Otherwise, two threads can create a PIT in parallel and cause a memory leak. Signed-off-by: Avi Kivity commit a77ab5ead5c1fef2c6c5a9b3cf3765e52643a2aa Author: Avi Kivity Date: Mon Jan 5 13:27:34 2009 +0200 KVM: x86 emulator: implement 'ret far' instruction (opcode 0xcb) Signed-off-by: Avi Kivity commit 8b3079a5c0c031de07c8390aa160a4229088274f Author: Avi Kivity Date: Mon Jan 5 12:10:54 2009 +0200 KVM: VMX: When emulating on invalid vmx state, don't return to userspace unnecessarily If we aren't doing mmio there's no need to exit to userspace (which will just be confused). Signed-off-by: Avi Kivity commit 350f69dcd169d536307aa4a8c38c480e3a51c0db Author: Avi Kivity Date: Mon Jan 5 11:12:40 2009 +0200 KVM: x86 emulator: Make emulate_pop() a little more generic Allow emulate_pop() to read into arbitrary memory rather than just the source operand. Needed for complicated instructions like far returns. Signed-off-by: Avi Kivity commit 10f32d84c750ccf8c0afb3a4ea9d4059aa3e9ffc Author: Avi Kivity Date: Mon Jan 5 00:53:19 2009 +0200 KVM: VMX: Prevent exit handler from running if emulating due to invalid state If we've just emulated an instruction, we won't have any valid exit reason and associated information. Fix by moving the clearing of the emulation_required flag to the exit handler. This way the exit handler can notice that we've been emulating and abort early. Signed-off-by: Avi Kivity commit 9fd4a3b7a412f983696b23121413a79d2132fed6 Author: Avi Kivity Date: Sun Jan 4 23:43:42 2009 +0200 KVM: VMX: don't clobber segment AR if emulating invalid state The ususable bit is important for determining state validity; don't clobber it. Signed-off-by: Avi Kivity commit 1872a3f411ffe95c8e92300e0986a3532db55ce9 Author: Avi Kivity Date: Sun Jan 4 23:26:52 2009 +0200 KVM: VMX: Fix guest state validity checks The vmx guest state validity checks are full of bugs. Make them conform to the manual. Signed-off-by: Avi Kivity commit bb3a8a178dec1e46df3138a30f76acf67fe12397 Author: Hollis Blanchard Date: Sat Jan 3 16:23:13 2009 -0600 KVM: ppc: Add extra E500 exceptions e500 has additional interrupt vectors (and corresponding IVORs) for SPE and performance monitoring interrupts. Signed-off-by: Liu Yu Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit bdc89f13ec955c14777d5caf02dfca3f51d639bd Author: Hollis Blanchard Date: Sat Jan 3 16:23:12 2009 -0600 KVM: ppc: distinguish between interrupts and priorities Although BOOKE_MAX_INTERRUPT has the right value, the meaning is not match. Signed-off-by: Liu Yu Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit b52a638c391c5c7b013180f5374274698b8535c8 Author: Hollis Blanchard Date: Sat Jan 3 16:23:11 2009 -0600 KVM: ppc: Add kvmppc_mmu_dtlb/itlb_miss for booke When itlb or dtlb miss happens, E500 needs to update some mmu registers. So that the auto-load mechanism can work on E500 when write a tlb entry. Signed-off-by: Liu Yu Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit bc8080cbcc8870178f0910edd537d0cb5706d703 Author: Hollis Blanchard Date: Sat Jan 3 16:23:10 2009 -0600 KVM: ppc: E500 core-specific code Signed-off-by: Liu Yu Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit 17c885eb5c38f39a2bb3143a67687bd905dcd0fa Author: Hollis Blanchard Date: Sat Jan 3 16:23:09 2009 -0600 KVM: ppc: ifdef iccci with CONFIG_44x E500 deosn't support this instruction. Signed-off-by: Liu Yu Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit 366d4b9b9fdda282006b97316f8038cd36f8ecb7 Author: Hollis Blanchard Date: Sat Jan 3 16:23:08 2009 -0600 KVM: ppc: No need to include core-header for KVM in asm-offsets.c currently Signed-off-by: Liu Yu Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit f7b200af8f1da748cc67993caeff3923d6014070 Author: Hollis Blanchard Date: Sat Jan 3 16:23:07 2009 -0600 KVM: ppc: Add dbsr in kvm_vcpu_arch Kernel for E500 need clear dbsr when startup. So add dbsr register in kvm_vcpu_arch for BOOKE. Signed-off-by: Liu Yu Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit d0c7dc03442f7cbd8740d9a4e7a4e7f84bfa676d Author: Hollis Blanchard Date: Sat Jan 3 16:23:06 2009 -0600 KVM: ppc: split out common Book E instruction emulation The Book E code will be shared with e500. I've left PID in kvmppc_core_emulate_op() just so that we don't need to move kvmppc_set_pid() right now. Once we have the e500 implementation, we can probably share that too. Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit cea5d8c9de669e30ed6d60930318376d5cc42e9e Author: Hollis Blanchard Date: Sat Jan 3 16:23:05 2009 -0600 KVM: ppc: use macros instead of hardcoded literals for instruction decoding Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit f44353610b584fcbc31e363f35594796c6446d63 Author: Hollis Blanchard Date: Sat Jan 3 16:23:04 2009 -0600 KVM: ppc: remove last 44x-specific bits from booke.c Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit fa86b8dda2e0faccefbeda61edc02a50bd588f4f Author: Hollis Blanchard Date: Sat Jan 3 16:23:03 2009 -0600 KVM: ppc: rename 44x MMU functions used in booke.c e500 will provide its own implementation of these. Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit be8d1cae07d5acf4a61046d7def5eda40f0981e1 Author: Hollis Blanchard Date: Sat Jan 3 16:23:02 2009 -0600 KVM: ppc: turn tlb_xlate() into a per-core hook (and give it a better name) Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit 58a96214a306fc7fc66105097eea9c4f3bfa35bc Author: Hollis Blanchard Date: Sat Jan 3 16:23:01 2009 -0600 KVM: ppc: change kvmppc_mmu_map() parameters Passing just the TLB index will ease an e500 implementation. Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit 475e7cdd69101939006659a63c2e4a32d5b71389 Author: Hollis Blanchard Date: Sat Jan 3 16:23:00 2009 -0600 KVM: ppc: small cosmetic changes to Book E DTLB miss handler Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit ecc0981ff07cbe7cdf95de20be5b24fee8e49cb5 Author: Hollis Blanchard Date: Sat Jan 3 16:22:59 2009 -0600 KVM: ppc: cosmetic changes to mmu hook names Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit c46fb0211f8b93de45400bff814c0f29335af5fc Author: Hollis Blanchard Date: Sat Jan 3 16:22:58 2009 -0600 KVM: ppc: move struct kvmppc_44x_tlbe into 44x-specific header Signed-off-by: Hollis Blanchard Signed-off-by: Avi Kivity commit 1c08364c3565242f1e1bd585bc2ce458967941af Author: Avi Kivity Date: Sun Jan 4 12:39:07 2009 +0200 KVM: Move struct kvm_pio_request into x86 kvm_host.h This is an x86 specific stucture and has no business living in common code. Signed-off-by: Avi Kivity commit 52d939a0bf44081bc9f69b4fbdc9e7f416df27c7 Author: Marcelo Tosatti Date: Tue Dec 30 15:55:06 2008 -0200 KVM: PIT: provide an option to disable interrupt reinjection Certain clocks (such as TSC) in older 2.6 guests overaccount for lost ticks, causing severe time drift. Interrupt reinjection magnifies the problem. Provide an option to disable it. [avi: allow room for expansion in case we want to disable reinjection of other timers] Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit 61a6bd672bda3b9468bf5895c1be085c4e481138 Author: Avi Kivity Date: Mon Dec 29 17:32:28 2008 +0200 KVM: Fallback support for MSR_VM_HSAVE_PA Since we advertise MSR_VM_HSAVE_PA, userspace will attempt to read it even on Intel. Implement fake support for this MSR to avoid the warnings. Signed-off-by: Avi Kivity commit 0f346074403bc109f9569f14b45cb09e83729032 Author: Izik Eidus Date: Mon Dec 29 01:42:20 2008 +0200 KVM: remove the vmap usage vmap() on guest pages hides those pages from the Linux mm for an extended (userspace determined) amount of time. Get rid of it. Signed-off-by: Izik Eidus Signed-off-by: Avi Kivity commit 77c2002e7c6f019f59a6f3cc5f8b16b41748dbe1 Author: Izik Eidus Date: Mon Dec 29 01:42:19 2008 +0200 KVM: introduce kvm_read_guest_virt, kvm_write_guest_virt This commit change the name of emulator_read_std into kvm_read_guest_virt, and add new function name kvm_write_guest_virt that allow writing into a guest virtual address. Signed-off-by: Izik Eidus Signed-off-by: Avi Kivity commit 53f658b3c33616a4997ee254311b335e59063289 Author: Marcelo Tosatti Date: Thu Dec 11 20:45:05 2008 +0100 KVM: VMX: initialize TSC offset relative to vm creation time VMX initializes the TSC offset for each vcpu at different times, and also reinitializes it for vcpus other than 0 on APIC SIPI message. This bug causes the TSC's to appear unsynchronized in the guest, even if the host is good. Older Linux kernels don't handle the situation very well, so gettimeofday is likely to go backwards in time: http://www.mail-archive.com/kvm@vger.kernel.org/msg02955.html http://sourceforge.net/tracker/index.php?func=detail&aid=2025534&group_id=180599&atid=893831 Fix it by initializating the offset of each vcpu relative to vm creation time, and moving it from vmx_vcpu_reset to vmx_vcpu_setup, out of the APIC MP init path. Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit e8c4a4e8a7cc047dfb3c26b2cbc8599ad3460364 Author: Avi Kivity Date: Thu Dec 25 15:20:07 2008 +0200 KVM: MMU: Drop walk_shadow() No longer used. Signed-off-by: Avi Kivity commit a461930bc3cece021f8f89a80dcc1d0691a92b52 Author: Avi Kivity Date: Thu Dec 25 15:19:00 2008 +0200 KVM: MMU: Replace walk_shadow() by for_each_shadow_entry() in invlpg() Signed-off-by: Avi Kivity commit e7a04c99b54ad9acb98a56113ec3163bc1039e13 Author: Avi Kivity Date: Thu Dec 25 15:10:50 2008 +0200 KVM: MMU: Replace walk_shadow() by for_each_shadow_entry() in fetch() Effectively reverting to the pre walk_shadow() version -- but now with the reusable for_each(). Signed-off-by: Avi Kivity commit 9f652d21c3f887075a33abae85bf53fec64e67b1 Author: Avi Kivity Date: Thu Dec 25 14:54:25 2008 +0200 KVM: MMU: Use for_each_shadow_entry() in __direct_map() Eliminating a callback and a useless structure. Signed-off-by: Avi Kivity commit 2d11123a77e54d5cea262c958e8498f4a08bce3d Author: Avi Kivity Date: Thu Dec 25 14:39:47 2008 +0200 KVM: MMU: Add for_each_shadow_entry(), a simpler alternative to walk_shadow() Using a for_each loop style removes the need to write callback and nasty casts. Implement the walk_shadow() using the for_each_shadow_entry(). Signed-off-by: Avi Kivity commit 971cc3dcbc0e020b82f568e61a47b72be03307dd Author: Jan Kiszka Date: Fri Dec 19 18:13:54 2008 +0100 KVM: Advertise guest debug capability per-arch Limit KVM_CAP_SET_GUEST_DEBUG only to those archs (currently x86) that support it. This simplifies user space stub implementations. Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity commit 2b3d2a206037b1471de6a6dc51427af034cfdb47 Author: Avi Kivity Date: Tue Dec 23 19:46:01 2008 +0200 KVM: Fix vmload and friends misinterpreted as lidt The AMD SVM instruction family all overload the 0f 01 /3 opcode, further multiplexing on the three r/m bits. But the code decided that anything that isn't a vmmcall must be an lidt (which shares the 0f 01 /3 opcode, for the case that mod = 3). Fix by aborting emulation if this isn't a vmmcall. Signed-off-by: Avi Kivity commit e2078318042569682d0496cfd7bd962a766e82b1 Author: Avi Kivity Date: Sun Dec 21 19:36:59 2008 +0200 KVM: MMU: Initialize a shadow page's global attribute from cr4.pge If cr4.pge is cleared, we ought to treat any ptes in the page as non-global. This allows us to remove the check from set_spte(). Signed-off-by: Avi Kivity commit 2f0b3d60b2c43aef7cd10169c425c052169c622a Author: Avi Kivity Date: Sun Dec 21 19:27:36 2008 +0200 KVM: MMU: Segregate mmu pages created with different cr4.pge settings Don't allow a vcpu with cr4.pge cleared to use a shadow page created with cr4.pge set; this might cause a cr3 switch not to sync ptes that have the global bit set (the global bit has no effect if !cr4.pge). This can only occur on smp with different cr4.pge settings for different vcpus (since a cr4 change will resync the shadow ptes), but there's no cost to being correct here. Signed-off-by: Avi Kivity commit a770f6f28b1a9287189f3dc8333eb694d9a2f0ab Author: Avi Kivity Date: Sun Dec 21 19:20:09 2008 +0200 KVM: MMU: Inherit a shadow page's guest level count from vcpu setup Instead of "calculating" it on every shadow page allocation, set it once when switching modes, and copy it when allocating pages. This doesn't buy us much, but sets up the stage for inheriting more information related to the mmu setup. Signed-off-by: Avi Kivity commit 22ccb14203d59a8bcf6f3fea76b3594d710569fa Author: Xiantao Zhang Date: Thu Dec 18 10:23:58 2008 +0800 KVM: ia64: Code cleanup Remove some unnecessary blank lines to accord with Kernel's coding style. Also remove vcpu_get_itir_on_fault due to no reference to it. Signed-off-by: Xiantao Zhang Signed-off-by: Avi Kivity commit 989c0f0ed56468a4aa48711cef5acf122a40d1dd Author: Jan Kiszka Date: Thu Dec 18 12:33:18 2008 +0100 KVM: Remove old kvm_guest_debug structs Remove the remaining arch fragments of the old guest debug interface that now break non-x86 builds. Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity commit e9a999fe1feaddb71bffbacbbd68e0da8ca8b50b Author: Jes Sorensen Date: Thu Dec 18 12:17:51 2008 +0100 KVM: ia64: stack get/restore patch Implement KVM_IA64_VCPU_[GS]ET_STACK ioctl calls. This is required for live migrations. Patch is based on previous implementation that was part of old GET/SET_REGS ioctl calls. Signed-off-by: Jes Sorensen Signed-off-by: Avi Kivity commit ae675ef01cd86014acf8da5dee87876b71122495 Author: Jan Kiszka Date: Mon Dec 15 13:52:10 2008 +0100 KVM: x86: Wire-up hardware breakpoints for guest debugging Add the remaining bits to make use of debug registers also for guest debugging, thus enabling the use of hardware breakpoints and watchpoints. Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity commit 42dbaa5a057736bf8b5c22aa42dbe975bf1080e5 Author: Jan Kiszka Date: Mon Dec 15 13:52:10 2008 +0100 KVM: x86: Virtualize debug registers So far KVM only had basic x86 debug register support, once introduced to realize guest debugging that way. The guest itself was not able to use those registers. This patch now adds (almost) full support for guest self-debugging via hardware registers. It refactors the code, moving generic parts out of SVM (VMX was already cleaned up by the KVM_SET_GUEST_DEBUG patches), and it ensures that the registers are properly switched between host and guest. This patch also prepares debug register usage by the host. The latter will (once wired-up by the following patch) allow for hardware breakpoints/watchpoints in guest code. If this is enabled, the guest will only see faked debug registers without functionality, but with content reflecting the guest's modifications. Tested on Intel only, but SVM /should/ work as well, but who knows... Known limitations: Trapping on tss switch won't work - most probably on Intel. Credits also go to Joerg Roedel - I used his once posted debugging series as platform for this patch. Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity commit 55934c0bd3bb232a9cf902820dd63ad18ed65e49 Author: Jan Kiszka Date: Mon Dec 15 13:52:10 2008 +0100 KVM: VMX: Allow single-stepping when uninterruptible When single-stepping over STI and MOV SS, we must clear the corresponding interruptibility bits in the guest state. Otherwise vmentry fails as it then expects bit 14 (BS) in pending debug exceptions being set, but that's not correct for the guest debugging case. Note that clearing those bits is safe as we check for interruptibility based on the original state and do not inject interrupts or NMIs if guest interruptibility was blocked. Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity commit d0bfb940ecabf0b44fb1fd80d8d60594e569e5ec Author: Jan Kiszka Date: Mon Dec 15 13:52:10 2008 +0100 KVM: New guest debug interface This rips out the support for KVM_DEBUG_GUEST and introduces a new IOCTL instead: KVM_SET_GUEST_DEBUG. The IOCTL payload consists of a generic part, controlling the "main switch" and the single-step feature. The arch specific part adds an x86 interface for intercepting both types of debug exceptions separately and re-injecting them when the host was not interested. Moveover, the foundation for guest debugging via debug registers is layed. To signal breakpoint events properly back to userland, an arch-specific data block is now returned along KVM_EXIT_DEBUG. For x86, the arch block contains the PC, the debug exception, and relevant debug registers to tell debug events properly apart. The availability of this new interface is signaled by KVM_CAP_SET_GUEST_DEBUG. Empty stubs for not yet supported archs are provided. Note that both SVM and VTX are supported, but only the latter was tested yet. Based on the experience with all those VTX corner case, I would be fairly surprised if SVM will work out of the box. Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity commit 8ab2d2e231062814bd89bba2d6d92563190aa2bb Author: Jan Kiszka Date: Mon Dec 15 13:52:10 2008 +0100 KVM: VMX: Support for injecting software exceptions VMX differentiates between processor and software generated exceptions when injecting them into the guest. Extend vmx_queue_exception accordingly (and refactor related constants) so that we can use this service reliably for the new guest debugging framework. Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity commit d80174745ba3938bc6abb8f95ed670ac0631a182 Author: Alexander Graf Date: Tue Nov 25 20:17:11 2008 +0100 KVM: SVM: Only allow setting of EFER_SVME when CPUID SVM is set Userspace has to tell the kernel module somehow that nested SVM should be used. The easiest way that doesn't break anything I could think of is to implement if (cpuid & svm) allow write to efer else deny write to efer Old userspaces mask the SVM capability bit, so they don't break. In order to find out that the SVM capability is set, I had to split the kvm_emulate_cpuid into a finding and an emulating part. (introduced in v6) Acked-by: Joerg Roedel Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit 236de05553a7ef8f6940de8686ae9bf1272cd2cf Author: Alexander Graf Date: Tue Nov 25 20:17:10 2008 +0100 KVM: SVM: Allow setting the SVME bit Normally setting the SVME bit in EFER is not allowed, as we did not support SVM. Not since we do, we should also allow enabling SVM mode. v2 comes as last patch, so we don't enable half-ready code v4 introduces a module option to enable SVM v6 warns that nesting is enabled Acked-by: Joerg Roedel Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit eb6f302edff9da963e687bf6c15dcf88843b1c3b Author: Joerg Roedel Date: Tue Nov 25 20:17:09 2008 +0100 KVM: SVM: Allow read access to MSR_VM_VR KVM tries to read the VM_CR MSR to find out if SVM was disabled by the BIOS. So implement read support for this MSR to make nested SVM running. Signed-off-by: Joerg Roedel Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit cf74a78b229d07f77416d2fe1f029f183a8a31df Author: Alexander Graf Date: Tue Nov 25 20:17:08 2008 +0100 KVM: SVM: Add VMEXIT handler and intercepts This adds the #VMEXIT intercept, so we return to the level 1 guest when something happens in the level 2 guest that should return to the level 1 guest. v2 implements HIF handling and cleans up exception interception v3 adds support for V_INTR_MASKING_MASK v4 uses the host page hsave v5 removes IOPM merging code v6 moves mmu code out of the atomic section Acked-by: Joerg Roedel Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit 3d6368ef580a4dff012960834bba4e28d3c1430c Author: Alexander Graf Date: Tue Nov 25 20:17:07 2008 +0100 KVM: SVM: Add VMRUN handler This patch implements VMRUN. VMRUN enters a virtual CPU and runs that in the same context as the normal guest CPU would run. So basically it is implemented the same way, a normal CPU would do it. We also prepare all intercepts that get OR'ed with the original intercepts, as we do not allow a level 2 guest to be intercepted less than the first level guest. v2 implements the following improvements: - fixes the CPL check - does not allocate iopm when not used - remembers the host's IF in the HIF bit in the hflags v3: - make use of the new permission checking - add support for V_INTR_MASKING_MASK v4: - use host page backed hsave v5: - remove IOPM merging code v6: - save cr4 so PAE l1 guests work v7: - return 0 on vmrun so we check the MSRs too - fix MSR check to use the correct variable Acked-by: Joerg Roedel Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit 5542675baa7e62ca4d18278c8758b6a4ec410639 Author: Alexander Graf Date: Tue Nov 25 20:17:06 2008 +0100 KVM: SVM: Add VMLOAD and VMSAVE handlers This implements the VMLOAD and VMSAVE instructions, that usually surround the VMRUN instructions. Both instructions load / restore the same elements, so we only need to implement them once. v2 fixes CPL checking and replaces memcpy by assignments v3 makes use of the new permission checking Acked-by: Joerg Roedel Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit b286d5d8b0836e76832dafcc5a18b0e8e5a3bc5e Author: Alexander Graf Date: Tue Nov 25 20:17:05 2008 +0100 KVM: SVM: Implement hsave Implement the hsave MSR, that gives the VCPU a GPA to save the old guest state in. v2 allows userspace to save/restore hsave v4 dummys out the hsave MSR, so we use a host page v6 remembers the guest's hsave and exports the MSR Acked-by: Joerg Roedel Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit 1371d90460189d02bf1bcca19dbfe6bd10dc6031 Author: Alexander Graf Date: Tue Nov 25 20:17:04 2008 +0100 KVM: SVM: Implement GIF, clgi and stgi This patch implements the GIF flag and the clgi and stgi instructions that set this flag. Only if the flag is set (default), interrupts can be received by the CPU. To keep the information about that somewhere, this patch adds a new hidden flags vector. that is used to store information that does not go into the vmcb, but is SVM specific. I tried to write some code to make -no-kvm-irqchip work too, but the first level guest won't even boot with that atm, so I ditched it. v2 moves the hflags to x86 generic code v3 makes use of the new permission helper v6 only enables interrupt_window if GIF=1 Acked-by: Joerg Roedel Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit c0725420cfdcf6dd9705b164a8c6cba86684080d Author: Alexander Graf Date: Tue Nov 25 20:17:03 2008 +0100 KVM: SVM: Add helper functions for nested SVM These are helpers for the nested SVM implementation. - nsvm_printk implements a debug printk variant - nested_svm_do calls a handler that can accesses gpa-based memory v3 makes use of the new permission checker v6 changes: - streamline nsvm_debug() - remove printk(KERN_ERR) - SVME check before CPL check - give GP error code - use new EFER constant Acked-by: Joerg Roedel Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit 9962d032bbff0268f22068787831405f8468c8b4 Author: Alexander Graf Date: Tue Nov 25 20:17:02 2008 +0100 KVM: SVM: Move EFER and MSR constants to generic x86 code MSR_EFER_SVME_MASK, MSR_VM_CR and MSR_VM_HSAVE_PA are set in KVM specific headers. Linux does have nice header files to collect EFER bits and MSR IDs, so IMHO we should put them there. While at it, I also changed the naming scheme to match that of the other defines. (introduced in v6) Acked-by: Joerg Roedel Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit f0b85051d0f0891378a83db22c0786f1d756fbff Author: Alexander Graf Date: Tue Nov 25 20:17:01 2008 +0100 KVM: SVM: Clean up VINTR setting The current VINTR intercept setters don't look clean to me. To make the code easier to read and enable the possibilty to trap on a VINTR set, this uses a helper function to set the VINTR intercept. v2 uses two distinct functions for setting and clearing the bit Acked-by: Joerg Roedel Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit 15a5b0a4912d98a9615ef457c7bde8d08195a771 Merge: 8e0ee43... 6e9ed0c... 6fb8f42... c0bdb23... 1a00df4... e8120ff... Author: Pekka Enberg Date: Tue Mar 24 10:25:21 2009 +0200 Merge branches 'topic/slob/cleanups', 'topic/slob/fixes', 'topic/slub/core', 'topic/slub/cleanups' and 'topic/slub/perf' into for-linus commit 5201b0a47b83aba66e1e348d18f3f9a7bc17d612 Author: Huang Weiyi Date: Sat Mar 21 13:50:58 2009 +0800 avr32: remove duplicated #include Remove duplicated #include in arch/avr32/boards/hammerhead/flash.c. Signed-off-by: Huang Weiyi Acked-by: Alex Raimondi Signed-off-by: Haavard Skinnemoen commit 703a3cd72817e99201cef84a8a7aecc60b2b3581 Merge: df7f54c... 8e0ee43... Author: James Morris Date: Tue Mar 24 10:52:46 2009 +1100 Merge branch 'master' into next commit c441c2971de52b7045acb708cc9959815f554f66 Merge: afad17c... 28514fe... Author: Takashi Iwai Date: Tue Mar 24 00:36:23 2009 +0100 Merge branch 'topic/usb-caiaq' into for-linus commit afad17c0ae21013f958c39594e8a64d120a611f8 Merge: d080732... b1c86bb... Author: Takashi Iwai Date: Tue Mar 24 00:36:22 2009 +0100 Merge branch 'topic/usb-audio' into for-linus commit d0807323345f1cd8ab578b09aab04d10862e9414 Merge: d7b6df5... 453e37b... Author: Takashi Iwai Date: Tue Mar 24 00:36:21 2009 +0100 Merge branch 'topic/sscape-fix' into for-linus commit d7b6df5d1af11544401ca051aaf68b6e7f110c0e Merge: 7df4f69... 3966175... Author: Takashi Iwai Date: Tue Mar 24 00:36:20 2009 +0100 Merge branch 'topic/powermac' into for-linus commit 7df4f694356a125e4553ca35b215fd9e88e858c5 Merge: b54fc8d... d563ffa... Author: Takashi Iwai Date: Tue Mar 24 00:36:19 2009 +0100 Merge branch 'topic/pcxhr' into for-linus commit b54fc8dd2c43888f2754505cca2b6e88604a8ffa Merge: 9fb5430... 873591d... Author: Takashi Iwai Date: Tue Mar 24 00:36:17 2009 +0100 Merge branch 'topic/oxygen' into for-linus commit 9fb5430c3d6e96a74fd4406dbe7608f36abb9987 Merge: 4c5ecb7... e5bf484... Author: Takashi Iwai Date: Tue Mar 24 00:36:16 2009 +0100 Merge branch 'topic/oss-fix' into for-linus commit 4c5ecb7e59662a76754efdd41c6ed4415e6e9840 Merge: fa15fde... 5e74762... Author: Takashi Iwai Date: Tue Mar 24 00:36:15 2009 +0100 Merge branch 'topic/msnd' into for-linus commit fa15fdeffa3977b17882f485547e65296cf0bd30 Merge: 843ad02... 37ba1b6... Author: Takashi Iwai Date: Tue Mar 24 00:36:13 2009 +0100 Merge branch 'topic/isa-misc' into for-linus commit 843ad02fa4fb9230cd19923cc8ea1d6096cadf4e Merge: 60c4e7c... 14ab086... Author: Takashi Iwai Date: Tue Mar 24 00:36:13 2009 +0100 Merge branch 'topic/intel8x0' into for-linus commit 60c4e7c120d8cfe83fa4b0978b682b6d140483ac Merge: 593aff6... e2ea7cf... Author: Takashi Iwai Date: Tue Mar 24 00:36:12 2009 +0100 Merge branch 'topic/ice' into for-linus commit 593aff6c506ba0399a80720d4c5d7e80d8854f9a Merge: e7bfbb0... c2503cd... Author: Takashi Iwai Date: Tue Mar 24 00:36:10 2009 +0100 Merge branch 'topic/hdsp' into for-linus commit e7bfbb0215ee9b2fc976f7f51e20a8ae02b1d839 Merge: fe506d6... 9b6682f... Author: Takashi Iwai Date: Tue Mar 24 00:36:09 2009 +0100 Merge branch 'topic/hda' into for-linus commit fe506d6bc5d7b9c0c1d630eecb32241c1d362462 Merge: c9294e4... 730d45f... Author: Takashi Iwai Date: Tue Mar 24 00:36:08 2009 +0100 Merge branch 'topic/emu10k1' into for-linus commit c9294e4b3793e2bd397691ae015283eecca29562 Merge: ae02cde... a2328d0... Author: Takashi Iwai Date: Tue Mar 24 00:36:07 2009 +0100 Merge branch 'topic/echoaudio' into for-linus commit ae02cde7e9bc7bb4cb48b1798479889f043ba2ae Merge: f11a936... 323a596... Author: Takashi Iwai Date: Tue Mar 24 00:36:05 2009 +0100 Merge branch 'topic/drop-l3' into for-linus commit f11a936fe74e55e02c6b836f66458c3816b76342 Merge: a3c6048... e776ec1... Author: Takashi Iwai Date: Tue Mar 24 00:36:02 2009 +0100 Merge branch 'topic/docbook-fix' into for-linus commit a3c6048dcfe3d7015e591b81c547b6df707b0859 Merge: 87cd9d7... cda9043... Author: Takashi Iwai Date: Tue Mar 24 00:35:59 2009 +0100 Merge branch 'topic/cs423x-merge' into for-linus commit 87cd9d7c8501e5da79de542340208b5f6ab4e1a4 Merge: 158c152... dd542f1... Author: Takashi Iwai Date: Tue Mar 24 00:35:58 2009 +0100 Merge branch 'topic/ca0106' into for-linus commit 158c1529fe8d0094d0051169fd2b1a23e6305223 Merge: b5c7848... 6c7578b... Author: Takashi Iwai Date: Tue Mar 24 00:35:56 2009 +0100 Merge branch 'topic/atmel' into for-linus commit b5c784894c90042f4fc6348aedc7524e899df281 Merge: ff4fc36... 1f21869... Author: Takashi Iwai Date: Tue Mar 24 00:35:53 2009 +0100 Merge branch 'topic/asoc' into for-linus commit ff4fc3656e489ed6ee575959b0510286aefe1e20 Merge: e0d2054... 5f17e79... Author: Takashi Iwai Date: Tue Mar 24 00:35:51 2009 +0100 Merge branch 'topic/aoa' into for-linus commit e0d2054fd3cf167395390dc1758644486c782707 Merge: d807500... c468ac2... Author: Takashi Iwai Date: Tue Mar 24 00:35:50 2009 +0100 Merge branch 'topic/misc' into for-linus commit d807500a2472445d05ce641bf09438e3d72eeb4f Merge: c7ccfd0... 8b22d94... Author: Takashi Iwai Date: Tue Mar 24 00:35:49 2009 +0100 Merge branch 'topic/pcm-cleanup' into for-linus commit c7ccfd060fe38d1029db860199a04d9b3dd4694d Merge: ec6659c... 78a05b5... Author: Takashi Iwai Date: Tue Mar 24 00:35:48 2009 +0100 Merge branch 'topic/ioctl-use-define' into for-linus commit ec6659c3898798a9cf3010d6c61a8ea6fa123073 Merge: c944a93... 79c7cdd... Author: Takashi Iwai Date: Tue Mar 24 00:35:47 2009 +0100 Merge branch 'topic/vmaster-update' into for-linus commit c944a93df0d566a66409628c4524f4fc4f62eaf5 Merge: 65b3864... 9a1b64c... Author: Takashi Iwai Date: Tue Mar 24 00:35:46 2009 +0100 Merge branch 'topic/rawmidi-fix' into for-linus commit 65b3864b85485a91f70988e1a222e3935bce87e4 Merge: bafdb72... 118dd6b... Author: Takashi Iwai Date: Tue Mar 24 00:35:45 2009 +0100 Merge branch 'topic/ctl-list-cleanup' into for-linus commit bafdb7278cb6a215a8a451024fa1604d790cb7b4 Merge: 5b56eec... 8bd4bb7... Author: Takashi Iwai Date: Tue Mar 24 00:35:44 2009 +0100 Merge branch 'topic/quirk-cleanup' into for-linus commit 5b56eec77498f15317f3ff5ac9101372f400c859 Merge: c2f4398... 662c319... Author: Takashi Iwai Date: Tue Mar 24 00:35:43 2009 +0100 Merge branch 'topic/jack' into for-linus commit c2f43981e5dbc92884149aa2234064cc2c340acd Merge: dec14f8... 28b7e34... Author: Takashi Iwai Date: Tue Mar 24 00:35:41 2009 +0100 Merge branch 'topic/hwdep-cleanup' into for-linus commit dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd Merge: 8e0ee43... b1a0aac... Author: Takashi Iwai Date: Tue Mar 24 00:35:35 2009 +0100 Merge branch 'topic/snd_card_new-err' into for-linus commit 039a6f6a39d2aa30ee53afdb213ea6dd4482928b Author: David S. Miller Date: Mon Mar 23 16:21:16 2009 -0700 ucc_geth: Fix merge error. I left a merge failure unresolved, noticed by Stephen Rothwell. Signed-off-by: David S. Miller commit 9fb4c2b9e06c0a197d867b34865b113a47370bd5 Author: Chris Dearman Date: Fri Mar 20 15:33:55 2009 -0700 MIPS: R2: Fix problem with code that incorrectly modifies ebase. Commit 566f74f6b2f8b85d5b8d6caaf97e5672cecd3e3e had a change that incorrectly modified ebase. This backs out the lines that modified ebase. In addition, the ebase exception vector is now allocated with correct alignment and the ebase register updated according to the architecture specification. Based on original patch by David VomLehn . Signed-off-by: David VomLehn Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 89e18eb331cc83fb4923bbc9a93beb5cb53eca0a Author: Ralf Baechle Date: Mon Mar 23 22:14:55 2009 +0100 MIPS: Change {set,clear,change}_c0_ to return old value. This is more standard and useful and need for the following fix to work correctly. Signed-off-by: Ralf Baechle commit 5484879c0a50de7f60d403d375faff41cbd4ab01 Author: Huang Weiyi Date: Sat Mar 21 13:50:48 2009 +0800 MIPS: compat: Remove duplicated #include Remove duplicated #include in arch/mips/kernel/linux32.c. Signed-off-by: Huang Weiyi Signed-off-by: Ralf Baechle commit 5864810bc50de57e1b4757850d3208f69579af7f Author: Shinya Kuribayashi Date: Wed Mar 18 09:04:01 2009 +0900 MIPS: VR5500: Enable prefetch Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit d7001198366bffce4506ba21b7b0fee2de194f73 Author: Jan Nikitenko Date: Fri Nov 28 08:52:58 2008 +0100 MIPS: Fix oops in dma_unmap_page on not coherent mips platforms dma_cache_wback_inv() expects virtual address, but physical was provided due to translation via plat_dma_addr_to_phys(). If replaced with dma_addr_to_virt(), page fault oops from dma_unmap_page() is gone on au1550 platform. Signed-off-by: Jan Nikitenko Acked-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 18f27383d9bdcb985cc39599e99917bdad101a60 Author: Anton Vorontsov Date: Thu Mar 19 06:48:08 2009 +0000 fsl_pq_mdio: Use proper address translation Currently the driver just read "reg" property for constructing MDIO bus IDs, but this won't work when we'll start using "ranges = <>" in the device tree, so this will pop up: Freescale PowerQUICC MII Bus: probed sysfs: duplicate filename 'mdio@520' can not be created ------------[ cut here ]------------ Badness at c00cb6b8 [verbose debug info unavailable] NIP: c00cb6b8 LR: c00cb6b8 CTR: c001271c REGS: cf82fc10 TRAP: 0700 Not tainted (2.6.29-rc7-03702-g7ccd10f) MSR: 00029032 CR: 42044022 XER: 20000000 TASK = cf81fbd0[1] 'swapper' THREAD: cf82e000 GPR00: c00cb6b8 cf82fcc0 cf81fbd0 0000003b 00000e42 ffffffff 00004000 00000e42 GPR08: c03cb0fc c03bfbdc 00000e42 c03cac50 22044022 1006a2bc 0ffcb000 00000000 GPR16: 0ffc04b0 0ffc5a40 00000000 0ffc79a8 0f7863a8 00000004 00000000 00000000 GPR24: c033a6a8 d1014520 cf85e840 cf82fd08 cf87cf2c cf82fcd8 cf85dea8 ffffffef NIP [c00cb6b8] sysfs_add_one+0x4c/0x54 LR [c00cb6b8] sysfs_add_one+0x4c/0x54 Call Trace: [cf82fcc0] [c00cb6b8] sysfs_add_one+0x4c/0x54 (unreliable) [cf82fcd0] [c00cbc18] create_dir+0x58/0xc0 [cf82fd00] [c00cbcc0] sysfs_create_dir+0x40/0x70 [cf82fd20] [c0159388] create_dir+0x28/0x78 [cf82fd30] [c0159824] kobject_add_internal+0x98/0x13c [cf82fd50] [c0159e98] kobject_add+0x60/0x98 [cf82fd80] [c018a480] device_add+0x98/0x2ac [cf82fda0] [c01a2380] mdiobus_register+0xbc/0x1c0 [cf82fdc0] [c019f31c] fsl_pq_mdio_probe+0x284/0x2a0 [cf82fe00] [c0223814] of_platform_device_probe+0x5c/0x84 ... This patch fixes the issue by translating the "reg" property to a full address, and thus avoids the duplicate names. Signed-off-by: Anton Vorontsov Acked-by: Kumar Gala Signed-off-by: David S. Miller commit 30842f2989aacfaba3ccb39829b3417be9313dbe Author: Vitaly Mayatskikh Date: Mon Mar 23 15:22:33 2009 -0700 udp: Wrong locking code in udp seq_file infrastructure Reading zero bytes from /proc/net/udp or other similar files which use the same seq_file udp infrastructure panics kernel in that way: ===================================== [ BUG: bad unlock balance detected! ] ------------------------------------- read/1985 is trying to release lock (&table->hash[i].lock) at: [] udp_seq_stop+0x27/0x29 but there are no more locks to release! other info that might help us debug this: 1 lock held by read/1985: #0: (&p->lock){--..}, at: [] seq_read+0x38/0x348 stack backtrace: Pid: 1985, comm: read Not tainted 2.6.29-rc8 #9 Call Trace: [] ? udp_seq_stop+0x27/0x29 [] print_unlock_inbalance_bug+0xd6/0xe1 [] lock_release_non_nested+0x9e/0x1c6 [] ? seq_read+0xb2/0x348 [] ? mark_held_locks+0x68/0x86 [] ? udp_seq_stop+0x27/0x29 [] lock_release+0x15d/0x189 [] _spin_unlock_bh+0x1e/0x34 [] udp_seq_stop+0x27/0x29 [] seq_read+0x2bb/0x348 [] ? seq_read+0x0/0x348 [] proc_reg_read+0x90/0xaf [] vfs_read+0xa6/0x103 [] ? trace_hardirqs_on_caller+0x12f/0x153 [] sys_read+0x45/0x69 [] system_call_fastpath+0x16/0x1b BUG: scheduling while atomic: read/1985/0xffffff00 INFO: lockdep is turned off. Modules linked in: cpufreq_ondemand acpi_cpufreq freq_table dm_multipath kvm ppdev snd_hda_codec_analog snd_hda_intel snd_hda_codec snd_hwdep snd_seq_dummy snd_seq_oss snd_seq_midi_event arc4 snd_s eq ecb thinkpad_acpi snd_seq_device iwl3945 hwmon sdhci_pci snd_pcm_oss sdhci rfkill mmc_core snd_mixer_oss i2c_i801 mac80211 yenta_socket ricoh_mmc i2c_core iTCO_wdt snd_pcm iTCO_vendor_support rs rc_nonstatic snd_timer snd lib80211 cfg80211 soundcore snd_page_alloc video parport_pc output parport e1000e [last unloaded: scsi_wait_scan] Pid: 1985, comm: read Not tainted 2.6.29-rc8 #9 Call Trace: [] ? __debug_show_held_locks+0x1b/0x24 [] __schedule_bug+0x7e/0x83 [] schedule+0xce/0x838 [] ? fsnotify_access+0x5f/0x67 [] ? sysret_careful+0xb/0x37 [] ? trace_hardirqs_on_caller+0x1f/0x153 [] ? trace_hardirqs_on_thunk+0x3a/0x3f [] sysret_careful+0x31/0x37 read[1985]: segfault at 7fffc479bfe8 ip 0000003e7420a180 sp 00007fffc479bfa0 error 6 Kernel panic - not syncing: Aiee, killing interrupt handler! udp_seq_stop() tries to unlock not yet locked spinlock. The lock was lost during splitting global udp_hash_lock to subsequent spinlocks. Signed-off by: Vitaly Mayatskikh Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit e072b639dc13b06b65be487633dad9bb3d2067d5 Author: Steve Glendinning Date: Mon Mar 23 15:17:31 2009 -0700 phy: add new LAN8710 and LAN8720 device ids to smsc phy driver LAN8710 and LAN8720 are two new 10/100 ethernet PHY models. The two share the same phy id, this patch adds it to the smsc phy driver. Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit 9b6682ff4c69484b6955f89f7902e3dde2481bed Author: Takashi Iwai Date: Mon Mar 23 22:50:52 2009 +0100 ALSA: hda - Add quirk for Acer Ferrari 5000 Add a quirk model=acer-aspire for Acer Ferrari 5000 with ALC883 codec. Note that model=auto doesn't work for this laptop because of broken BIOS (that doesn't set the subsystem id properly). Tested-by: Russ Dill Signed-off-by: Takashi Iwai commit 3e303dc1215714308e21a45e2c0fa6f701ad0eb4 Author: David S. Miller Date: Mon Mar 23 14:42:09 2009 -0700 spider_net: Add missing .ndo_validate_addr Signed-off-by: David S. Miller commit dac4696a4b4f6823efda32f92dbc236a918c376f Author: David S. Miller Date: Mon Mar 23 14:29:24 2009 -0700 myri_sbus/sunbmac/sunlance/sunqe: Add missing net_device_ops entries. Noticed by Stephen Hemminger. Signed-off-by: David S. Miller commit 8be7cdccacfbfc707e7370cad9bb168defed636f Merge: ecd4137... 61fa9dc... Author: David S. Miller Date: Mon Mar 23 13:35:04 2009 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/ucc_geth.c commit ecd4137320b59759bbe57eef89040ee3e5e66039 Author: David S. Miller Date: Mon Mar 23 13:33:37 2009 -0700 sunqe: Convert to net_device_ops. Signed-off-by: David S. Miller commit c7670718cbca7a2f3c8751076cb62e1691006be9 Author: David S. Miller Date: Mon Mar 23 13:33:28 2009 -0700 sunlance: Convert to net_device_ops. Signed-off-by: David S. Miller commit 2199b87a94375befd574a58b7824551c1e285833 Author: David S. Miller Date: Mon Mar 23 13:33:21 2009 -0700 sunbmac: Convert to net_device_ops. Signed-off-by: David S. Miller commit adaa0db1da2d885f49dd2dcc357cdbe68e6dc283 Author: David S. Miller Date: Mon Mar 23 13:33:11 2009 -0700 myri_sbus: Convert to net_device_ops. Signed-off-by: David S. Miller commit 37bebc70d7ad4144c571d74500db3bb26ec0c0eb Author: Oleg Nesterov Date: Mon Mar 23 20:34:11 2009 +0100 posix timers: fix RLIMIT_CPU && fork() See http://bugzilla.kernel.org/show_bug.cgi?id=12911 copy_signal() copies signal->rlim, but RLIMIT_CPU is "lost". Because posix_cpu_timers_init_group() sets cputime_expires.prof_exp = 0 and thus fastpath_timer_check() returns false unless we have other cpu timers. This is the minimal fix for 2.6.29 (tested) and 2.6.28. The patch is not optimal, we need further cleanups here. With this patch update_rlimit_cpu() is not really needed, but I don't think it should be removed. The proper fix (I think) is: - set_process_cpu_timer() should just start the cputimer->running logic (it does), no need to change cputime_expires.xxx_exp - posix_cpu_timers_init_group() should set ->running when needed - fastpath_timer_check() can check ->running instead of task_cputime_zero(signal->cputime_expires) Reported-by: Peter Lojkin Signed-off-by: Oleg Nesterov Cc: Peter Zijlstra Cc: Roland McGrath Cc: [for 2.6.29.x] LKML-Reference: <20090323193411.GA17514@redhat.com> Signed-off-by: Ingo Molnar commit efd247fa34084d9b162f485004ae6d8a04059f0c Merge: af66df5... 59fcbdd... Author: Ingo Molnar Date: Mon Mar 23 16:53:20 2009 +0100 Merge branches 'sched/debug' and 'linus' into sched/core commit 14bafe3278e5da952a6586a5a9a9d286566049ed Author: Takashi Iwai Date: Mon Mar 23 16:35:39 2009 +0100 ALSA: hda - Use cached calls to get widget caps and pin caps Replace with the standard function calls to use caches for reading the widget caps and pin caps. hda_proc.c is still using the direct verbs to get raw values as much as possible. Signed-off-by: Takashi Iwai commit a23b688f4d5c2490a50677b30011a677d8edf3d0 Author: Takashi Iwai Date: Mon Mar 23 15:21:36 2009 +0100 ALSA: hda - Don't create empty/single-item input source In patch_realtek.c, don't create empty or single-item "Input Source" control elements that are simply superfluous. Signed-off-by: Takashi Iwai commit e82c025b501a1ca62dec40989817dbb17c0b9167 Author: Takashi Iwai Date: Mon Mar 23 15:17:38 2009 +0100 ALSA: hda - Fix the wrong pin-cap check in patch_realtek.c The check for the amp-output must be done for widget-caps rather than pin-caps as implemented in the recent change... Simply a thinko. Also, add the similar checks to all places that put output-amp mutes in the initialization. Signed-off-by: Takashi Iwai commit 534f81a5068799799e264fd162e9488a129f98d4 Author: Mark H. Weaver Date: Mon Mar 23 13:46:12 2009 +0100 netfilter: nf_conntrack_tcp: fix unaligned memory access in tcp_sack This patch fixes an unaligned memory access in tcp_sack while reading sequence numbers from TCP selective acknowledgement options. Prior to applying this patch, upstream linux-2.6.27.20 was occasionally generating messages like this on my sparc64 system: [54678.532071] Kernel unaligned access at TPC[6b17d4] tcp_packet+0xcd4/0xd00 Acked-by: David S. Miller Signed-off-by: Patrick McHardy commit dd5b6ce6fd465eab90357711c8e8124dc3a31ff0 Author: Pablo Neira Ayuso Date: Mon Mar 23 13:21:06 2009 +0100 nefilter: nfnetlink: add nfnetlink_set_err and use it in ctnetlink This patch adds nfnetlink_set_err() to propagate the error to netlink broadcast listener in case of memory allocation errors in the message building. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy commit 176252746ebbc8db97e304345af1f2563c7dc139 Author: Eric Leblond Date: Mon Mar 23 13:16:53 2009 +0100 netfilter: sysctl support of logger choice This patchs adds support of modification of the used logger via sysctl. It can be used to change the logger to module that can not use the bind operation (ipt_LOG and ipt_ULOG). For this purpose, it creates a directory /proc/sys/net/netfilter/nf_log which contains a file per-protocol. The content of the file is the name current logger (NONE if not set) and a logger can be setup by simply echoing its name to the file. By echoing "NONE" to a /proc/sys/net/netfilter/nf_log/PROTO file, the logger corresponding to this PROTO is set to NULL. Signed-off-by: Eric Leblond Signed-off-by: Patrick McHardy commit 1327a32b878b5ed2113c63557b6f4f949f821857 Author: Takashi Iwai Date: Mon Mar 23 13:07:47 2009 +0100 ALSA: hda - Cache pin-cap values Added snd_hda_query_pin_caps() to read and cache pin-cap values to avoid too frequently issuing the same verbs. Signed-off-by: Takashi Iwai commit 52ca15b7c0c711eb37f5e4b769e8488e5c516d43 Author: Takashi Iwai Date: Mon Mar 23 12:51:55 2009 +0100 ALSA: hda - Avoid output amp manipulation to digital mic pins Don't set amp-out values to pins without PINCAP_OUT capability, which are usually assigned for digital mics on ALC663/ALC272. Signed-off-by: Takashi Iwai commit 234b4346a064f8a2a488da10b3c1e640fb778a17 Author: Pascal de Bruijn Date: Mon Mar 23 11:15:59 2009 +0100 ALSA: hda - Add function id to proc output This patch does two things: Output Intel HDA Function Id in /proc/asound/cardX/codec#X Align Vendor/Subsystem/Revision Ids to 8 characters, front-padded with zeros Before: Vendor Id: 0x11d41884 Subsystem Id: 0x103c281a Revision Id: 0x100100 After: Function Id: 0x1 Vendor Id: 0x11d41884 Subsystem Id: 0x103c281a Revision Id: 0x0100100 As report on the Kernel Bugzilla #12888 Signed-off-by: Pascal de Bruijn Signed-off-by: Takashi Iwai commit b3e3b302cf6dc8d60b67f0e84d1fa5648889c038 Merge: a6bc326... 59fcbdd... Author: Ingo Molnar Date: Mon Mar 23 10:07:49 2009 +0100 Merge branches 'irq/sparseirq' and 'linus' into irq/core commit 6fb8f424393025674fde7869b59f485d1e352182 Author: Nick Piggin Date: Mon Mar 16 21:00:28 2009 +1100 slob: fix lockup in slob_free() Don't hold SLOB lock when freeing the page. Reduces lock hold width. See the following thread for discussion of the bug: http://marc.info/?l=linux-kernel&m=123709983214143&w=2 Reported-by: Ingo Molnar Acked-by: Matt Mackall Signed-off-by: Nick Piggin Signed-off-by: Pekka Enberg commit 268ed76d67d658684d4b1e114d4da75ad360b4b1 Author: Huang Weiyi Date: Mon Mar 23 01:18:58 2009 -0700 atl1c: remove duplicated #include Remove duplicated #include in drivers/net/atl1c/atl1c.h. Signed-off-by: Huang Weiyi Signed-off-by: David S. Miller commit da4a99e397d4165c0b8d951e75adb095455614ec Author: David S. Miller Date: Mon Mar 23 01:03:04 2009 -0700 spider_net: Fix build. Based upon a report by Stephen Rothwell. Signed-off-by: David S. Miller commit 1a00df4a2cc001dd9f45890e690548c24b2fa2d9 Author: Akinobu Mita Date: Sat Mar 7 00:36:21 2009 +0900 slub: use get_track() Use get_track() in set_track() Signed-off-by: Akinobu Mita Cc: Christoph Lameter Cc: Pekka Enberg Signed-off-by: Pekka Enberg commit 96e0bf4b5193d0d97d139f99e2dd128763d55521 Author: John Dykstra Date: Sun Mar 22 21:49:57 2009 -0700 tcp: Discard segments that ack data not yet sent Discard incoming packets whose ack field iincludes data not yet sent. This is consistent with RFC 793 Section 3.9. Change tcp_ack() to distinguish between too-small and too-large ack field values. Keep segments with too-large ack fields out of the fast path, and change slow path to discard them. Reported-by: Oliver Zheng Signed-off-by: John Dykstra Signed-off-by: David S. Miller commit 763dccdc8e9775b247c3ea86ae8f5f592c12024e Author: Eilon Greenstein Date: Sun Mar 22 21:24:19 2009 -0700 bnx2x: Adding licensing to bnx2x_init_values.h Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit d44c3a2e0e5d2c75d22284462c66d166604b1f18 Author: Stephen Hemminger Date: Fri Mar 20 19:36:44 2009 +0000 netdev: expose net_device_ops compat as config option Now that most network device drivers in (all but one in x86_64 allmodconfig) support net_device_ops. Expose it as a configuration parameter. Still need to address even older 32 bit drivers, and other arch before compatiablity can be scheduled for removal in some future release. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 5ae4efbcd2611562a8b93596be034e63495706a5 Author: Stephen Hemminger Date: Fri Mar 20 19:36:43 2009 +0000 hostap: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 4cfa8e45f4bb26ff38155f94a810a876b739958d Author: Stephen Hemminger Date: Fri Mar 20 19:36:42 2009 +0000 hostap: convert to internal net_device_stats Use pre-existing net_device_stats in network_device struct. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 44e9ad0b5a9bd4de7ff3ac28b27d6577eb58fd91 Author: Stephen Hemminger Date: Fri Mar 20 19:36:41 2009 +0000 ipw2200: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 3e47fcea201ba7b08f9f13cead6e3045a80fb279 Author: Stephen Hemminger Date: Fri Mar 20 19:36:40 2009 +0000 ipw2100: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d5b3b9ae065d093fe0e1588a07f3ebd71c815f0b Author: Stephen Hemminger Date: Fri Mar 20 19:36:39 2009 +0000 ipw2x00: convert infrastructure for use by net_device_ops Expose routines so drivers can hook. Only set ptrs in netdev if using old compat code. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit ce55cbaf3a4498719bdb5a022a45d256b84749f5 Author: Stephen Hemminger Date: Fri Mar 20 19:36:38 2009 +0000 ipw2x00: convert to internal net_device_stats Replace struct in ieee with current net_device_stats, so no longer need get_stats hook Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f02abf1010dfb9fa7f56788fb28bc63b0ea34968 Author: Stephen Hemminger Date: Fri Mar 20 19:36:37 2009 +0000 libertas: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit bbfc6b788f63f079fb8eeeb8d397bb1c0a8065a1 Author: Stephen Hemminger Date: Fri Mar 20 19:36:36 2009 +0000 libertas: convert to internal net_device_stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 6456fffb09a281af2644e73fda26d1eeec325830 Author: Stephen Hemminger Date: Fri Mar 20 19:36:35 2009 +0000 prism54: convert to internal net_device_stats Also, make ethtool_ops const as it should be, and get rid of useless cast. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 6685254f80cdca085cb1d53c45a6d0d5d01f911e Author: Stephen Hemminger Date: Fri Mar 20 19:36:34 2009 +0000 prism54: convert to net_device_ops Also, make ethtool_ops const as it should be, and get rid of useless cast. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 98d2faaeb72a2db4ea232263ca4ce9dbfe8e1f5a Author: Stephen Hemminger Date: Fri Mar 20 19:36:33 2009 +0000 mac80211_hwsim: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 2bd9f54d46e28fdaa15240af6a97c953720ea5c1 Author: Stephen Hemminger Date: Fri Mar 20 19:36:32 2009 +0000 zd1201: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 22bc1ce4f171f53c27052e1d74d312345487db16 Author: Stephen Hemminger Date: Fri Mar 20 19:36:31 2009 +0000 zd1201: convert to internal net_device_stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 85a151b760348e4693e54bc8cece89ab9d3dc81d Author: Stephen Hemminger Date: Fri Mar 20 19:36:30 2009 +0000 wl3501: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 4255d411452f1fe4dbcb2de4de35a7a028c5415a Author: Stephen Hemminger Date: Fri Mar 20 19:36:29 2009 +0000 wl3501: convert to internal net_device_stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 32f5a330090fdf7d4d663ff5bd979e186fe6aab6 Author: Stephen Hemminger Date: Fri Mar 20 19:36:28 2009 +0000 raylan: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 824f1dfdbef72578272e9303dd9515399da57f28 Author: Stephen Hemminger Date: Fri Mar 20 19:36:27 2009 +0000 atmel: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 7ae41cc3c04b0e79b7c9c3e5cbb5222f181e3ca1 Author: Stephen Hemminger Date: Fri Mar 20 19:36:26 2009 +0000 airo: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 9db0ba0a8b8bb0fd6606b4ac17073b2984b2d797 Author: Stephen Hemminger Date: Fri Mar 20 19:36:25 2009 +0000 wavelan: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 385e63fb1e469739e90b32f4c07fed48baf2721a Author: Stephen Hemminger Date: Fri Mar 20 19:36:24 2009 +0000 wavelan: convert to internal net_device_stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 1cc5920f0f6077e36e259e149548ef9a94335382 Author: Stephen Hemminger Date: Fri Mar 20 19:36:23 2009 +0000 strip: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 1964e0dedf98e2fdf3bfd3ac8cf02d9e9aa803fb Author: Stephen Hemminger Date: Fri Mar 20 19:36:22 2009 +0000 netwave: convert to net_device_ops Also get rid of unneeded cast Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f56ef16eb0c30bf76acf7c2ac9ee68781a7aef6a Author: Stephen Hemminger Date: Fri Mar 20 19:36:21 2009 +0000 netwave: convert to internal net_device_stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 7dd0b6e0feca6cd4269e120d63c46eeb63164ca2 Author: Stephen Hemminger Date: Fri Mar 20 19:36:20 2009 +0000 sbni: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit fe6c6fbbcdd6675244fbbde62a9790ca57bd2785 Author: Stephen Hemminger Date: Fri Mar 20 19:36:19 2009 +0000 sbni: use internal net_device_stats Convert to use existing net_device_stats. This driver, has bad style, of using commas, when brackets should be used... Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 39549b1e83e640907b0ed58f76d3331c2ae40e3d Author: Stephen Hemminger Date: Fri Mar 20 19:36:18 2009 +0000 labether: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit ea2ebaf822ad7cf9d2a1aa5f579be34c8c840202 Author: Stephen Hemminger Date: Fri Mar 20 19:36:17 2009 +0000 lapbether: convert to internal net_device_stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d9b06c47a9eddef7d8829f6763bdf601c435c6f2 Author: Stephen Hemminger Date: Fri Mar 20 19:36:16 2009 +0000 cycx: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 49e8abaf62dc6403f11313e8fefbc0f5e7a9f50f Author: Stephen Hemminger Date: Fri Mar 20 19:36:15 2009 +0000 dlci: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 07d117cf0a2c71160d3fcc0068d1f1fe1237c47a Author: Stephen Hemminger Date: Fri Mar 20 19:36:14 2009 +0000 dlci: convert to internal net_device_stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 48f26ad5c097d751caef070ba057448d8a9c9a8d Author: Stephen Hemminger Date: Fri Mar 20 19:36:13 2009 +0000 x25_asy: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 6a8eba3bf4643fa4f0f62af29c47728d5296ed15 Author: Stephen Hemminger Date: Fri Mar 20 19:36:12 2009 +0000 x25_asy: convert to internal net_device_stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 3dd205165e076eacf09575f0c90031e7c52bc5e1 Author: Stephen Hemminger Date: Fri Mar 20 19:36:11 2009 +0000 axnet: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 9b31b6971f448796768860e3c9ee2d22f4511731 Author: Stephen Hemminger Date: Fri Mar 20 19:36:10 2009 +0000 smc91c92: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 6fb7298cdbe200b3b19cd59046785aecb0844198 Author: Stephen Hemminger Date: Fri Mar 20 19:36:09 2009 +0000 smc91c92: convert to internal net_device_stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 0cd6e828a3cfb9c5bb71827ae6ee1564bf465f48 Author: Stephen Hemminger Date: Fri Mar 20 19:36:08 2009 +0000 xirc2ps: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 6394d7c9a2c4c5d729c1cdb69f96f9fff16ec232 Author: Stephen Hemminger Date: Fri Mar 20 19:36:07 2009 +0000 xir2cps: convert to internal net_device stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 23169a402d6a2d55992e6b7f6157ae04b636545a Author: Stephen Hemminger Date: Fri Mar 20 19:36:06 2009 +0000 pcnet: convert driver to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 28b1801d5a367adaf3d02605c762a59781d99664 Author: Stephen Hemminger Date: Fri Mar 20 19:36:05 2009 +0000 pcmcia: convert nmclan driver to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 496f98cd5687770f4cb463c300510016dfbc81f6 Author: Stephen Hemminger Date: Fri Mar 20 19:36:04 2009 +0000 pcmcia: convert fmvj18x driver to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d63cd426ba55a9e02ab745612357ee00158824a5 Author: Stephen Hemminger Date: Fri Mar 20 19:36:03 2009 +0000 pcmcia: convert fmvj18x driver to internal net_device_stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit fb72e2ff356e55b6a60c5883d4506175652c3e9d Author: Stephen Hemminger Date: Fri Mar 20 19:36:02 2009 +0000 pcmcia: convert 3c574 to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 97161d4b2a28857f217b2035b2141cbb36f22f8b Author: Stephen Hemminger Date: Fri Mar 20 19:36:01 2009 +0000 pcmcia: convert 3c589 to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 0f2166dff6440bb6fb39e4fbe7bfca7cde95d650 Author: Stephen Hemminger Date: Fri Mar 20 19:36:00 2009 +0000 usbnet: convert rndis driver to net_device_ops Signed-off-by: Stephen Hemminger Acked-by: David Brownell Signed-off-by: David S. Miller commit b5556498b60a237cca173dfd60109f3504ce25ca Author: Stephen Hemminger Date: Fri Mar 20 19:35:59 2009 +0000 usbnet: convert rndis driver to use dev_get_stats dev_get_stats() handles all issues with net_device_ops Signed-off-by: Stephen Hemminger Acked-by: David Brownell Signed-off-by: David S. Miller commit 63e77b391f7230ab87effbcaf7238e9b1e6d7404 Author: Stephen Hemminger Date: Fri Mar 20 19:35:58 2009 +0000 usbnet: convert smsc95xx driver to net_device_ops Signed-off-by: Stephen Hemminger Acked-by: Steve Glendinning Signed-off-by: David S. Miller commit e12c4f83210b457e2969fbe1198357e66f044a93 Author: Stephen Hemminger Date: Fri Mar 20 19:35:57 2009 +0000 usbnet: convert msc7830 driver to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit fe85ff8299538c8488645e7d72539079dad5bae6 Author: Stephen Hemminger Date: Fri Mar 20 19:35:56 2009 +0000 usbnet: convert dms9601 driver to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: Peter Korsgaard Signed-off-by: David S. Miller commit 1703338c79f39178535fe54b5aeaebf9c42300f6 Author: Stephen Hemminger Date: Fri Mar 20 19:35:55 2009 +0000 usbnet: convert asix driver to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 777baa4711c6b8373f4e03a3a558d44a6b046d7a Author: Stephen Hemminger Date: Fri Mar 20 19:35:54 2009 +0000 usbnet: support net_device_ops Use net_device_ops for usbnet device, and export for use by other derived drivers. Signed-off-by: Stephen Hemminger Acked-by: David Brownell Signed-off-by: David S. Miller commit 805aaa29fa3c5afb26cb42f440f40d3f7f5c4bdc Author: Stephen Hemminger Date: Fri Mar 20 19:35:53 2009 +0000 usbnet: convert to internal net_device_stats Default handler for net_device_stats already does same thing. Signed-off-by: Stephen Hemminger Acked-by: David Brownell Signed-off-by: David S. Miller commit c266cb4ef2ef1f1e3f46d81022939feebe8fa54d Author: Stephen Hemminger Date: Fri Mar 20 19:35:52 2009 +0000 usbnet: convert hso driver to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d79f7ef48b0897458a4df30085338aeb7fb85ffc Author: Stephen Hemminger Date: Fri Mar 20 19:35:51 2009 +0000 usbnet: convert rtl driver to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b7e41e23055f20be334c404b15373c8deb2262b9 Author: Stephen Hemminger Date: Fri Mar 20 19:35:50 2009 +0000 usbnet: convert to internal net_device stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 19b8f8f1a1cd9e31a1092a6841065471df8db00f Author: Stephen Hemminger Date: Fri Mar 20 19:35:49 2009 +0000 usbnet: convert catc device to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit edc4ae08644045dc803dc519f96ff245cb80adad Author: Stephen Hemminger Date: Fri Mar 20 19:35:48 2009 +0000 usbnet: convert catc to internal net_device_stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 94ffab6d199ab36e5dfd2f2f0e4bb135728526c4 Author: Stephen Hemminger Date: Fri Mar 20 19:35:47 2009 +0000 irda: convert ks959 driver to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 0c818a6273218f5a827fe5f41f01caeb679b469e Author: Stephen Hemminger Date: Fri Mar 20 19:35:46 2009 +0000 irda: convert ksdazzle device to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 9b634007d5694178c4e142fbc5f9dbcd767eafbd Author: Stephen Hemminger Date: Fri Mar 20 19:35:45 2009 +0000 irda: convert kingsun device to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 2b023f46cbc6187f6ee88e778ed798745b5b2bfe Author: Stephen Hemminger Date: Fri Mar 20 19:35:44 2009 +0000 irda: convert sir device to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 0bd11f27ed3b3c04b1a753b6c8bdc79ffc1b8cef Author: Stephen Hemminger Date: Fri Mar 20 19:35:43 2009 +0000 irda: convert via-ircc to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 02087be61af0e48eae42566d3c5783f2f44337c8 Author: Stephen Hemminger Date: Fri Mar 20 19:35:42 2009 +0000 irda: convert smsc driver to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 30a5d7f7e3c77e3b00b8c981b7af4e5adc331353 Author: Stephen Hemminger Date: Fri Mar 20 19:35:41 2009 +0000 irda: convert vlsi driver to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 2d44a22254c1c4ad35a58e6d9d15a547d8841efc Author: Stephen Hemminger Date: Fri Mar 20 19:35:40 2009 +0000 irda: convert ali driver to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c279b8c996e99a3fca7806986415263f840b2fa1 Author: Stephen Hemminger Date: Fri Mar 20 19:35:39 2009 +0000 irda: convert nsc_ircc driver to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 4113a1a672e5b3f03fc99e7240d4c47e689af2c6 Author: Stephen Hemminger Date: Fri Mar 20 19:35:38 2009 +0000 irda: convert w83977af_ir to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 66ee279ff2747bd23f54886369133b1086b87252 Author: Stephen Hemminger Date: Fri Mar 20 19:35:37 2009 +0000 stir4200: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit ddc2a92d34ba20b47e1856375c68d25f51e86f53 Author: Stephen Hemminger Date: Fri Mar 20 19:35:36 2009 +0000 irda: convert mcs driver to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d36733afd9b65546e1fe0def5d50d8c4519ee452 Author: Stephen Hemminger Date: Fri Mar 20 19:35:35 2009 +0000 irda: convert irda_usb to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 9cc8ba783d56b36259b2d610e97bcda8a6fe3b02 Author: Stephen Hemminger Date: Fri Mar 20 19:35:34 2009 +0000 irlan: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 92bcd4fe9a63e8785a4f6ba4262ee601c271a70b Author: Stephen Hemminger Date: Fri Mar 20 19:35:33 2009 +0000 irda: net_device_ops ioctl fix Need to reference net_device_ops not old pointer. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit fe8114e8e1d15ba07ddcaebc4741957a1546f307 Author: Stephen Hemminger Date: Fri Mar 20 19:35:32 2009 +0000 infiniband: convert ipoib to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d0929553bebcac828b612e7d6d239559e08feaf4 Author: Stephen Hemminger Date: Fri Mar 20 19:35:31 2009 +0000 infiniband: convert nes driver to net_device_ops Also, removed unnecessary memset() since alloc_netdev returns zeroed memory. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 687c75dcf342f71329bd193af553e96a29581238 Author: Stephen Hemminger Date: Fri Mar 20 19:35:30 2009 +0000 infiniband: convert c2 to net_device_ops Convert this driver to new net_device_ops infrastructure. Also use default net_device get-stats infrastructure Signed-off-by: Stephen Hemminger Reviewed-by: Steve Wise Signed-off-by: David S. Miller commit dde09758557120cb71fb760cfeaed1b8e27209ef Author: Stephen Hemminger Date: Fri Mar 20 19:35:29 2009 +0000 atm: convert clip driver to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 788dee0a954745a182f9341539e5e0fe874b48fc Author: Stephen Hemminger Date: Fri Mar 20 19:35:28 2009 +0000 atm: convert mpc device to using netdev_ops This converts the mpc device to using new netdevice_ops. Compile tested only, needs more than usual review since device was swaping pointers around etc. Signed-off-by: Stephen Hemminger Acked-by: Chas Williams Signed-off-by: David S. Miller commit 6fb70fd1b57707a5c7b9fb167b7790b2cba13f04 Author: Ben Hutchings Date: Fri Mar 20 13:30:37 2009 +0000 sfc: Implement adaptive IRQ moderation Calculate a score for each 1000 IRQs: - TX completions are worth 1 point - RX completions are worth 4 if merged using LRO or 2 otherwise Reduce moderation if the score is less than 10000, down to a minimum of 5 us. Increase moderation if the score is more than 20000, up to the specified maximum. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 85451a951b9511605475fadcc0a8d3aeccefded8 Author: Ben Hutchings Date: Fri Mar 20 13:27:13 2009 +0000 sfc: Optimise falcon_writel_page_locked() for page > 0 The bug this function works around only applies to the first set of page-mapped registers; other pages can be written without locking. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 28c4605826ab24d04102231fc1f3e8577bec376d Author: Ben Hutchings Date: Fri Mar 20 13:26:55 2009 +0000 sfc: Remove unused private PCI register definitions Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit a9de9a74c69f75e9456cd6b45ecab44ff4c81d04 Author: Ben Hutchings Date: Fri Mar 20 13:26:41 2009 +0000 sfc: Work around unreliable legacy interrupt status In rare cases, reading the legacy interrupt status register can acknowledge an event queue whose attention flag has not yet been set in the register. Until we service this event queue it will not generate any more interrupts. Therefore, as a secondary check, poll the next slot in each active event queue whose flag is not set. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit bb145a9e28c32a37f35308bb32180b59e358a3a1 Author: Ben Hutchings Date: Fri Mar 20 13:25:39 2009 +0000 sfc: Pad packets to 33 bytes to prevent TX packet parser lockup The packet parser used in the TX data path for locating checksum fields can lose synchronisation with the TX queue manager when handling packets that look like IPv4 but are too short (17-32 bytes). Work around this by padding to 33 bytes. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit e84665c9cb4db963393fafad6fefe5efdd7e4a09 Author: Lennert Buytenhek Date: Fri Mar 20 09:52:09 2009 +0000 dsa: add switch chip cascading support The initial version of the DSA driver only supported a single switch chip per network interface, while DSA-capable switch chips can be interconnected to form a tree of switch chips. This patch adds support for multiple switch chips on a network interface. An example topology for a 16-port device with an embedded CPU is as follows: +-----+ +--------+ +--------+ | |eth0 10| switch |9 10| switch | | CPU +----------+ +-------+ | | | | chip 0 | | chip 1 | +-----+ +---++---+ +---++---+ || || || || ||1000baseT ||1000baseT ||ports 1-8 ||ports 9-16 This requires a couple of interdependent changes in the DSA layer: - The dsa platform driver data needs to be extended: there is still only one netdevice per DSA driver instance (eth0 in the example above), but each of the switch chips in the tree needs its own mii_bus device pointer, MII management bus address, and port name array. (include/net/dsa.h) The existing in-tree dsa users need some small changes to deal with this. (arch/arm) - The DSA and Ethertype DSA tagging modules need to be extended to use the DSA device ID field on receive and demultiplex the packet accordingly, and fill in the DSA device ID field on transmit according to which switch chip the packet is heading to. (net/dsa/tag_{dsa,edsa}.c) - The concept of "CPU port", which is the switch chip port that the CPU is connected to (port 10 on switch chip 0 in the example), needs to be extended with the concept of "upstream port", which is the port on the switch chip that will bring us one hop closer to the CPU (port 10 for both switch chips in the example above). - The dsa platform data needs to specify which ports on which switch chips are links to other switch chips, so that we can enable DSA tagging mode on them. (For inter-switch links, we always use non-EtherType DSA tagging, since it has lower overhead. The CPU link uses dsa or edsa tagging depending on what the 'root' switch chip supports.) This is done by specifying "dsa" for the given port in the port array. - The dsa platform data needs to be extended with information on via which port to reach any given switch chip from any given switch chip. This info is specified via the per-switch chip data struct ->rtable[] array, which gives the nexthop ports for each of the other switches in the tree. For the example topology above, the dsa platform data would look something like this: static struct dsa_chip_data sw[2] = { { .mii_bus = &foo, .sw_addr = 1, .port_names[0] = "p1", .port_names[1] = "p2", .port_names[2] = "p3", .port_names[3] = "p4", .port_names[4] = "p5", .port_names[5] = "p6", .port_names[6] = "p7", .port_names[7] = "p8", .port_names[9] = "dsa", .port_names[10] = "cpu", .rtable = (s8 []){ -1, 9, }, }, { .mii_bus = &foo, .sw_addr = 2, .port_names[0] = "p9", .port_names[1] = "p10", .port_names[2] = "p11", .port_names[3] = "p12", .port_names[4] = "p13", .port_names[5] = "p14", .port_names[6] = "p15", .port_names[7] = "p16", .port_names[10] = "dsa", .rtable = (s8 []){ 10, -1, }, }, }, static struct dsa_platform_data pd = { .netdev = &foo, .nr_switches = 2, .sw = sw, }; Signed-off-by: Lennert Buytenhek Tested-by: Gary Thomas Signed-off-by: David S. Miller commit 076d3e10a54caa2c148de5732c126c7a31381d48 Author: Lennert Buytenhek Date: Fri Mar 20 09:50:39 2009 +0000 dsa: add support for the Marvell 88E6095/6095F switch chips Add support for the Marvell 88E6095/6095F switch chips. These chips are similar to the 88e6131, so we can add the support to mv88e6131.c easily. Thanks to Gary Thomas and Jesper Dangaard Brouer for testing various patches. Signed-off-by: Lennert Buytenhek Tested-by: Gary Thomas Signed-off-by: David S. Miller commit c084080151e1de92159f8437fde34b6e5bebe35e Author: Lennert Buytenhek Date: Fri Mar 20 09:49:49 2009 +0000 dsa: set ->iflink on slave interfaces to the ifindex of the parent ..so that we can parse the DSA topology from 'ip link' output: 1: lo: mtu 16436 qdisc noqueue 2: eth0: mtu 1500 qdisc pfifo_fast qlen 1000 3: eth1: mtu 1500 qdisc pfifo_fast qlen 1000 4: lan1@eth0: mtu 1500 qdisc noqueue 5: lan2@eth0: mtu 1500 qdisc noqueue 6: lan3@eth0: mtu 1500 qdisc noqueue 7: lan4@eth0: mtu 1500 qdisc noqueue Signed-off-by: Lennert Buytenhek Signed-off-by: David S. Miller commit aec464bbee32e1d67cba0072c50774c5298ef762 Author: Stephen Hemminger Date: Fri Mar 20 07:14:14 2009 +0000 eql: fix non-constant printk warning Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 32f3dde55ba1b28863c0f0611d2c9dcf2d728ec8 Author: Stephen Hemminger Date: Fri Mar 20 06:44:02 2009 +0000 atm: fix non-const printk argument Change printk() argument to fix compiler warning. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit fa665ccf01440644a3956ed039e51e1088cd0f15 Author: Stephen Hemminger Date: Fri Mar 20 05:45:39 2009 +0000 ipx: use constant for strings and desciptor Fix compiler warning about non-const format string. Signed-off-by: Stephen Hemminger Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 7ca98fa234afa096ec2a5e7195ad2d32555cca86 Author: Stephen Hemminger Date: Fri Mar 20 05:43:14 2009 +0000 snap: use const for descriptor Protocols should be able to use constant value for the descriptor. Minor whitespace cleanup as well Signed-off-by: Stephen Hemminger Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 65689fef7e484631e996541a6772706627b0991a Author: Alexander Duyck Date: Fri Mar 20 00:17:43 2009 +0000 igb: cleanup tx dma so map & unmap use matching calls The igb driver was using map_single to map the skbs and then unmap_page to unmap them. This update changes that so instead uses skb_dma_map and skb_dma_unmap. In addition the next_to_watch member of the buffer_info struct was being set uneccesarily. I removed the spots where it was set without being needed. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit c5cd11e380002d24fd4fd4c0fc38f59ab394e885 Author: Alexander Duyck Date: Fri Mar 20 00:17:25 2009 +0000 igb: rework igb_set_multi so that vfs are properly updated Currently if there are no multicast addresses programmed into the PF then the VFs cannot have their multicast filters reset. This change makes it so the code path that updates vf multicast is always called along with the pf updates. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 0e340485725ea35ca4e354cce5df09e86e31e20d Author: Alexander Duyck Date: Fri Mar 20 00:17:08 2009 +0000 igb: update driver to use setup_timer function igb was previously setting up all of the timer members itself. It is easier to just call setup_timer and reduce the calls to one line. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit c493ea45a4251869fe7b820e0486b73b57df7c12 Author: Alexander Duyck Date: Fri Mar 20 00:16:50 2009 +0000 igb: remove IGB_DESC_UNUSED since it is better handled by a function call This patch removes IGB_DESC_UNUSED and replaces it with a function call instead in order to cleanup some of the ugliness introduced by the macro. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit fa4a7ef36ec834fee1719636b30d2f28f4cb0166 Author: Arthur Jones Date: Sat Mar 21 16:55:07 2009 -0700 igb: allow tx of pre-formatted vlan tagged packets When the 82575 is fed 802.1q packets, it chokes with an error of the form: igb 0000:08:00.1 partial checksum but proto=81! As the logic there was not smart enough to look into the vlan header to pick out the encapsulated protocol. There are times when we'd like to send these packets out without having to configure a vlan on the interface. Here we check for the vlan tag and allow the packet to go out with the correct hardware checksum. Thanks to Kand Ly for discovering the issue and the coming up with a solution. This patch is based upon his work. Signed-off-by: Arthur Jones Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 6e06cb626229567629e1dc6eed9399bec549f3cf Author: Yang Hongyang Date: Sat Mar 21 16:52:17 2009 -0700 spider_net: Convert to net_device_ops. Signed-off-by: Yang Hongyang Signed-off-by: David S. Miller commit 62f0c338d126fee75dc04bd23be30281a0e1e62f Author: Mikhail Zolotaryov Date: Thu Mar 19 22:28:02 2009 +0000 powerpc 4xx EMAC driver: device name reported on timeout is not correct Hi, IBM EMAC driver performs device reset (drivers/net/ibm_newemac/core.c: emac_probe() -> emac_init_phy() -> emac_reset()) before registering appropriate net_device (emac_probe() -> register_netdev()), so net_device name contains raw format string during EMAC reset ("eth%d"). If the case of reset timeout, emac_report_timeout_error() function is called to report an error. The problem is this function uses net_device name to report device related, which is not correct, as a result in the kernel log buffer we see: eth%d: reset timeout The solution is to print device_node full_name instead. After applying the patch proposed, error string is like the following: /plb/opb/ethernet@ef600e00: reset timeout Signed-off-by: Mikhail Zolotaryov Acked-by: Benjamin Herrenschmidt Signed-off-by: David S. Miller commit ed734a97c6a81b644bd648afd7a337deb0ccd7e5 Author: Eric Dumazet Date: Sat Mar 21 13:42:55 2009 -0700 net: remove useless prefetch() call There is no gain using prefetch() in dev_hard_start_xmit(), since we already had to read ops->ndo_select_queue pointer in dev_pick_tx(), and both pointers are probably located in the same cache line. This prefetch call slows down fast path because of a stall in address computation. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 8d2f9e81169b8120cf2b4872930ae491b17c27b8 Author: Vlad Yasevich Date: Sat Mar 21 13:41:09 2009 -0700 sctp: Clean up TEST_FRAME hacks. Remove 2 TEST_FRAME hacks that are no longer needed. These allowed sctp regression tests to compile before, but are no longer needed. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 09a3b1f8b1af7220fd7a3caf18e6841a7f5a6c6e Author: Stephen Hemminger Date: Sat Mar 21 13:40:01 2009 -0700 ixgbe: fix select_queue management Convert ixgbe to use net_device_ops properly. Rather than changing the select_queue function pointer just check the flag. Signed-off-by: Stephen Hemminger Acked-by: Peter P Waskiewicz Jr Signed-off-by: David S. Miller commit 9247744e5eaa29aecee5342a0c8694187a6aadcd Author: Stephen Hemminger Date: Sat Mar 21 13:39:26 2009 -0700 skb: expose and constify hash primitives Some minor changes to queue hashing: 1. Use const on accessor functions 2. Export skb_tx_hash for use in drivers (see ixgbe) Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 1f1900f935e810d01c716fa2aaf8c9d25caa4151 Author: Stephen Hemminger Date: Sat Mar 21 13:37:28 2009 -0700 atm: lec use dev_change_mtu Rather than calling device pointer directly (which is incorrect with net_device_ops), use the standard dev_change_mtu. Compile tested only. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a0bffffc148cd8e75a48a89ad2ddb74e4081a20a Author: Ilpo Järvinen Date: Sat Mar 21 13:36:17 2009 -0700 net/*: use linux/kernel.h swap() tcp_sack_swap seems unnecessary so I pushed swap to the caller. Also removed comment that seemed then pointless, and added include when not already there. Compile tested. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit a3ac80a130300573de351083cf4a5b46d233e8bf Author: Bernard Pidoux Date: Sat Mar 21 13:34:20 2009 -0700 netrom: zero length frame filtering in NetRom A zero length frame filter was recently introduced in ROSE protocole. Previous commit makes the same at AX25 protocole level. This patch has the same purpose for NetRom protocole. The reason is that empty frames have no meaning in NetRom protocole. Signed-off-by: Bernard Pidoux Signed-off-by: David S. Miller commit f99bcff7a290768e035f3d4726e103c6ebe858bf Author: Bernard Pidoux Date: Sat Mar 21 13:33:55 2009 -0700 ax25: zero length frame filtering in AX25 In previous commit 244f46ae6e9e18f6fc0be7d1f49febde4762c34b was introduced a zero length frame filter for ROSE protocole. This patch has the same purpose at AX25 frame level for the same reason. Empty frames have no meaning in AX25 protocole. Signed-off-by: Bernard Pidoux Signed-off-by: David S. Miller commit 60784427ab331dc13c070ac4b0cc9a735bdfa9c0 Author: Bernard Pidoux Date: Sat Mar 21 13:33:18 2009 -0700 ax25: SOCK_DEBUG message simplification This patch condenses two debug messages in one. Signed-off-by: Bernard Pidoux Signed-off-by: David S. Miller commit 301968451de7979f454b96a798869f8668ceab1a Author: Anton Vorontsov Date: Sat Mar 21 13:30:05 2009 -0700 fsl_pq_mdio: Revive Gianfar TBI PHY support commit 1577ecef766650a57fceb171acee2b13cbfaf1d3 ("netdev: Merge UCC and gianfar MDIO bus drivers") broke the TSEC TBI PHY support: the driver now refuses to probe TBI MDIO buses as it doesn't know about "fsl,gianfar-tbi" compatible entry, and thus _probe() fails with -ENODEV status. Fix this by adding "fsl,gianfar-tbi" to the list of known Gianfar MDIO buses. Signed-off-by: Anton Vorontsov Acked-by: Andy Fleming Signed-off-by: David S. Miller commit 04ec5cfcfd9a69c16fc8adb9d7f4836eedb84e53 Author: Richard Kennedy Date: Sat Mar 21 13:29:05 2009 -0700 ipv6: reorder struct inet6_ifaddr to remove padding on 64 bit builds reorder struct inet6_ifaddr to remove padding on 64 bit builds remove 8 bytes of padding so inet6_ifaddr becomes 192 bytes & fits into a smaller slab. Signed-off-by: Richard Kennedy Signed-off-by: David S. Miller commit 29ded5f76ce3c41f43b64643b074b7c9c9ebd925 Author: Anton Vorontsov Date: Sat Mar 21 13:27:55 2009 -0700 gianfar: Fix build with CONFIG_PM enabled commit 4826857f1bf07f9c0f1495e9b05d125552c88a85 ("gianfar: pass the proper dev to DMA ops") introduced this build breakage: CC drivers/net/gianfar.o drivers/net/gianfar.c: In function 'gfar_suspend': drivers/net/gianfar.c:552: error: 'struct gfar_private' has no member named 'dev' drivers/net/gianfar.c: In function 'gfar_resume': drivers/net/gianfar.c:601: error: 'struct gfar_private' has no member named 'dev' make[2]: *** [drivers/net/gianfar.o] Error 1 Fix this by converting suspend and resume routines to use gfar_private->ndev. Signed-off-by: Anton Vorontsov Acked-by: Kumar Gala Signed-off-by: David S. Miller commit b55de80e49892002a1878013ab9aee1a30970be6 Author: Bruce Allan Date: Sat Mar 21 13:25:25 2009 -0700 e100: add support for 82552 10/100 adapter This patch enables support for the new Intel 82552 adapter (new PHY paired with the existing MAC in the ICH7 chipset). No new features are added to the driver, however there are minor changes due to updated registers and a few workarounds for hardware errata. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit ed36604b25023c584fdf93df6073f65dac4b1129 Merge: 3f51839... 1329f45... Author: David S. Miller Date: Sat Mar 21 13:23:01 2009 -0700 Merge branch 'master' of git://git.infradead.org/~dwmw2/solos-2.6 commit 949abe574739848b1e68271fbac86c3cb4506aad Author: Herbert Xu Date: Sat Mar 21 21:12:19 2009 +0800 crypto: sha512-s390 - Add missing block size I missed the block size when converting sha512-s390 to shash. Tested-by: Heiko Carstens Signed-off-by: Herbert Xu commit e88cd6ff2ce14ed7025d253b7f7f468d38415f77 Author: Heiko Carstens Date: Sat Mar 21 14:19:04 2009 +0800 hwrng: timeriomem - Breaks an allyesconfig build on s390: CC drivers/char/hw_random/timeriomem-rng.o drivers/char/hw_random/timeriomem-rng.c: In function 'timeriomem_rng_data_read': drivers/char/hw_random/timeriomem-rng.c:60: error: implicit declaration of function 'readl' Signed-off-by: Heiko Carstens Signed-off-by: Herbert Xu commit 3f518390ab1b65bc2e2bc01774eb2c5918c433ee Author: Arthur Jones Date: Fri Mar 20 15:56:35 2009 -0700 e1000e: fixup merge error When merging into Jeff's tree: commit 5f66f208064f083aab5e55935d0575892e033b59 Author: Arthur Jones Date: Thu Mar 19 01:13:08 2009 +0000 e1000e: allow tx of pre-formatted vlan tagged packets We lost one line, this fixes that missing piece... Signed-off-by: Arthur Jones Signed-off-by: David S. Miller commit eaeed5d31d8ded02fa0a4b608f57418cc0e65b07 Author: Steve Glendinning Date: Fri Mar 20 14:16:29 2009 +0000 sh: add support for SMSC Polaris platform Polaris is an SMSC reference platform with a SH7709S CPU and LAN9118 ethernet controller. This patch adds support for it. Updated following feedback from Nobuhiro Iwamatsu. Signed-off-by: Steve Glendinning Reviewed-by: Nobuhiro Iwamatsu Signed-off-by: Paul Mundt commit c9840cf4cf12a4ec4fe3c4db3c28f638d06e942b Merge: 2d864c4... 1dddab4... Author: Takashi Iwai Date: Fri Mar 20 16:33:30 2009 +0100 Merge branch 'topic/hda-optimize' into topic/hda commit 8b22d943c34b616eefbd6d2f8f197a53b1f29fd0 Author: Takashi Iwai Date: Fri Mar 20 16:26:15 2009 +0100 ALSA: pcm - Safer boundary checks Make the boundary checks a bit safer. These caese are rare or theoretically won't happen, but nothing bad to keep the checks safer... Signed-off-by: Takashi Iwai commit 2d864c499a77129dc6aa4f7552ddf2885e4a9c47 Author: Takashi Iwai Date: Fri Mar 20 12:52:47 2009 +0100 ALSA: hda - Detect digital-mic inputs on ALC663 / ALC272 Fix the detection of digital-mic inputs on ALC663 / ALC272 codecs in the auto-detection mode. The automatic mic switch via plugging isn't implemented yet, though. Signed-off-by: Takashi Iwai commit c468ac29e63b9927275a94379d00b367f0f97c43 Author: Wolfram Sang Date: Fri Mar 20 10:08:11 2009 +0100 ALSA: sound/ali5451: typo: s/resouces/resources/ Signed-off-by: Wolfram Sang Signed-off-by: Takashi Iwai commit 3bf509230a626d11cba0e0145f552918092f586d Author: Rafael Ignacio Zurita Date: Fri Mar 20 02:08:22 2009 +0000 sh: fix the HD64461 level-triggered interrupts handling Rework the hd64461 demuxer code to fix the HD64461 level-triggered interrupts handling, using handle_level_irq() as needed. Signed-off-by: Rafael Ignacio Zurita Signed-off-by: Paul Mundt commit 7a8fe8e320251d25274e89f610ffee936769250a Author: Magnus Damm Date: Thu Mar 19 10:14:41 2009 +0000 sh: sh-rtc wakeup support Flag that the SuperH RTC supports wakeup. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit edf22477dab5ff3be612af56ee4300ca63e11d06 Author: Magnus Damm Date: Thu Mar 19 10:10:44 2009 +0000 sh: sh-rtc invalid time rework This patch modifies invalid time handling in the SuperH RTC driver. Instead of zeroing the returned value at read-out time we just return an error code and reset invalid values during probe. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 9cd88b90a6008b0d744187fab80ade4c81c6536f Author: Magnus Damm Date: Thu Mar 19 10:05:58 2009 +0000 sh: sh-rtc carry interrupt rework This patch modifies the SuperH RTC driver to only enable carry interrupts when needed. So by default no interrupts are enabled with this patch. Without this patch a suspending system will most likely wake up by the carry interrupt regardless if the alarm interrupt has been enabled or not. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 615e73b3cd8876262f61ea28b4147c8de38a043a Author: Magnus Damm Date: Thu Mar 19 10:04:29 2009 +0000 sh: disallow kexec virtual entry Older versions of kexec-tools has a zImage loader that passes a virtual address as entry point. The elf loader otoh it passes a physical address as entry point, and pages are always passed as physical addresses as well. Only allow physical addresses from now on. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 2b1c4354de72ced917d2f3fe88117613f992234b Merge: 5e140df... 170ebf8... Author: David S. Miller Date: Fri Mar 20 02:27:41 2009 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/virtio_net.c commit 5e140dfc1fe87eae27846f193086724806b33c7d Author: Eric Dumazet Date: Fri Mar 20 01:33:32 2009 -0700 net: reorder struct Qdisc for better SMP performance dev_queue_xmit() needs to dirty fields "state", "q", "bstats" and "qstats" On x86_64 arch, they currently span three cache lines, involving more cache line ping pongs than necessary, making longer holding of queue spinlock. We can reduce this to one cache line, by grouping all read-mostly fields at the beginning of structure. (Or should I say, all highly modified fields at the end :) ) Before patch : offsetof(struct Qdisc, state)=0x38 offsetof(struct Qdisc, q)=0x48 offsetof(struct Qdisc, bstats)=0x80 offsetof(struct Qdisc, qstats)=0x90 sizeof(struct Qdisc)=0xc8 After patch : offsetof(struct Qdisc, state)=0x80 offsetof(struct Qdisc, q)=0x88 offsetof(struct Qdisc, bstats)=0xa0 offsetof(struct Qdisc, qstats)=0xac sizeof(struct Qdisc)=0xc0 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 408896d508794c98a2ac6b6e1dcd7a4888a4d32b Author: Huang Weiyi Date: Fri Mar 20 01:32:58 2009 -0700 dnet: remove duplicated #include Removed duplicated #include in drivers/net/dnet.c. Signed-off-by: Huang Weiyi Signed-off-by: David S. Miller commit 22d5a71b50df739abaee83e2fdb191f8aa6b037c Author: Jesse Brandeburg Date: Thu Mar 19 01:24:04 2009 +0000 ixgbe: Fixup the watchdog interrupt scheduling on 82599 The watchdog will schedule an interrupt to help make sure queues are cleaned in the case when an interrupt is missed, most likely due to very high load. On 82599, there are extra interrupt registers to account for the larger number of MSI-X vectors (64 total for 82599 vs. 18 total for 82598). These must be taken into account when performing this operation in the watchdog. Signed-off-by: Jesse Brandeburg Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e63d9762929d9b86ac87cfb8047e7f7b1f2ed2dd Author: PJ Waskiewicz Date: Thu Mar 19 01:23:46 2009 +0000 ixgbe: Correctly report Wake On LAN for 82599 KX4 devices ethtool isn't reporting the support level of WoL for 82599 KX4 devices. While the device does support WoL, ethtool was never updated to properly report the level of support, nor will it allow ethtool to modify the type of packets to listen for. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 03cfa2054846a9902f0c10bea4680447050f03fa Author: PJ Waskiewicz Date: Thu Mar 19 01:23:29 2009 +0000 ixgbe: Fix PCI bus reporting on driver load for 82598 after 82599 merge 82598's PCI bus reporting on driver load was broken after 82599 merged. This results in incorrect reporting, and an erroneous warning message that the 82598 is in a PCIe slot that isn't fast enough to run 10GbE. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit fe52eeb82b746de441ed27c54ace940efe86bc9a Author: Alexander Duyck Date: Thu Mar 19 01:15:21 2009 +0000 ixgb: refactor tx path to use skb_dma_map/unmap This code updates ixgb so that it can use the skb_dma_map/unmap functions to map the buffers. In addition it also updates the tx hang logic to use time_stamp instead of dma to determine if it has detected a tx hang. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 5f66f208064f083aab5e55935d0575892e033b59 Author: Arthur Jones Date: Thu Mar 19 01:13:08 2009 +0000 e1000e: allow tx of pre-formatted vlan tagged packets As with igb, when the e1000e driver is fed 802.1q packets with hardware checksum on, it chokes with an error of the form: checksum_partial proto=81! As the logic there was not smart enough to look into the vlan header to pick out the encapsulated protocol. There are times when we'd like to send these packets out without having to configure a vlan on the interface. Here we check for the vlan tag and allow the packet to go out wiht the correct hardware checksum. Thanks to Kand Ly for discovering the issue and the coming up with a solution. This patch is based upon his work. Fixups from Stephen Hemminger and Alexander Duyck Signed-off-by: Arthur Jones Signed-off-by: Jeff Kirsher CC: Stephen Hemminger CC: Alexander Duyck Signed-off-by: David S. Miller commit 1b7719c4559dc1522065d4cfd033f8bb8f969159 Author: Alexander Duyck Date: Thu Mar 19 01:12:50 2009 +0000 e1000e: fix dma error handling issues There were a few issues I noticed in e1000e. These include a double free of the skb if mapping fails, and the fact that context descriptors appear to be left in the descriptor ring after the failure. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 8c81c9c315b7e7e240906fab0e8dde1595101bd2 Author: Alexander Duyck Date: Thu Mar 19 01:12:27 2009 +0000 e1000e: add support for 82583 device id Add device ID and related support for 82583 mac. Signed-off-by: Alexander Duyck Acked-by: Radheka Godse Acked-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit cd7a3b75ba7af7d14a264fe3d414fcc74307f748 Author: Steve Glendinning Date: Fri Mar 20 01:14:53 2009 -0700 smsc9420: fix big endian rx checksum offload The cpu_to_le16 here looks suspicious to me, I don't think we need it because put_unaligned_le16 also does this. I don't currently have any big endian hardware with a PCI bus available to test on, so I haven't been able to verify this. Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit 8fd17f2e6c973efdb2e3fcb5026d204441dd01fd Author: David S. Miller Date: Fri Mar 20 00:51:22 2009 -0700 sunvnet: Convert to net_device_ops. Signed-off-by: David S. Miller commit 225ddf498cc99ead1d11ed1aaf1887e24e1007fa Author: Steve Glendinning Date: Thu Mar 19 00:24:46 2009 +0000 smsc911x: allow setting of mac address This patch replaces the generic eth_mac_addr function with one that also updates the hardware mac address registers. It also renames the existing smsc911x_set_mac_address function to smsc911x_hw_set_mac_address for clarity. Newer LAN911x and all LAN921x devices also support changing the mac address while the device is running, which is useful for some bonding modes. Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit 63a2ebb079d72f10ea7b89b85c2cd4ecc60edc61 Author: Steve Glendinning Date: Thu Mar 19 00:24:45 2009 +0000 smsc911x: replace print_mac with %pM Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit 785b6f977a89aaabc3dd3e3bfc87f36015cb8050 Author: Steve Glendinning Date: Thu Mar 19 00:24:44 2009 +0000 smsc911x: define status word positions as constants The vast majority of bit constants in this driver are defined in the header file, but TX and RX status word bits are not. This patch (which should make no functional change) defines these, to make the driver slightly more readable. Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit 2e1ab634bf013792d8803ec57c7a428a76f50028 Author: Stephen Hemminger Date: Thu Mar 19 23:49:41 2009 -0700 rtnetlink: add new value for DHCP added routes To improve manageability, it would be good to be able to disambiguate routes added by administrator from those added by DHCP client. The only necessary kernel change is to add value to rtnetlink include file so iproute2 utility can use it. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 07a1e81355245ca65ab16c7b4ae2332e52ed7acd Author: Takashi Iwai Date: Thu Mar 19 17:08:19 2009 +0100 ALSA: hda - Don't show the current connection for power widgets The power-widgets have no connection selection, so skip the check in proc output, too. Signed-off-by: Takashi Iwai commit 1f2186951e02f2a5bcda9459f63136918932385a Author: Takashi Iwai Date: Thu Mar 19 14:08:58 2009 +0100 ALSA: Fix wrong pointer to dev_err() in arm/pxa2xx-ac97-lib.c Fix the wrong device pointer passed to dev_err(). Signed-off-by: Takashi Iwai commit 632087748c3795a54d5631e640df65592774e045 Author: Lopez Cruz, Misael Date: Thu Mar 19 01:07:34 2009 -0500 ASoC: Declare Headset as Mic and Headphone widgets for SDP3430 Headset was declared previously as a Headphone widget connecting HSMIC and HSOL/HSOR pins of TWL4030 codec in SDP430 machine driver. The capture path becomes invalid as the Headphone widget is not a valid input endpoint. Instead of that, the Headset is declared as separate Microphone and Headphone widgets. Current patch modifies audio map: - Headset Mic: HSMIC with bias - Headset Stereophone: HSOL, HSOR Signed-off-by: Misael Lopez Cruz Signed-off-by: Mark Brown commit f8d5fc924b1bec95f47b0a9e8f9a6e22fa1c7b05 Author: Jarkko Nikula Date: Wed Mar 18 16:46:54 2009 +0200 ASoC: OMAP: N810: Add more jack functions Add functions "Headset" and "Mic" to the control "Jack Function" for activating and de-activating codec input pin LINE1L which is connected to the mic pin of 4-pole Nokia AV connecter. Note there is no mic bias voltage management here since bias is coming from Nokia ASIC and driver for it is not in mainline. Signed-off-by: Jarkko Nikula Signed-off-by: Mark Brown commit 13b9d2ab5921d77df5217a2104b687a1c729d521 Author: Jarkko Nikula Date: Wed Mar 18 16:46:53 2009 +0200 ASoC: OMAP: N810: Mark not connected input pins Signed-off-by: Jarkko Nikula Signed-off-by: Mark Brown commit e8523b641cddedec754ae5e44ec579dbceea5ef4 Author: Mark Brown Date: Wed Mar 18 18:28:01 2009 +0000 ASoC: Add FLL support for WM8400 Signed-off-by: Mark Brown commit 1dddab400b7ad028b21d7d5b060e4a068d6d3cd9 Author: Takashi Iwai Date: Wed Mar 18 15:15:37 2009 +0100 ALSA: hda - Don't reset stream at each prepare callback Don't reset the stream at each prepare callback but do it only once after the open. Signed-off-by: Takashi Iwai commit 97b71c94d691728b82052e9c4d6286fbc9965d7f Author: Takashi Iwai Date: Wed Mar 18 15:09:13 2009 +0100 ALSA: hda - Don't reset BDL unnecessarily So far, the prepare callback is called multiple times, BDL entries are reset and re-programmed at each time. This patch adds the check to avoid the reset of BDL entries when the same parameters are used. Signed-off-by: Takashi Iwai commit ded652f7024bc2d7b6118b561a44187af30841b0 Author: Takashi Iwai Date: Thu Mar 19 10:08:49 2009 +0100 ALSA: pcm - Fix delta calculation at boundary overlap When the hw_ptr_interrupt reaches the boundary, it must check whether the hw_base was already lapped and corret the delta value appropriately. Also, rebasing the hw_ptr needs a correction because buffer_size isn't always aligned to period_size. Signed-off-by: Takashi Iwai commit 5f513e1197f27e9a0bcfec0feaac59f976f4a37e Author: Takashi Iwai Date: Thu Mar 19 10:01:47 2009 +0100 ALSA: pcm - Reset invalid position even without debug option Always reset the invalind hw_ptr position returned by the pointer callback. The behavior should be consitent independently from the debug option. Also, add the printk_ratelimit() check to avoid flooding debug prints. Signed-off-by: Takashi Iwai commit 98204646f2b15d368701265e4194b773a6f94600 Author: Takashi Iwai Date: Thu Mar 19 09:59:21 2009 +0100 ALSA: pcm - avoid unnecessary inline Remove unnecessary explicit inlininig of internal functions. Let compiler optimize. Signed-off-by: Takashi Iwai commit cad377acf3d6af6279622048e96680e79e352183 Author: Takashi Iwai Date: Thu Mar 19 09:55:15 2009 +0100 ALSA: pcm - Fix a typo in error messages Fix a typo in error messages; forgotten after a copy&paste error. Signed-off-by: Takashi Iwai commit a2328d0249fce44381289525bd580b37d2105963 Author: Giuliano Pochini Date: Thu Mar 19 00:09:03 2009 +0100 ALSA: Echoaudio: add support for Indigo express cards This patch adds support for IndigoIOx and IndigoDJx. Signed-off-by: Giuliano Pochini Signed-off-by: Takashi Iwai commit 4826857f1bf07f9c0f1495e9b05d125552c88a85 Author: Kumar Gala Date: Wed Mar 18 23:28:22 2009 -0700 gianfar: pass the proper dev to DMA ops We need to be passing the of_platform device struct into the DMA ops as its the one that has the archdata setup to know which low-level DMA ops we should be using (not the net_device one). This isn't an issue until we expect the archdata to be setup correctly. Signed-off-by: Kumar Gala Signed-off-by: David S. Miller commit a6a47771b113be8e694aedd80f66ea94d05bd8df Author: Yevgeny Petrilin Date: Wed Mar 18 19:49:54 2009 -0700 IB/mlx4: Unregister IB device prior to CLOSE PORT command According to the ConnectX programmer's reference manual, all operations should be stopped, all QPs should be torn down and all WQEs flushed before the CLOSE_PORT command is invoked. In some cases reversing the order of operations (as implemented now) could cause a loss of completions. Signed-off-by: Yevgeny Petrilin Signed-off-by: Roland Dreier commit 27bf91d6a0d5a9c7224e8687754249bba67dd4cf Author: Yevgeny Petrilin Date: Wed Mar 18 19:45:11 2009 -0700 mlx4_core: Add link type autosensing When a port's link is down (except to driver restart) and the port is configured for auto sensing, we try to sense port link type (Ethernet or InfiniBand) in order to determine how to initialize the port. If the port type needs to be changed, all mlx4 for the device interfaces are unregistered and then registered again with the new port types. Sensing is done with intervals of 3 seconds. Signed-off-by: Yevgeny Petrilin Signed-off-by: Roland Dreier commit 4b704d59d6fb152bcd0883b84af5936a29067f12 Author: Stephen Hemminger Date: Wed Mar 18 19:11:29 2009 -0700 tipc: fix non-const printf format arguments Fix warnings from current gcc about using non-const strings as printf args in TIPC. Compile tested only (not a TIPC user). Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit beedad923ad6237f03265fdf86eb8a1b50d14ae9 Author: Rami Rosen Date: Wed Mar 18 18:50:09 2009 -0700 tcp: remove parameter from tcp_recv_urg(). This patch removes an unused parameter (addr_len) from tcp_recv_urg() method in net/ipv4/tcp.c. Signed-off-by: Rami Rosen Signed-off-by: David S. Miller commit 9bdd8d40c8c59435664af6049dabe24b7779b203 Author: Brian Haley Date: Wed Mar 18 18:22:48 2009 -0700 ipv6: Fix incorrect disable_ipv6 behavior Fix the behavior of allowing both sysctl and addrconf_dad_failure() to set the disable_ipv6 parameter without any bad side-effects. If DAD fails and accept_dad > 1, we will still set disable_ipv6=1, but then instead of allowing an RA to add an address then immediately fail DAD, we simply don't allow the address to be added in the first place. This also lets the user set this flag and disable all IPv6 addresses on the interface, or on the entire system. Signed-off-by: Brian Haley Signed-off-by: David S. Miller commit cedc1dba74f481a632c5d5aedad0068d6ad945d8 Author: Dave Jones Date: Wed Mar 18 18:17:48 2009 -0700 a2065: skb_padto cleanups Remove unnecessary check (skb_padto does the same check) Remove unnecessary duplicate variable Remove unnecessary clearing of padded part of skb. Signed-off-by: Dave Jones Signed-off-by: David S. Miller commit 24a51029fc3055f33684e650b5e3a59f77c9b05c Author: Mark Brown Date: Wed Mar 18 15:19:48 2009 +0000 ASoC: Add separate AVDD for WM8400 There is an AVDD supply as well, normally one or more of the other upplies would be tied to it. Signed-off-by: Mark Brown commit e3598f6e4218d1aad3369c97217266b2375e6aca Author: Mark Brown Date: Wed Mar 18 15:19:10 2009 +0000 ASoC: Further optimise WM8400 bias configuration sequence The active discharge does not bring sufficient benefit to justify the lengthy times involved so don't do that. Signed-off-by: Mark Brown commit 0f5b3e85a3716efebb0150ebb7c6d022e2bf17d7 Author: Patrick McHardy Date: Wed Mar 18 17:36:40 2009 +0100 netfilter: ctnetlink: fix rcu context imbalance Introduced by 7ec47496 (netfilter: ctnetlink: cleanup master conntrack assignation): net/netfilter/nf_conntrack_netlink.c:1275:2: warning: context imbalance in 'ctnetlink_create_conntrack' - different lock contexts for basic block Signed-off-by: Patrick McHardy commit 711d60a9e7f88e394ccca10f5fc83f95f0cea5b1 Author: Florian Westphal Date: Wed Mar 18 17:30:50 2009 +0100 netfilter: remove nf_ct_l4proto_find_get/nf_ct_l4proto_put users have been moved to __nf_ct_l4proto_find. Signed-off-by: Florian Westphal Signed-off-by: Patrick McHardy commit cd91566e4bdbcb8841385e4b2eacc8d0c29c9208 Author: Florian Westphal Date: Wed Mar 18 17:28:37 2009 +0100 netfilter: ctnetlink: remove remaining module refcounting Convert the remaining refcount users. As pointed out by Patrick McHardy, the protocols can be accessed safely using RCU. Signed-off-by: Florian Westphal Signed-off-by: Patrick McHardy commit 28514fe5bbbdbc0f7c9700569378d55cafd061ea Author: Daniel Mack Date: Wed Mar 18 11:03:55 2009 +0100 ALSA: snd-usb-caiaq: bump version number Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 9311c9b4f12218b588e51806c44d290cfec678a3 Author: Daniel Mack Date: Wed Mar 18 11:03:54 2009 +0100 ALSA: snd-usb-caiaq: drop bogus iso packets Drop inbound packets that are smaller than expected. This has been observed at the very beginning of the streaming transaction. And when the hardware is in panic mode (which can only very rarely happen in case of massive EMI chaos), mute the input channels. Signed-off-by: Daniel Mack Tested-by: Mark Hills Signed-off-by: Takashi Iwai commit 1313e7041480f523a09dedc7ef2185d8ee94c163 Author: Daniel Mack Date: Wed Mar 18 11:03:53 2009 +0100 ALSA: snd-usb-caiaq: only warn once on streaming errors Limit the number of printed warnings to one in case of streaming errors. printk() happens to be expensive, especially in code called as often as here. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 7e6b6f2b949a52382f59a93ecbe86e32e4fcec7c Author: Paul Mundt Date: Wed Mar 18 19:07:16 2009 +0900 sh: kexec jump: fix for ftrace. Save and restore ftrace state when returning from kexec jump in machine_kexec(). Follows the x86 change. Signed-off-by: Paul Mundt commit a6bab7b5c18501e4dd3201ae8ac1dc6da5f07acc Author: Paul Mundt Date: Wed Mar 18 19:06:15 2009 +0900 sh: kexec: Drop SR.BL bit toggling. For the time being, this creates far more problems than it solves, evident by the second local_irq_disable(). Kill all of this off and rely on IRQ disabling to protect against the VBR reload. Signed-off-by: Paul Mundt commit b7cf6ddc13186f9272438a97aa75972d496d0b0a Author: Magnus Damm Date: Wed Mar 18 08:51:29 2009 +0000 sh: add kexec jump support Add kexec jump support to the SuperH architecture. Similar to the x86 implementation, with the following exceptions: - Instead of separating the assembly code flow into two parts for regular kexec and kexec jump we use a single code path. In the assembly snippet regular kexec is just kexec jump that never comes back. - Instead of using a swap page when moving data between pages the page copy assembly routine has been modified to exchange the data between the pages using registers. - We walk the page list twice in machine_kexec() to do and undo physical to virtual address conversion. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit e4e063d0c288bd65c56dd855337780a541ed928d Author: Magnus Damm Date: Wed Mar 18 08:49:45 2009 +0000 sh: rework kexec segment code Rework the kexec code to avoid using P2SEG. Instead we walk the page list in machine_kexec() and convert the addresses from physical to virtual using C. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 7be5c55af0cc58e54e42e1702d837527e15b8414 Author: Magnus Damm Date: Wed Mar 18 08:47:31 2009 +0000 sh: simplify kexec vbr code Setup the vbr register in machine_kexec(). This instead of passing values to the assembly snippet. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit af66df5ecf9c9e2d2ff86e8203510c1c4519d64c Author: Luis Henriques Date: Wed Mar 18 00:04:25 2009 +0000 sched: jiffies not printed per CPU The jiffies value was being printed for each CPU, which does not seem to make sense. Moved jiffies to system section. Signed-off-by: Luis Henriques Acked-by: Peter Zijlstra LKML-Reference: <20090318000425.GA2228@hades.domain.com> Signed-off-by: Ingo Molnar commit 37ba317c9ed19eb126e40bbf563f2711e191a636 Merge: 708dc51... ee568b2... Author: Ingo Molnar Date: Wed Mar 18 09:57:02 2009 +0100 Merge branches 'sched/cleanups' and 'linus' into sched/core commit 4a1007934591fd0dcdf13454a6faebfcbe1a4ee6 Merge: ee50471... c673ba1... Author: Takashi Iwai Date: Wed Mar 18 07:50:56 2009 +0100 Merge branch 'fix/hda' into topic/hda commit ee5047102cf632351c418060bfbe3b6eb5c42e7b Author: Jaroslav Kysela Date: Tue Mar 17 14:30:31 2009 +0100 ALSA: snd-hda-intel - add checks for invalid values to *query_supported_pcm() If ratesp or formatsp values are zero, wrong values are passed to ALSA's the PCM midlevel code. The bug is showed more later than expected. Also, clean a bit the code. Signed-off-by: Jaroslav Kysela Signed-off-by: Takashi Iwai commit b363b3304bcf68c4541683b2eff70b29f0446a5b Author: Steve French Date: Wed Mar 18 05:57:22 2009 +0000 [CIFS] Fix memory overwrite when saving nativeFileSystem field during mount CIFS can allocate a few bytes to little for the nativeFileSystem field during tree connect response processing during mount. This can result in a "Redzone overwritten" message to be logged. Signed-off-by: Sridhar Vinay Acked-by: Shirish Pargaonkar CC: Stable Signed-off-by: Steve French commit c6c00919ab16717f228aac20ee72dc83c4430537 Author: Steve French Date: Wed Mar 18 05:50:07 2009 +0000 [CIFS] Rename compose_mount_options to cifs_compose_mount_options. Make it available to others for reuse. Signed-off-by: Igor Mammedov Signed-off-by: Steve French commit af4330631cd48987755f1a8d324dc318f60cf16b Merge: 2d6a5e9... 808ff69... Author: David S. Miller Date: Tue Mar 17 15:04:31 2009 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 2d6a5e9500103680464a723a4564961675652680 Merge: bd257ed... f10023a... Author: David S. Miller Date: Tue Mar 17 15:01:30 2009 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/igb/igb_main.c drivers/net/qlge/qlge_main.c drivers/net/wireless/ath9k/ath9k.h drivers/net/wireless/ath9k/core.h drivers/net/wireless/ath9k/hw.c commit bd257ed9f1d129b4e881f513a406b435c8852565 Author: Dhananjay Phadke Date: Tue Mar 17 13:14:22 2009 -0700 netxen: fix firmware download warnings Fix following warnings, by using integer firmware types. drivers/net/netxen/netxen_nic_hw.c: In function 'netxen_load_firmware': drivers/net/netxen/netxen_nic_hw.c:1146: warning: comparison with string literal results in unspecified behavior drivers/net/netxen/netxen_nic_hw.c:1146: warning: comparison with string literal results in unspecified behavior drivers/net/netxen/netxen_nic_hw.c:1146: warning: comparison with string literal results in unspecified behavior drivers/net/netxen/netxen_nic_hw.c:1159: warning: comparison with string literal results in unspecified behavior drivers/net/netxen/netxen_nic_hw.c:1159: warning: comparison with string literal results in unspecified behavior drivers/net/netxen/netxen_nic_hw.c:1159: warning: comparison with string literal results in unspecified behavior Reported-by: Stephen Rothwell Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit 2ffb4558194037133121e260022baa0d21590473 Author: Herbert Xu Date: Tue Mar 17 13:10:52 2009 -0700 gro: Fix vlan/netpoll check again Jarek Poplawski pointed out that my previous fix is broken for VLAN+netpoll as if netpoll is enabled we'd end up in the normal receive path instead of the VLAN receive path. This patch fixes it by calling the VLAN receive hook. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit da88b48b84e1a504b6a19aff9d5b8236a59e228a Merge: d2314e0... 85fab78... Author: Mark Brown Date: Tue Mar 17 19:07:26 2009 +0000 Merge branch 'pxa-ssp' into for-2.6.30 commit 323a59613e5be6094c93261486de48a08d3a53f2 Author: Dmitry Artamonow Date: Fri Mar 13 01:03:49 2009 +0100 ALSA: drop outdated and broken sa11xx-uda1341 driver It depends on L3 support from 2.4 kernel (CONFIG_L3) that never got merged into mainline. Since there's no way to use it on any of supported machines (iPaq h3100 or h3600), better drop it for now. It can be reimplemented later using ASoC infrastructure (there's already a driver for uda1341 codec in mainline, so only CPU and machine parts need to be written). Signed-off-by: Dmitry Artamonow Cc: Russell King Signed-off-by: Takashi Iwai commit dbe36c9dd571e035078207862766963c4fc80262 Merge: 2ebfb8e... b1a0aac... Author: Takashi Iwai Date: Tue Mar 17 17:57:37 2009 +0100 Merge branch 'topic/snd_card_new-err' into topic/drop-l3 commit 1329f4550f8ee141437f3b5f4db0f2add7639e29 Author: David Woodhouse Date: Tue Mar 17 15:10:51 2009 +0000 solos: Disable DMA until we have an FPGA update with it actually implemented. Signed-off-by: David Woodhouse commit 0fc36aa52a602bfe2aeb7ded7e90b0fa70df24c2 Author: Nathan Williams Date: Sat Feb 7 10:19:13 2009 +1100 solos: Automatically determine number of ports Signed-off-by: Nathan Williams Signed-off-by: David Woodhouse commit 97d759d3e86f9c7ced094352838e7e4d1cf8cddf Author: David Woodhouse Date: Tue Mar 17 14:59:34 2009 +0000 solos: Reset device on unload, free pending skbs Signed-off-by: David Woodhouse commit d2314e0e27566f8830ebed3587cc049e07e6a4ee Author: Atsushi Nemoto Date: Mon Mar 16 23:26:20 2009 +0900 ASoC: Only deregister AC97 dev if it's name was not "AC97" The commit 14fa43f53ff3a9c3d8b9662574b7369812a31a97 ("ASoC: Only register AC97 bus if it's not done already") added a condition for calling of soc_ac97_dev_register() but not added for calling of soc_ac97_dev_unregister(). This patch adds same condition for soc_ac97_dev_unregister(). Without this fix, kernel crashes when unloading an asoc driver. Signed-off-by: Atsushi Nemoto Signed-off-by: Mark Brown commit c20351846efcb755ba849d9fb701fbd9a1ffb7c2 Author: Paul Mundt Date: Tue Mar 17 21:19:49 2009 +0900 sh: Flush only the needed range when unmapping a VMA. This follows the ARM change from Aaro Koskinen: When unmapping N pages (e.g. shared memory) the amount of TLB flushes done can be (N*PAGE_SIZE/ZAP_BLOCK_SIZE)*N although it should be N at maximum. With PREEMPT kernel ZAP_BLOCK_SIZE is 8 pages, so there is a noticeable performance penalty when unmapping a large VMA and the system is spending its time in flush_tlb_range(). The problem is that tlb_end_vma() is always flushing the full VMA range. The subrange that needs to be flushed can be calculated by tlb_remove_tlb_entry(). This approach was suggested by Hugh Dickins, and is also used by other arches. The speed increase is roughly 3x for 8M mappings and for larger mappings even more. Bits and peices are taken from the ARM patch as well as the existing arch/um implementation that is quite similar. The end result is a significant reduction in both partial and full TLB flushes initiated through flush_tlb_range(). At the same time, the nommu implementation was broken, had a superfluous cache flush, and subsequently would have triggered a BUG_ON() if a code-path had triggered it. Tidy this up for correctness and provide a nopped-out implementation there. More background on the initial discussion can be found at: http://marc.info/?t=123609820900002&r=1&w=2 http://marc.info/?t=123660375800003&r=1&w=2 Signed-off-by: Paul Mundt commit 708dc5125309cd33c5daaad3026cc4ae6ef39c8b Author: Luis Henriques Date: Mon Mar 16 19:59:02 2009 +0000 sched: small optimisation of can_migrate_task() There were 3 invocations of task_hot() in can_migrate_task(). Replace these 3 invocations by only one invocation, cached in a local variable. Signed-off-by: Luis Henriques LKML-Reference: <20090316195902.GA6197@hades.domain.com> Signed-off-by: Ingo Molnar commit 80dd99b368cf6501be88ab517bbbb5bf352b75b8 Author: Luis Henriques Date: Mon Mar 16 19:58:09 2009 +0000 sched: fix typos in documentation Fixed typos in function documentation. Signed-off-by: Luis Henriques LKML-Reference: <20090316195809.GA6073@hades.domain.com> Signed-off-by: Ingo Molnar commit 3a3b311ca375a37b29bb78b030f96bf97dee97f5 Author: Paul Mundt Date: Tue Mar 17 17:59:31 2009 +0900 sh: Update debugfs ASID dumping for 16-bit ASID support. Signed-off-by: Paul Mundt commit c54a43e90b80993b2e0772d678563cb2bc6a1b3b Author: Paul Mundt Date: Tue Mar 17 17:58:33 2009 +0900 sh: tlb-pteaex: Kill off legacy PTEA updates. While harmless, PTEA has different semantics on these parts, and is only used in extended TLB mode. Kill off the legacy support. Signed-off-by: Paul Mundt commit 8263a67e169fdf0d06d172acbf6c03ae172a69d4 Author: Paul Mundt Date: Tue Mar 17 17:49:49 2009 +0900 sh: Support for extended ASIDs on PTEAEX-capable SH-X3 cores. This adds support for extended ASIDs (up to 16-bits) on newer SH-X3 cores that implement the PTAEX register and respective functionality. Presently only the 65nm SH7786 (90nm only supports legacy 8-bit ASIDs). The main change is in how the PTE is written out when loading the entry in to the TLB, as well as in how the TLB entry is selectively flushed. While SH-X2 extended mode splits out the memory-mapped U and I-TLB data arrays for extra bits, extended ASID mode splits out the address arrays. While we don't use the memory-mapped data array access, the address array accesses are necessary for selective TLB flushes, so these are implemented newly and replace the generic SH-4 implementation. With this, TLB flushes in switch_mm() are almost non-existent on newer parts. Signed-off-by: Paul Mundt commit 37ba1b62836d2440980cf553c49556393b05c6cd Merge: 1713c0d... dde332b... Author: Takashi Iwai Date: Tue Mar 17 09:28:13 2009 +0100 Merge branch 'fix/opl3sa2-suspend' into topic/isa-misc commit da78800632197ac12adcdefbf09991d82adb8201 Author: Nobuhiro Iwamatsu Date: Tue Mar 17 05:53:26 2009 +0000 sh: sh7763rdp: Change IRQ number for sh_eth of sh7763rdp IRQ for sh_eth of sh7763rdp became multi handling. Therefore, the IRQ number of sh_eth is changed, too. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Paul Mundt commit 32910e2c52cae552f2651c5360bae8033adb8aac Author: Nobuhiro Iwamatsu Date: Tue Mar 17 05:54:37 2009 +0000 sh: espt-giga board support This adds support for the ESPT-Giga (Ethernet Serial Parallel Translator) SH7763-based reference board. Board support is relatively sparse, presently supporting serial, gigabit ethernet, USB host, and MTD. More information (in Japanese) available at: http://www.cente.jp/product/cente_hard/ESPT-Giga.html Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Paul Mundt commit 40f49e7ed77f1b753a7243c0137e4767a50ea8bd Author: Paul Mundt Date: Tue Mar 17 12:47:56 2009 +0900 sh: dma: Make G2 DMA configurable. Follow the PVR2 DMAC change for G2 DMA. Signed-off-by: Paul Mundt commit da62e71d13ad0b76011491e36cb58999c464516a Author: Paul Mundt Date: Tue Mar 17 09:30:36 2009 +0900 sh: dma: Make PVR2 DMA configurable. With arch/sh/drivers/dma/ always being built, the Dreamcast DMA engines are being unconditionally built in, regardless of whether the DMA API is enabled or not. This is a regression from previous behaviour, but there is not much advantage in building them all in unconditionally regardless. Add a new config option to make it optional, and update the only user of it to reflect that. Signed-off-by: Paul Mundt commit 808ff697b357cee54e214efd27921a9ec6461a94 Author: Reinette Chatre Date: Wed Mar 11 11:18:01 2009 -0700 iwlwifi: correct log level when error occurs user needs to see this message even if debugging disabled Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 18d426c4a8991d1d6c0dc33a62b610b8a6ffc1d2 Author: Reinette Chatre Date: Wed Mar 11 11:18:00 2009 -0700 iwlwifi: print contents of control register when error occurs hopefully the register contents will guide us to why this failure occured Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 48676eb3c3de9013de7d9a63fb8ffb70cd540d95 Author: Mohamed Abbas Date: Wed Mar 11 11:17:59 2009 -0700 iwlagn: fix warning when set WEP key iwl_clear_station_table will be called every time rxon called. In this function ucode_key_table is set to 0 even though a static WEP security is set. This will cause in many warning and might be an issue if dynamic WEP is set. This patch make sure we keep track of all existing static WEP when this function is called. Signed-off-by: Mohamed Abbas Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit fd9377ee6c351b3fd27bcc56fd5e24622df180bb Author: Reinette Chatre Date: Wed Mar 11 11:17:58 2009 -0700 iwl3945: unmap previously mapped memory During preparation of TX we create DMA mapping to TX command as part of preparing the TFD. This mapping needs to be cleared at the time TFD is freed. Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 732587ab438d7528e38df7ceb2c46db9774dcf08 Author: Abhijeet Kolekar Date: Wed Mar 11 11:17:57 2009 -0700 iwl3945: use iwl_tx_cmd_complete iwl3945 uses iwl_tx_cmd_complete to reclaim the unused buffers of the queue. iwl_tx_cmd_complete in turn call the iwl_hcmd_queue_reclaim which will unmap the dma mapping to tx_cmd and frees the memory. Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit dd5b687edacab6cfacf7b9983e86a60c0612e994 Author: Abhijeet Kolekar Date: Wed Mar 11 11:17:56 2009 -0700 iwl3945 : fix rate scaling Patch fixes the bug 1900 at http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=1900 Issues: Throughput and success ratio calculations were not done properly. Number of retries were exceeding 16. Fix: Patch fixes above issues by doing window calculations inline with iwlwifi Patch adds sanity check to limit number of retries to 16. Signed-off-by: Abhijeet Kolekar Acked-by: Mohamed Abbas Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 5c8df2d56a160a31386ee7807adfc1c74e826535 Author: Abhijeet Kolekar Date: Wed Mar 11 11:17:55 2009 -0700 iwl3945: use iwl_led structure 3945 can now use iwl_led's structure from iwlwifi. Patch also removes CONFIG_IWL3945_LEDS flag from Kconfig as 3945's led support will now be enabled if user selects CONFIG_IWLWIFI_LEDS. Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit fa11d525ef9e4870a080868a7588d27ca8e87c5e Author: Abhijeet Kolekar Date: Wed Mar 11 11:17:54 2009 -0700 iwl3945: fix sparse error error is: iwl3945-base.c:545:5: warning: symbol 'iwl3945_set_dynamic_key' was not declared. Should it be static? Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 3c4955f8d9b706231d226d7a73877cb7d786277f Author: Wey-Yi Guy Date: Tue Mar 10 14:35:12 2009 -0700 iwlwifi: verify the antenna selection when receive fixed rate debugfs When iwlwifi driver receive fixed rate debugfs command, validate the antenna selection, if the selection is invalid, report the valid antenna choice and do not set the rate scale table to fixed rate. Otherwise, set the entire rate scale table to the fixed rate request by the user. this validation can prevent sysassert happen in uCode Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit df36c044f51ba6889c2d8b0efd285303bf2a0fbe Author: Wey-Yi Guy Date: Tue Mar 10 14:35:11 2009 -0700 iwlwifi: check IEEE80211_TX_STAT_AMPDU for agg pkt when perform rate scaling, in tx status function, checking for IEEE80211_TX_STAT_AMPDU flag instead of IEEE_TX_CTL_AMPDU flag to perform AMPDU rate scaling operation. IEEE80211_TX_CTL_AMPDU was set by mac80211 for aggregation pkt. But when iwlwifi receive the tx status reply, it reset the flag to following info->flags = IEEE80211_TX_STAT_ACK; info->flags |= IEEE80211_TX_STAT_AMPDU; it causes the rate-scaling to not work for aggregation pkt if we checking for IEEE80211_TX_CTL_AMPDU flag. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 8fe723117a8ef543b6e68ba24e50e1c15250f6c5 Author: Wey-Yi Guy Date: Tue Mar 10 14:35:10 2009 -0700 iwlwifi: HT performance improvement changes During rate scaling, checking for 0 retry count before decrement the count by 1, this can avoid the retry count to become 255 (0xff), which will cause the rate to drop faster than what we expect during good condition (receive 0 retry packet). also change the algorithm to make the rate not drop faster than what we like. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 86b4766b059e071c5e8d680be48cf730355dca5a Author: Wey-Yi Guy Date: Tue Mar 10 14:35:09 2009 -0700 iwlwifi: remove un-necessary rs_tl_turn_on_agg() after agg enabled After the MLME handshaking complete and tx aggregation started for the tid. Do not send unnecessary turn on aggregation request to mac80211. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit adb7b5e62ba84b57692ebfa12f4b80d6cf0801a9 Author: Wey-Yi Guy Date: Tue Mar 10 14:35:08 2009 -0700 iwlwifi: add rf information in rate_scale debugfs command Adding more Radio information when displaying rate_scale_table. This can help to understand how many antenna and the current RF condition such as SISO, MIMO2, MIMO3. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit d8ae4f52d8244cc4a0f0983e65dfc31739739de9 Author: Wey-Yi Guy Date: Tue Mar 10 14:35:07 2009 -0700 iwlwifi: add valid tx antenna information in rate_scale_table debugfs when display rate_scale_table debugfs information, also display valid tx antenna information, this will help user to select correct antenna when issue fixed rate debugfs command Signed-off-by: Wey-Yi Guy Acked-by: Ben Cahill Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 141fa61f10c419cb9b47a042eed79df621db75c6 Author: John Daiker Date: Tue Mar 10 06:59:54 2009 -0700 ray_cs: checkpatch.pl and Lindent cleanups Before: 1099 errors, 93 warnings, 2854 lines checked After: 19 errors, 47 warnings, 2976 lines checked The big bulk of this is code indent and over 80 character lines (Lindent did this part) Other changes are foo * bar spacing, and trailing whitespace. v2: Cleans up ill-indented comments. Subsequently, this reduces the number of warnings, too. Thanks to Joe Perches for pointing this out! v3: Ran the whole file through Lindent first... which does most of the work for me. :) Again, thanks to Joe Perches for this. This is my final answer! Signed-off-by: John Daiker Signed-off-by: John W. Linville commit a66098daacee2f354dab311b58011e7076aa248c Author: Lennert Buytenhek Date: Tue Mar 10 10:13:33 2009 +0100 mwl8k: Marvell TOPDOG wireless driver Add a driver for Marvell 88w8xxx TOPDOG PCI/PCIe wireless parts. This initial version supports the 88w8687 802.11b/g PCIe part on channels 1-11, and only STA mode is currently implemented. Signed-off-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 217ba9da8ea6bb270a1f463367083cc5d99f2493 Author: Jouni Malinen Date: Tue Mar 10 10:55:50 2009 +0200 ath9k: Fix FIF_PROMISC_IN_BSS processing in station mode We must not disable ACK sending in this case since it would break normal station operations. In addition, clarify the comment about AP mode to make more sense. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit eeee1320b768a18822691126becc802c706aab5a Author: Sujith Date: Tue Mar 10 10:39:53 2009 +0530 ath9k: Add spectrum management to HW capabilities Signed-off-by: Sujith Signed-off-by: John W. Linville commit 15cc0f1ac670d9ff59cbcddb668900e8824b372a Author: Luis R. Rodriguez Date: Mon Mar 9 22:09:42 2009 -0400 ath9k: make few eeprom and calib items static This fixes the sparse complaints: drivers/net/wireless/ath9k/eeprom.c:1407:5: warning: symbol 'ath9k_hw_4k_get_spur_channel' was not declared. Should it be static? drivers/net/wireless/ath9k/eeprom.c:1436:19: warning: symbol 'eep_4k_ops' was not declared. Should it be static? drivers/net/wireless/ath9k/eeprom.c:2808:5: warning: symbol 'ath9k_hw_def_get_spur_channel' was not declared. Should it be static? drivers/net/wireless/ath9k/eeprom.c:2837:19: warning: symbol 'eep_def_ops' was not declared. Should it be static? CC [M] drivers/net/wireless/ath9k/eeprom.o CHECK drivers/net/wireless/ath9k/mac.c CC [M] drivers/net/wireless/ath9k/mac.o CHECK drivers/net/wireless/ath9k/calib.c drivers/net/wireless/ath9k/calib.c:883:6: warning: symbol 'ar9285_clc' was not declared. Should it be static? Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit c117fa0bf5f5b3d362b590ed6e80499defe14505 Author: Luis R. Rodriguez Date: Mon Mar 9 22:09:41 2009 -0400 ath9k: downgrade xmit queue full message to xmit debug This is not a fatal message, hitting it simply means we're going to tell the upper layers to slow their horses down but as we make more descriptors available we let the show continue by waking up the queues in ath_wake_mac80211_queue(). We downgrade this as otherwise we fill up your kernel log with messages which can be common under heavy traffic. Cc: stable@kernel.org Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 4a5af9c2923b6d8ce31a7fe84d7dc5431cd844a0 Author: Luis R. Rodriguez Date: Mon Mar 9 22:08:27 2009 -0400 mac80211_hwsim: add regulatory testing options This adds a module parameter for mac80211_hwsim regulatory testing. This module parameter is designed specifically to help test the different possible types of driver specific regulatory requests and also helps to test world roaming, all without any hardware. If you want to just simply test different alpha2s just use the userspace regulatory request as this won't buy you anything new. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 73d54c9e74c4d8ee8a41bc516f481f0f754eca32 Author: Luis R. Rodriguez Date: Mon Mar 9 22:07:42 2009 -0400 cfg80211: add regulatory netlink multicast group This allows us to send to userspace "regulatory" events. For now we just send an event when we change regulatory domains. We also notify userspace when devices are using their own custom world roaming regulatory domains. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 7db90f4a25bd4184f3d36dfa4f512f53b0448da7 Author: Luis R. Rodriguez Date: Mon Mar 9 22:07:41 2009 -0400 cfg80211: move enum reg_set_by to nl80211.h We do this so we can later inform userspace who set the regulatory domain and provide details of the request. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 0fee54cab7d5ebc58fad8c6a0703c4ea016405e3 Author: Luis R. Rodriguez Date: Mon Mar 9 22:07:40 2009 -0400 cfg80211: remove REGDOM_SET_BY_INIT This is not used as we can always just assume the first regulatory domain set will _always_ be a static regulatory domain. REGDOM_SET_BY_CORE will be the first request from cfg80211 for a regdomain and that then populates the first regulatory request. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 1a28c78b46caec7628985728e7f0c4aef68e33e7 Author: Herton Ronaldo Krzesinski Date: Tue Mar 10 10:11:09 2009 -0300 mac80211: deauth before flushing STA information Even after commit "mac80211: deauth when interface is marked down" (e327b847 on Linus tree), userspace still isn't notified when interface goes down. There isn't a problem with this commit, but because of other code changes it doesn't work on kernels >= 2.6.28 (works if same/similar change applied on 2.6.27 for example). The issue is as follows: after commit "mac80211: restructure disassoc/deauth flows" in 2.6.28, the call to ieee80211_sta_deauthenticate added by commit e327b847 will not work: because we do sta_info_flush(local, sdata) inside ieee80211_stop (iface.c), all stations in interface are cleared, so when calling ieee80211_sta_deauthenticate->ieee80211_set_disassoc (mlme.c), inside ieee80211_set_disassoc we have this in the beginning: sta = sta_info_get(local, ifsta->bssid); if (!sta) { The !sta check triggers, thus the function returns early and ieee80211_sta_send_apinfo(sdata, ifsta) later isn't called, so wpa_supplicant/userspace isn't notified with SIOCGIWAP. This commit moves deauthentication to before flushing STA info (sta_info_flush), thus the above can't happen and userspace is really notified when interface goes down. Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: John W. Linville commit af88b9078d4aa31d667d2d82601ede9cae3bac37 Author: Helmut Schaa Date: Mon Mar 9 15:47:08 2009 +0100 mac80211: handle failed scan requests in STA mode If cfg80211 requests a scan it awaits either a return code != 0 from the scan function or the cfg80211_scan_done to be called. In case of a STA mac80211's scan function ever returns 0 and queues the scan request. If ieee80211_sta_work is executed and ieee80211_start_scan fails for some reason cfg80211_scan_done will never be called but cfg80211 still thinks the scan was triggered successfully and will refuse any future scan requests due to drv->scan_req not being cleaned up. If a scan is triggered from within the MLME a similar problem appears. If ieee80211_start_scan returns an error, local->scan_req will not be reset and mac80211 will refuse any future scan requests. Hence, in both cases call ieee80211_scan_failed (which notifies cfg80211 and resets local->scan_req) if ieee80211_start_scan returns an error. Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 8830cb678b13004ab54f606345769f1e74e378c6 Author: John Daiker Date: Sun Mar 8 22:18:35 2009 -0700 atmel: checkpatch.pl cleanups Before: 881 errors, 265 warnings, 4507 lines checked After: 114 errors, 273 warnings, 4548 lines checked This was mostly "space required after that ',' (ctx:VxV)". Also a fair number of whitespace, code indent, and C99 comment cleanups. New warnings introduced are all "line over 80 character" md5sums are identical, as I skipped any fixes which may have altered the resulting binary. Signed-off-by: John Daiker Signed-off-by: John W. Linville commit 62b4fb66c5611c4e2b9279810c2d037fb5b5fa68 Author: Sujith Date: Mon Mar 9 09:32:01 2009 +0530 ath9k: Fix bug in reading debugfs file 'rcstat' The rate table would not have been chosen before the interface has been brought up. Reading 'rcstat' in this case would result in an oops, fix this. Signed-off-by: Sujith Signed-off-by: John W. Linville commit c37452b0687e5c8942dd4866f7c614105e6050c3 Author: Sujith Date: Mon Mar 9 09:31:57 2009 +0530 ath9k: Fix bug in TX aggregation mac80211 expects the driver to fill in the starting sequence number of an ADDBA request to initiate TX aggregation. IEEE80211_TX_CTL_AMPDU would be set for frames only after a successful ADDBA exchange, but we have to increment the internal sequence counter for the normal(non-AMPDU) data frames proerly. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 9c81e8be236b7f1c94f9d055a97a83f84c81890f Author: Sujith Date: Mon Mar 9 09:31:49 2009 +0530 ath9k: Initialize ANI properly ANI was not being initialized correctly for all HW variants. This patch fixes it. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 22e5b08585f7282060c464a36908b19cb4809fde Author: Bob Copeland Date: Sun Mar 8 00:10:22 2009 -0500 ath5k: update LED table with reported devices This patch adds support for Acer Ferrari 5000, and also specifies the subsystem device ids for previously reported e-machines e510 and Acer Aspire One A150. Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit cdb02dc6146950155e79a4e3225e1b58cf2b0c54 Author: Bob Copeland Date: Sun Mar 8 00:10:21 2009 -0500 ath5k: use a table for LED parameters Put the device id-to-gpio mapping in a table to make it easier to add new devices. The list of supported devices is unchanged. Signed-off-by: Bob Copeland Acked-by: Jiri Slaby Signed-off-by: John W. Linville commit 0ed4548f81b69363a6257dbc23086fc9fe4a23cb Author: Bob Copeland Date: Sun Mar 8 00:10:20 2009 -0500 ath5k: extract LED code into a separate file Move LED code out of base.c for clarity. Changes-licensed-under: 3-Clause-BSD Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit 8d6c39efed5987d3c1ade96e93753125a099f512 Author: Jiri Slaby Date: Sat Mar 7 10:26:42 2009 +0100 ath5k: don't change mac in eeprom_read_mac on error Do not touch mac parameter passed to ath5k_eeprom_read_mac unless we are sure we have correct address. I.e. when returning error, do not change it. While at it, use '= {}' compiler trick for memsetting mac_d. Signed-off-by: Jiri Slaby Acked-by: Nick Kossifidis Cc: Luis R. Rodriguez Acked-by: Bob Copeland Signed-off-by: John W. Linville commit 2c91108c55477334f6854a587ec6e9111d8f1407 Author: Jiri Slaby Date: Sat Mar 7 10:26:41 2009 +0100 ath5k: constify stuff Make some structures const to place them in .rodata, since we won't change them. Most important parts of objdump -h: - 0 .text 00011170 + 0 .text 00011140 - 5 .rodata 0000828e + 5 .rodata 0000895e - 13 .data 00000560 + 13 .data 00000110 - 14 .devinit.data 00000260 Signed-off-by: Jiri Slaby Acked-by: Nick Kossifidis Cc: Luis R. Rodriguez Cc: Bob Copeland Signed-off-by: John W. Linville commit 77dcb6a9526b1e0d159a9300e512c7271bff3163 Author: Jay Sternberg Date: Fri Mar 6 13:52:55 2009 -0800 iwlwifi: correct device name for 1000 series device name was changed from 100 to 1000 Signed-off-by: Jay Sternberg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 8337031ef393c8c4f9a25049fd4edd32c9911edc Author: Abhijeet Kolekar Date: Fri Mar 6 13:52:54 2009 -0800 iwl3945: add test for new association Add check for new association to ease reading. Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 346de732cbd11bdc364ae80def2380a5002d7e6b Author: Christian Lamparter Date: Thu Mar 5 21:28:57 2009 +0100 p54: completely ignore rx'd frames with bad FCS Passing frames with a bad FCS to the user is an optional feature. However it doesn't work reliable and strangely not in the native monitor mode?! Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 05c9a4cfe41f44abd5e73964fc734f01e2981442 Author: John Daiker Date: Fri Mar 6 07:09:41 2009 -0800 airo_cs: checkpatch.pl cleanups Hopefully nothing controversial here, since the driver hasn't been touched in a while! Before: 36 errors, 6 warnings, 482 lines checked After: 0 errors, 3 warnings, 485 lines checked This was nearly all trailing whitespace, * and parenthesis spacing, and code indent changes. md5sum of object file before and after are identical. Signed-off-by: John Daiker Signed-off-by: John W. Linville commit be1b08af61379be23d9975eaab29054e9166b13c Author: Vasanthakumar Thiagarajan Date: Fri Mar 6 20:38:36 2009 +0530 ath9k: Use suitable macros with 4k eeprom data This patch improves range and connection stability in AR9285. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit cc88aff0732132e496d1c93a468a4577e93390ea Author: Helmut Schaa Date: Fri Mar 6 15:32:31 2009 +0100 ipw2x00: remove obsolete enums Remove obsolete enums from ipw2x00/ieee80211.h, they are not used anymore. Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit d74cc9a7a317cc173fb522252fdff9e4cdd282a0 Author: Helmut Schaa Date: Fri Mar 6 15:32:26 2009 +0100 ipw2x00: Use IE definitions from linux/ieee80211.h Use IE definitions from linux/ieee80211.h and drop the appropriate enum from ipw2x00/ieee80211.h Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 30e1863ccb2eb8052eb134abe51d6884cac50e29 Author: Helmut Schaa Date: Fri Mar 6 15:32:20 2009 +0100 ipw2x00: remove duplicated defines Remove several duplicated defines from ipw2x00/ieee80211.h which are also available in linux/ieee80211.h. Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 3756162b06001d122ce31c716f9784636c592c9c Author: Helmut Schaa Date: Fri Mar 6 12:02:25 2009 +0100 libipw: fix debug output Replace all remaining occurrences of CONFIG_IEEE80211_DEBUG with CONFIG_LIBIPW_DEBUG in libipw to allow debug output again. Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 5077fd358b652b8ec33ae7158f99e08d29ad65c0 Author: Gabor Juhos Date: Fri Mar 6 11:17:55 2009 +0100 ath9k: always compile ath_radio_{en,dis}able ath_radio_{en,dis}able is only compiled if RFKILL is enabled, but it is required by the 'ath9k_wiphy_select' function. Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 521031154365062ce334e05384139777db23d526 Author: Gabor Juhos Date: Fri Mar 6 09:57:39 2009 +0100 ath9k: fix compile error in debug.c drivers/net/wireless/ath9k/debug.c: In function 'read_file_wiphy': drivers/net/wireless/ath9k/debug.c:377: error: implicit declaration of function 'put_unaligned_le32' drivers/net/wireless/ath9k/debug.c:378: error: implicit declaration of function 'put_unaligned_le16' Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 9251f0b418b202e2712c3408a5c6a5904ce4f453 Author: Gabor Juhos Date: Fri Mar 6 09:57:38 2009 +0100 ath9k: fix compile error in ahb.c drivers/net/wireless/ath9k/ahb.c: In function 'ath_ahb_probe': drivers/net/wireless/ath9k/ahb.c:136: error: 'aphy' undeclared (first use in this function) Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 6b765deb01dd076e64a4b01d2101d74206e7df84 Author: Gabor Juhos Date: Fri Mar 6 09:08:53 2009 +0100 ath9k: fix AR_SREV_9100_OR_LATER macro The current macro is wrong, because detects some AR5416 devices as an AR9100 device. The AR5416 devices would have performance issues after this change, because the contents of the ar5416 specific and of the ar9100 specificinitval arrays are swapped. Fortunately we can correct this with the rename of the arrays simply. Changes-licesed-under: ISC Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Signed-off-by: John W. Linville commit d4376ebe168024695f15bfdf603ea6f083dc80f8 Author: Gabor Juhos Date: Fri Mar 6 09:08:52 2009 +0100 ath9k: move ar9100 version checking macros into a more appropriate place All other version checking macros are in a common location within the reg.h file. The AR_SREV_9100_OR_LATER macro is wrong currently, but will be fixed with the next patch. Changes-licensed-under: ISC Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Signed-off-by: John W. Linville commit a8c96d3b225d4c9e6ff341923e3f76de401c75b2 Author: Gabor Juhos Date: Fri Mar 6 09:08:51 2009 +0100 ath9k: cleanup AR5416 version checking macros Currently we have two different versions of this macros. Because they would have to do the same thing, we should simplify and merge them. Changes-licensed-under: ISC Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Signed-off-by: John W. Linville commit 978b53264235eef1d2d2e9fd16ae26b3471c0b57 Author: Senthil Balasubramanian Date: Fri Mar 6 11:24:11 2009 +0530 ath9k: Incorrect AR9285 version check macro Fix AR9285 1.1 and 1.2 version check macro. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit 4e845168380a5954dd8702be5229e3e1b477ed81 Author: Senthil Balasubramanian Date: Fri Mar 6 11:24:10 2009 +0530 ath9k: INI update for AR9285 and periodic PA offset caliberation This patch updates the initvalues for AR9285 chipset and also adds periodic PA offset caliberation. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit b03a9db95a285e13a5e4f2913e9d22a84bf50cc6 Author: Senthil Balasubramanian Date: Fri Mar 6 11:24:09 2009 +0530 ath9k: RX buffers may be accessed/freed even before initialized/alloced. accessing RXBUF list in ath_rx_cleanup may cause panic if ath_descdma_setup fails even before RXBUF list is initialized. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit f0e6ce13c17afd74a49e0ef043d72581562f73ae Author: Senthil Balasubramanian Date: Fri Mar 6 11:24:08 2009 +0530 ath9k: Get rid of unnecessary ATOMIC memory alloc during init time We can sleep for memory during init time and so allocating rx buffers, descriptro buffers with GFP_KERNEL should help us to get rid of transient alloc fails. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit ec329acef99ded8dad59e1ef8a5a02b823083353 Author: Luis R. Rodriguez Date: Thu Mar 5 21:19:22 2009 -0800 cfg80211: fix max tx power for world regdom on 5 GHz to 20dBm This is the lowest value amongst countries which do enable 5 GHz operation. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 611b6a82aaae33a4d3a274fd6cccbdcd1c7cef4d Author: Luis R. Rodriguez Date: Thu Mar 5 21:19:21 2009 -0800 cfg80211: Enable passive scan on channels 12-14 for world roaming Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 22cad73587ac85e2e9d1f52aae62023aec093654 Author: Luis R. Rodriguez Date: Thu Mar 5 21:13:06 2009 -0800 mac80211_hwsim: add support for 5 GHz ACME Inc. is now selling a dual band radio. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 94041b294094bbd9fbbe11aa71278fdc70d29d6d Author: Christian Lamparter Date: Fri Mar 6 02:15:08 2009 +0100 p54: enable power save support This patch enables power save support on all p54 devices. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit d0b45aef4f628e69f8da8c670d6879a8a02fe0f2 Author: Christian Lamparter Date: Fri Mar 6 01:02:04 2009 +0100 p54: initial SoftLED support This patch adds SoftLED support for all p54 devices. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit efeada2c0aa1219b15787da48cfa282803e9d99e Author: Christian Lamparter Date: Thu Mar 5 21:31:05 2009 +0100 p54: fix iwconfig txpower off Disabling the receiver logic with P54_FILTER_TYPE_RX_DISABLED is not supported by all firmwares. However we have an alternative: hibernation. And the only side effect - so far - is a bit less power consumption. WIN! Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit ad5e72ee81ed074cfe6bb2a1ca231b5413efa41f Author: Christian Lamparter Date: Thu Mar 5 21:30:37 2009 +0100 p54pci: convert printk(KERN_* to dev_* This patch replaces most printk(KERN_* "") with their by dev_* analogue. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 2ac710720c523dd243662746da4381dd4f1772f8 Author: Christian Lamparter Date: Thu Mar 5 21:30:10 2009 +0100 p54: unify ieee80211 device registration All three drivers (p54pci, p54usb and p54spi) are implementing the same functionality three times. So, why not put it into the shared library?! Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit fbf95296c1c8b1ba09bdea0438ce2c61e0e3be5d Author: Christian Lamparter Date: Thu Mar 5 21:29:51 2009 +0100 p54usb: stop USB core interference in exit path The patch fixes a problem when the (Soft)LED stayed on after the module was unloaded. It turned out that the USB core disables all endpoints before calling the disconnect method. So it was impossible to switch off the radio & LEDs. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 19d8bc22bcea749da2ba065a1ff9e054fadb556e Author: Gabor Juhos Date: Thu Mar 5 16:55:18 2009 +0100 ath9k: create a common debugfs_root for all device instances The driver are trying to create an 'ath9k' directory in debugfs for each device currently. If there are more than one device in the system, the second try will always fail. Changes-licensed-under: ISC Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Signed-off-by: John W. Linville commit 0eeb59fe2cd84b62f374874a59e62402e13f48b3 Author: Jouni Malinen Date: Thu Mar 5 17:23:46 2009 +0200 mac80211: Fix WMM ACM parsing and AC downgrade operation Incorrect local->wmm_acm bits were set for AC_BK and AC_BE. Fix this and add some comments to make it easier to understand the AC-to-UP(pair) mapping. Set the wmm_acm bits (and show WMM debug) even if the driver does not implement conf_tx() handler. In addition, fix the ACM-based AC downgrade code to not use the highest priority in error cases. We need to break the loop to get the correct AC_BK value (3) instead of returning 0 (which would indicate AC_VO). The comment here was not really very useful either, so let's provide somewhat more helpful description of the situation. Since it is very unlikely that the ACM flag would be set for AC_BK and AC_BE, these bugs are not likely to be seen in real life networks. Anyway, better do these things correctly should someone really use silly AP configuration (and to pass some functionality tests, too). Remove the TODO comment about handling ACM. Downgrading AC is perfectly valid mechanism for ACM. Eventually, we may add support for WMM-AC and send a request for a TS, but anyway, that functionality won't be here at the location of this TODO comment. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 2bfc5cb57b55ed2204bca7668e082f7bf485760a Author: Andrey Borzenkov Date: Sat Feb 28 23:09:09 2009 +0300 orinoco: firmware: consistently compile out fw cache support if not requested Currently part of support for FW caching is unconditionally compiled in even if it is never used. Consistently remove caching support if not requested by user. Signed-off-by: Andrey Borzenkov Signed-off-by: John W. Linville commit d1c76af9e2434fac3add561e26c61b06503de986 Author: Herbert Xu Date: Mon Mar 16 10:50:02 2009 -0700 GRO: Move netpoll checks to correct location As my netpoll fix for net doesn't really work for net-next, we need this update to move the checks into the right place. As it stands we may pass freed skbs to netpoll_receive_skb. This patch also introduces a netpoll_rx_on function to avoid GRO completely if we're invoked through netpoll. This might seem paranoid but as netpoll may have an external receive hook it's better to be safe than sorry. I don't think we need this for 2.6.29 though since there's nothing immediately broken by it. This patch also moves the GRO_* return values to netdevice.h since VLAN needs them too (I tried to avoid this originally but alas this seems to be the easiest way out). This fixes a bug in VLAN where it continued to use the old return value 2 instead of the correct GRO_DROP. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 0269ea4937343536ec7e85649932bc8c9686ea78 Author: Pablo Neira Ayuso Date: Mon Mar 16 17:10:36 2009 +0100 netfilter: xtables: add cluster match This patch adds the iptables cluster match. This match can be used to deploy gateway and back-end load-sharing clusters. The cluster can be composed of 32 nodes maximum (although I have only tested this with two nodes, so I cannot tell what is the real scalability limit of this solution in terms of cluster nodes). Assuming that all the nodes see all packets (see below for an example on how to do that if your switch does not allow this), the cluster match decides if this node has to handle a packet given: (jhash(source IP) % total_nodes) & node_mask For related connections, the master conntrack is used. The following is an example of its use to deploy a gateway cluster composed of two nodes (where this is the node 1): iptables -I PREROUTING -t mangle -i eth1 -m cluster \ --cluster-total-nodes 2 --cluster-local-node 1 \ --cluster-proc-name eth1 -j MARK --set-mark 0xffff iptables -A PREROUTING -t mangle -i eth1 \ -m mark ! --mark 0xffff -j DROP iptables -A PREROUTING -t mangle -i eth2 -m cluster \ --cluster-total-nodes 2 --cluster-local-node 1 \ --cluster-proc-name eth2 -j MARK --set-mark 0xffff iptables -A PREROUTING -t mangle -i eth2 \ -m mark ! --mark 0xffff -j DROP And the following commands to make all nodes see the same packets: ip maddr add 01:00:5e:00:01:01 dev eth1 ip maddr add 01:00:5e:00:01:02 dev eth2 arptables -I OUTPUT -o eth1 --h-length 6 \ -j mangle --mangle-mac-s 01:00:5e:00:01:01 arptables -I INPUT -i eth1 --h-length 6 \ --destination-mac 01:00:5e:00:01:01 \ -j mangle --mangle-mac-d 00:zz:yy:xx:5a:27 arptables -I OUTPUT -o eth2 --h-length 6 \ -j mangle --mangle-mac-s 01:00:5e:00:01:02 arptables -I INPUT -i eth2 --h-length 6 \ --destination-mac 01:00:5e:00:01:02 \ -j mangle --mangle-mac-d 00:zz:yy:xx:5a:27 In the case of TCP connections, pickup facility has to be disabled to avoid marking TCP ACK packets coming in the reply direction as valid. echo 0 > /proc/sys/net/netfilter/nf_conntrack_tcp_loose BTW, some final notes: * This match mangles the skbuff pkt_type in case that it detects PACKET_MULTICAST for a non-multicast address. This may be done in a PKTTYPE target for this sole purpose. * This match supersedes the CLUSTERIP target. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy commit 1546000fe8db0d3f47b0ef1dd487ec23fbd95313 Author: Cyrill Gorcunov Date: Mon Mar 16 16:30:49 2009 +0100 net: netfilter conntrack - add per-net functionality for DCCP protocol Module specific data moved into per-net site and being allocated/freed during net namespace creation/deletion. Signed-off-by: Cyrill Gorcunov Acked-by: Daniel Lezcano Signed-off-by: Patrick McHardy commit 81a1d3c31e3517f9939b3e04d21cf4a6b0997419 Author: Cyrill Gorcunov Date: Mon Mar 16 16:23:30 2009 +0100 net: sysctl_net - use net_eq to compare nets Signed-off-by: Cyrill Gorcunov Acked-by: Daniel Lezcano Signed-off-by: Patrick McHardy commit acc738fec03bdaa5b77340c32a82fbfedaaabef0 Author: Jan Engelhardt Date: Mon Mar 16 15:35:29 2009 +0100 netfilter: xtables: avoid pointer to self Commit 784544739a25c30637397ace5489eeb6e15d7d49 (netfilter: iptables: lock free counters) broke a number of modules whose rule data referenced itself. A reallocation would not reestablish the correct references, so it is best to use a separate struct that does not fall under RCU. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit 60aa49243d09afc873f082567d2e3c16634ced84 Author: Jonathan Corbet Date: Sun Feb 1 14:52:56 2009 -0700 Rationalize fasync return values Most fasync implementations do something like: return fasync_helper(...); But fasync_helper() will return a positive value at times - a feature used in at least one place. Thus, a number of other drivers do: err = fasync_helper(...); if (err < 0) return err; return 0; In the interests of consistency and more concise code, it makes sense to map positive return values onto zero where ->fasync() is called. Cc: Al Viro Signed-off-by: Jonathan Corbet commit 76398425bb06b07cc3a3b1ce169c67dc9d6874ed Author: Jonathan Corbet Date: Sun Feb 1 14:26:59 2009 -0700 Move FASYNC bit handling to f_op->fasync() Removing the BKL from FASYNC handling ran into the challenge of keeping the setting of the FASYNC bit in filp->f_flags atomic with regard to calls to the underlying fasync() function. Andi Kleen suggested moving the handling of that bit into fasync(); this patch does exactly that. As a result, we have a couple of internal API changes: fasync() must now manage the FASYNC bit, and it will be called without the BKL held. As it happens, every fasync() implementation in the kernel with one exception calls fasync_helper(). So, if we make fasync_helper() set the FASYNC bit, we can avoid making any changes to the other fasync() functions - as long as those functions, themselves, have proper locking. Most fasync() implementations do nothing but call fasync_helper() - which has its own lock - so they are easily verified as correct. The BKL had already been pushed down into the rest. The networking code has its own version of fasync_helper(), so that code has been augmented with explicit FASYNC bit handling. Cc: Al Viro Cc: David Miller Reviewed-by: Christoph Hellwig Signed-off-by: Jonathan Corbet commit db1dd4d376134eba0e08af523b61cc566a4ea1cd Author: Jonathan Corbet Date: Fri Feb 6 15:25:24 2009 -0700 Use f_lock to protect f_flags Traditionally, changes to struct file->f_flags have been done under BKL protection, or with no protection at all. This patch causes all f_flags changes after file open/creation time to be done under protection of f_lock. This allows the removal of some BKL usage and fixes a number of longstanding (if microscopic) races. Reviewed-by: Christoph Hellwig Cc: Al Viro Signed-off-by: Jonathan Corbet commit 684999149002dd046269666a390458e0acb38280 Author: Jonathan Corbet Date: Fri Feb 6 13:52:43 2009 -0700 Rename struct file->f_ep_lock This lock moves out of the CONFIG_EPOLL ifdef and becomes f_lock. For now, epoll remains the only user, but a future patch will use it to protect f_flags as well. Cc: Davide Libenzi Reviewed-by: Christoph Hellwig Signed-off-by: Jonathan Corbet commit 95ba434f898c3cb5c7457dce265bf0ab72ba8ce9 Author: Scott James Remnant Date: Mon Mar 16 15:31:10 2009 +0100 netfilter: auto-load ip_queue module when socket opened The ip_queue module is missing the net-pf-16-proto-3 alias that would causae it to be auto-loaded when a socket of that type is opened. This patch adds the alias. Signed-off-by: Scott James Remnant Signed-off-by: Tim Gardner Signed-off-by: Patrick McHardy commit 26c3b6780618f09abb5f7e03b09b13dbb8e8aa24 Author: Scott James Remnant Date: Mon Mar 16 15:30:14 2009 +0100 netfilter: auto-load ip6_queue module when socket opened The ip6_queue module is missing the net-pf-16-proto-13 alias that would cause it to be auto-loaded when a socket of that type is opened. This patch adds the alias. Signed-off-by: Scott James Remnant Signed-off-by: Tim Gardner Signed-off-by: Patrick McHardy commit f0a3c0869f3b0ef93d9df044e9a41e40086d4c97 Author: Pablo Neira Ayuso Date: Mon Mar 16 15:28:09 2009 +0100 netfilter: ctnetlink: move event reporting for new entries outside the lock This patch moves the event reporting outside the lock section. With this patch, the creation and update of entries is homogeneous from the event reporting perspective. Moreover, as the event reporting is done outside the lock section, the netlink broadcast delivery can benefit of the yield() call under congestion. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy commit e098360f159b3358f085543eb6dc2eb500d6667c Author: Pablo Neira Ayuso Date: Mon Mar 16 15:27:22 2009 +0100 netfilter: ctnetlink: cleanup conntrack update preliminary checkings This patch moves the preliminary checkings that must be fulfilled to update a conntrack, which are the following: * NAT manglings cannot be updated * Changing the master conntrack is not allowed. This patch is a cleanup. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy commit b9591448e5160ccd353d8547ade018cfdf2b3e09 Author: Takashi Iwai Date: Mon Mar 16 15:25:00 2009 +0100 ALSA: hda - Fix ALC662 beep again The previous commit breaks the (digital-) beep on ALC662. ALC662 has the connection index 0x05 while ALC662 and ALC272 have the index 0x04 for the beep widget. Signed-off-by: Takashi Iwai commit 7ec4749675bf33ea639bbcca8a5365ccc5091a6a Author: Pablo Neira Ayuso Date: Mon Mar 16 15:25:46 2009 +0100 netfilter: ctnetlink: cleanup master conntrack assignation This patch moves the assignation of the master conntrack to ctnetlink_create_conntrack(), which is where it really belongs. This patch is a cleanup. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy commit b8dbed0f095263b9ced5bd2e6d54743a7fa13f1b Author: Jaroslav Kysela Date: Mon Mar 16 14:56:58 2009 +0100 ALSA: snd-hda-intel: Fix ALC662/ALC663 Beep Amplifier Index ALC662/663 codecs have Beep Amplifier Index 0x04 not 0x05 in 0x0b NID. Confirmed by testing on real hardware. Signed-off-by: Jaroslav Kysela Signed-off-by: Takashi Iwai commit 1db7a748dfd50d7615913730763c024444900030 Author: Pablo Neira Ayuso Date: Mon Mar 16 15:18:50 2009 +0100 netfilter: conntrack: increase drop stats if sequence adjustment fails This patch increases the statistics of packets drop if the sequence adjustment fails in ipv4_confirm(). Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy commit 67c0d57930ff9a24c6c34abee1b01f7716a9b0e2 Author: Stephen Hemminger Date: Mon Mar 16 15:17:23 2009 +0100 netfilter: Kconfig spelling fixes (trivial) Signed-off-by: Stephen Hemminger Signed-off-by: Patrick McHardy commit 9d2493f88f846b391a15a736efc7f4b97d6c4046 Author: Christoph Paasch Date: Mon Mar 16 15:15:35 2009 +0100 netfilter: remove IPvX specific parts from nf_conntrack_l4proto.h Moving the structure definitions to the corresponding IPvX specific header files. Signed-off-by: Patrick McHardy commit 852fd9e50f62b4ea7afe26eee0710464de4801b8 Author: Mark Brown Date: Mon Mar 16 14:13:12 2009 +0000 ASoC: Each PXA AC97 DAI needs a separate ops Signed-off-by: Mark Brown commit f2a5d6a2ea2fa24573a8ce7ea7a7a2cce42e3588 Author: Mark Brown Date: Mon Mar 16 14:02:07 2009 +0000 ASoC: Fix some missing dai_ops conversions Signed-off-by: Mark Brown commit 10d9e3d99ee8332bb73a3d7f12a8cd8ffab8b136 Author: Joonyoung Shim Date: Mon Mar 16 21:23:35 2009 +0900 ASoC: twl4030 - Fix build error CC sound/soc/codecs/twl4030.o sound/soc/codecs/twl4030.c:1400: warning: braces around scalar initializer sound/soc/codecs/twl4030.c:1400: warning: (near initialization for 'twl4030_dai.ops') sound/soc/codecs/twl4030.c:1401: error: field name not in record or union initializer sound/soc/codecs/twl4030.c:1401: error: (near initialization for 'twl4030_dai.ops') sound/soc/codecs/twl4030.c:1401: warning: initialization from incompatible pointer type sound/soc/codecs/twl4030.c:1402: error: field name not in record or union initializer sound/soc/codecs/twl4030.c:1402: error: (near initialization for 'twl4030_dai.ops') sound/soc/codecs/twl4030.c:1402: warning: excess elements in scalar initializer sound/soc/codecs/twl4030.c:1402: warning: (near initialization for 'twl4030_dai.ops') sound/soc/codecs/twl4030.c:1403: error: field name not in record or union initializer sound/soc/codecs/twl4030.c:1403: error: (near initialization for 'twl4030_dai.ops') sound/soc/codecs/twl4030.c:1403: warning: excess elements in scalar initializer sound/soc/codecs/twl4030.c:1403: warning: (near initialization for 'twl4030_dai.ops') Signed-off-by: Joonyoung Shim Signed-off-by: Mark Brown commit c7a913cd5535554d6f5d5e1f5ef46c4307cf2afc Author: Eric Leblond Date: Mon Mar 16 14:55:27 2009 +0100 netfilter: print the list of register loggers This patch modifies the proc output to add display of registered loggers. The content of /proc/net/netfilter/nf_log is modified. Instead of displaying a protocol per line with format: proto:logger it now displays: proto:logger (comma_separated_list_of_loggers) NONE is used as keyword if no logger is used. Signed-off-by: Eric Leblond Signed-off-by: Patrick McHardy commit ca735b3aaa945626ba65a3e51145bfe4ecd9e222 Author: Eric Leblond Date: Mon Mar 16 14:54:21 2009 +0100 netfilter: use a linked list of loggers This patch modifies nf_log to use a linked list of loggers for each protocol. This list of loggers is read and write protected with a mutex. This patch separates registration and binding. To be used as logging module, a module has to register calling nf_log_register() and to bind to a protocol it has to call nf_log_bind_pf(). This patch also converts the logging modules to the new API. For nfnetlink_log, it simply switchs call to register functions to call to bind function and adds a call to nf_log_register() during init. For other modules, it just remove a const flag from the logger structure and replace it with a __read_mostly. Signed-off-by: Eric Leblond Signed-off-by: Patrick McHardy commit 988f831df398ff36f67b095245060c24c354e9e9 Author: Nobuhiro Iwamatsu Date: Mon Mar 16 03:22:07 2009 +0000 sh: Move IRQ multi definition of DMAC to defconfig When SuperH CPU has IRQ multi of DMAC, SH_DMA_IRQ_MULTI becomes enable. The following CPU's are Multi IRQ of DMAC now. - SH775X and SH7091 - SH776X - SH7780 - SH7785 If SH_DMA_IRQ_MULTI becomes enable, dma-sh api driver is optimized for Multi IRQ. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Paul Mundt commit 50cca715a64b66ccf173767d94d4020ea0a6129c Author: Francesco VIRLINZI Date: Fri Mar 13 08:08:01 2009 +0000 sh: clkfwk: Safer resume from hibernation. This patch fixes a possible problem in the resume from hibenration. It temporaneally saves the clk->rate on the stack to avoid any possible change during the clk->set_parent(..) call. Signed-off-by: Francesco Virlinzi Signed-off-by: Paul Mundt commit e9edb3fec2260b5a64e9ca9e09160b74f1b106e3 Author: Paul Mundt Date: Mon Mar 16 20:00:17 2009 +0900 sh: Consolidate SH-Mobile CPU code in arch/sh/kernel/cpu/shmobile/. Signed-off-by: Paul Mundt commit 2feb075a33905c2f6ef6be484c75ba6a35f6d12d Author: Magnus Damm Date: Fri Mar 13 15:36:55 2009 +0000 video: sh_mobile_lcdcfb suspend/resume support This patch adds suspend/resume support to the LCDC driver for SuperH Mobile - sh_mobile_lcdcfb. We simply stop hardware on suspend and start it again on resume. For RGB panels this is trivial, but for SYS panels in deferred io mode this becomes a bit more difficult - we need to wait for a frame end interrupt to make sure the clocks are balanced before stopping the actual hardware. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 93356d07474b1f16f25e79e81597c2a6b8c2a783 Author: Magnus Damm Date: Fri Mar 13 15:27:14 2009 +0000 sh: add ap325 lcd power off support Improve the ap325 board code to allow the lcd panel and backlight to be powered off. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 7759491274bc5ba7cd72b3b9cc5ec8247b937efb Author: Magnus Damm Date: Fri Mar 13 15:23:04 2009 +0000 sh: SuperH Mobile suspend support This patch contains CONFIG_SUSPEND support to the SuperH architecture. If enabled, SuperH Mobile processors will register their suspend callbacks during boot. To suspend, use "echo mem > /sys/power/state". To allow wakeup, make sure "/sys/device/platform/../power/wakeup" contains "enabled". Additional per-device driver patches are most likely needed. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 7a516280b6a99634933b417834e178bde8659da1 Author: Nobuhiro Iwamatsu Date: Fri Mar 13 05:03:37 2009 +0000 sh: Fix compile error by operands(mov.l) in sh3/entry.S -- log -- arch/sh/kernel/cpu/sh4/../sh3/entry.S:365: Error: invalid operands for opcode make[4]: *** [arch/sh/kernel/cpu/sh4/../sh3/entry.o] Error 1 make[3]: *** [arch/sh/kernel/cpu/sh4] Error 2 -- log -- Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Paul Mundt commit 02ebd32f52c10f90f810e85d0281e9e81dd6e741 Author: Nobuhiro Iwamatsu Date: Fri Mar 13 04:31:34 2009 +0000 sh: Disable get_dma_error_irq for non-SH4 targets. dma-sh's get_dma_error_irq() is only used by SH4, as the SH3 doesn't have the DMA Error interrupt. Disable it out for non-SH4 builds. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Paul Mundt commit a83c0b739f3ad1887704cfa9f1ee5ee208cf1532 Author: Francesco VIRLINZI Date: Wed Mar 11 10:39:02 2009 +0000 sh: PMB hibernation support This implements preliminary suspend/resume support for the PMB. Signed-off-by: Francesco Virlinzi Signed-off-by: Paul Mundt commit 039a718ebb37298de87801288673859ac40b6fc4 Author: Nobuhiro Iwamatsu Date: Thu Mar 12 06:34:39 2009 +0000 sh: Revert CONFIG_NR_ONCHIP_DMA_CHANNELS to MAX_DMA_CHANNELS Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Paul Mundt commit 4c3f450ba4e4c00df91f98664b58f9a98dc049fd Author: Kuninori Morimoto Date: Thu Mar 12 08:40:15 2009 +0000 sh: Add OHCI USB support for SH7786 Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit a6bc3262c561780d2a6587aa3d5715b1e7d8fa13 Author: Stephen Rothwell Date: Mon Mar 16 18:52:56 2009 +1100 sparseirq, powerpc/cell: fix unused variable warning in interrupt.c This new compiler warning: arch/powerpc/platforms/cell/interrupt.c: In function 'handle_iic_irq': arch/powerpc/platforms/cell/interrupt.c:240: warning: unused variable 'cpu' Triggers because the local variable 'cpu' became unused due to commit: dee4102: sparseirq: use kstat_irqs_cpu instead Remove the variable. Signed-off-by: Stephen Rothwell Cc: Yinghai Lu Cc: ppc-dev LKML-Reference: <20090316185256.4a160374.sfr@canb.auug.org.au> Signed-off-by: Ingo Molnar commit edb35028e40515beb2f94808aff8b3e71fb9f35a Merge: 8f8573a... cb065c0... 5bee17f... Author: Ingo Molnar Date: Mon Mar 16 09:20:13 2009 +0100 Merge branches 'irq/genirq' and 'linus' into irq/core commit 4c55bb0149b604901e4989d1ee0fddc53df8eb0c Author: Giuliano Pochini Date: Sun Mar 15 21:33:55 2009 +0100 ALSA: echoaudio: remove line-out volume from vmixer cards With this patch the drivers do not set the vmixer volume anymore at startup because it is actually the output volume of the voices and ALSA mandates that the volume must be 0 by default. Signed-off-by: Giuliano Pochini Signed-off-by: Takashi Iwai commit 9f5d790d1b0af8e3705df12fd5d49a1df2a45c47 Author: Giuliano Pochini Date: Sun Mar 15 21:33:34 2009 +0100 ALSA: echoaudio: remove line-out volume from vmixer cards There is a long standing bug in the drivers for cards with a vmixer because I overlooked a detail in the c++ generic driver by echoaudio. Those cards do not have a line-out volume control. It is a virtual control provided by the generic driver. The bug is harmless because the DSP just ignores the command to change the volume. *NB:* It breaks alsa-tools/echomixer. A patch for it will follow. This patch removes the line-out volume control from vmixer-equipped cards. Signed-off-by: Giuliano Pochini Signed-off-by: Takashi Iwai commit afece1c6587010cc81d1a43045c855774e8234a3 Author: Ilpo Järvinen Date: Sat Mar 14 14:23:07 2009 +0000 tcp: make sure xmit goal size never becomes zero It's not too likely to happen, would basically require crafted packets (must hit the max guard in tcp_bound_to_half_wnd()). It seems that nothing that bad would happen as there's tcp_mems and congestion window that prevent runaway at some point from hurting all too much (I'm not that sure what all those zero sized segments we would generate do though in write queue). Preventing it regardless is certainly the best way to go. Signed-off-by: Ilpo Järvinen Cc: Evgeniy Polyakov Cc: Ingo Molnar Signed-off-by: David S. Miller commit 2a3a041c4e2c1685e668b280c121a5a40a029a03 Author: Ilpo Järvinen Date: Sat Mar 14 22:45:16 2009 +0000 tcp: cache result of earlier divides when mss-aligning things The results is very unlikely change every so often so we hardly need to divide again after doing that once for a connection. Yet, if divide still becomes necessary we detect that and do the right thing and again settle for non-divide state. Takes the u16 space which was previously taken by the plain xmit_size_goal. This should take care part of the tso vs non-tso difference we found earlier. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 0c54b85f2828128274f319a1eb3ce7f604fe2a53 Author: Ilpo Järvinen Date: Sat Mar 14 14:23:05 2009 +0000 tcp: simplify tcp_current_mss There's very little need for most of the callsites to get tp->xmit_goal_size updated. That will cost us divide as is, so slice the function in two. Also, the only users of the tp->xmit_goal_size are directly behind tcp_current_mss(), so there's no need to store that variable into tcp_sock at all! The drop of xmit_goal_size currently leaves 16-bit hole and some reorganization would again be necessary to change that (but I'm aiming to fill that hole with u16 xmit_goal_size_segs to cache the results of the remaining divide to get that tso on regression). Bring xmit_goal_size parts into tcp.c Signed-off-by: Ilpo Järvinen Cc: Evgeniy Polyakov Cc: Ingo Molnar Signed-off-by: David S. Miller commit 72211e90501f954f586481c25521c3724cda3cc7 Author: Ilpo Järvinen Date: Sat Mar 14 14:23:04 2009 +0000 tcp: don't check mtu probe completion in the loop It seems that no variables clash such that we couldn't do the check just once later on. Therefore move it. Also kill dead obvious comment, dead argument and add unlikely since this mtu probe does not happen too often. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit c887e6d2d9aee56ee7c9f2af4cec3a5efdcc4c72 Author: Ilpo Järvinen Date: Sat Mar 14 14:23:03 2009 +0000 tcp: consolidate paws check Wow, it was quite tricky to merge that stream of negations but I think I finally got it right: check & replace_ts_recent: (s32)(rcv_tsval - ts_recent) >= 0 => 0 (s32)(ts_recent - rcv_tsval) <= 0 => 0 discard: (s32)(ts_recent - rcv_tsval) > TCP_PAWS_WINDOW => 1 (s32)(ts_recent - rcv_tsval) <= TCP_PAWS_WINDOW => 0 I toggled the return values of tcp_paws_check around since the old encoding added yet-another negation making tracking of truth-values really complicated. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit c43d558a5139a3b22dcac3f19f64ecb39130b02e Author: Ilpo Järvinen Date: Sat Mar 14 14:23:02 2009 +0000 tcp: kill dead end_seq variable in clean_rtx_queue I've already forgotten what for this was necessary, anyway it's no longer used (if it ever was). Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 5861f8e58dd84fc34b691c2e8d4824dea68c360e Author: Ilpo Järvinen Date: Sat Mar 14 14:23:01 2009 +0000 tcp: remove pointless .dsack/.num_sacks code In the pure assignment case, the earlier zeroing is still in effect. David S. Miller raised concerns if the ifs are there to avoid dirtying cachelines. I came to these conclusions: > We'll be dirty it anyway (now that I check), the first "real" statement > in tcp_rcv_established is: > > tp->rx_opt.saw_tstamp = 0; > > ...that'll land on the same dword. :-/ > > I suppose the blocks are there just because they had more complexity > inside when they had to calculate the eff_sacks too (maybe it would > have been better to just remove them in that drop-patch so you would > have had less head-ache :-)). Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 7cd0a63872ac6ef97265f07adc367ca4f984468e Author: Jarek Poplawski Date: Sun Mar 15 20:00:19 2009 -0700 pkt_sched: Change misleading code in class delete. While looking for a possible reason of bugzilla report on HTB oops: http://bugzilla.kernel.org/show_bug.cgi?id=12858 I found the code in htb_delete calling htb_destroy_class on zero refcount is very misleading: it can suggest this is a common path, and destroy is called under sch_tree_lock. Actually, this can never happen like this because before deletion cops->get() is done, and after delete a class is still used by tclass_notify. The class destroy is always called from cops->put(), so without sch_tree_lock. This doesn't mean much now (since 2.6.27) because all vulnerable calls were moved from htb_destroy_class to htb_delete, but there was a bug in older kernels. The same change is done for other classful scheds, which, it seems, didn't have similar locking problems here. Reported-by: m0sia Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit 8bdd663aba341c15cd2fa9dbd7061b8b387964dc Author: Eric Dumazet Date: Sun Mar 15 19:59:13 2009 -0700 net: reorder fields of struct socket On x86_64, its rather unfortunate that "wait_queue_head_t wait" field of "struct socket" spans two cache lines (assuming a 64 bytes cache line in current cpus) offsetof(struct socket, wait)=0x30 sizeof(wait_queue_head_t)=0x18 This might explain why Kenny Chang noticed that his multicast workload was performing bad with 64 bit kernels, since more cache lines ping pongs were involved. This litle patch moves "wait" field next "fasync_list" so that both fields share a single cache line, to speedup sock_def_readable() Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 26ade896b6ba3fd017ef4a26e71e7b7569222cb6 Author: Robert Jarzmik Date: Sun Mar 15 14:10:54 2009 +0100 ASoC: Allow choice of ac97 gpio reset line As the PXA27x series allow 2 gpios to reset the ac97 bus, allow through platform data configuration the definition of the correct gpio which will reset the AC97 bus. This comes from a silicon defect on the PXA27x series, where the gpio must be manually controlled in warm reset cases. Signed-off-by: Robert Jarzmik Signed-off-by: Mark Brown commit ff4fbd43fe82de28710761f2cc2ed122d716483a Author: Dhananjay Phadke Date: Fri Mar 13 14:52:06 2009 +0000 netxen: update version to 4.0.30 To mark all features and bugfixes submitted since 4.0.11. Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit d8b100c5da003b6f8c410453e1e6e74ced8d1cc1 Author: Dhananjay Phadke Date: Fri Mar 13 14:52:05 2009 +0000 netxen: add receive side scaling (rss) support This patch enables the load balancing capability of firmware and hardware to spray traffic into different cpus through separate rx msix interrupts. The feature is being enabled for NX3031, NX2031 (old) will be enabled later. This depends on msi-x and compatibility with msi and legacy is maintained by enabling single rx ring. Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit 9b3ef55c6ddbe8c7b76707eae9a77d874fe2cec0 Author: Dhananjay Phadke Date: Fri Mar 13 14:52:04 2009 +0000 netxen: remove old lro code Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit 438627c77b877e445a4b918a50ff910a5ea2a12d Author: Dhananjay Phadke Date: Fri Mar 13 14:52:03 2009 +0000 netxen: sanitize variable names o remove max_ prefix from ring sizes, since they don't really represent max possible sizes. o cleanup naming of rx ring types (normal, jumbo, lro). o simplify logic to choose rx ring size, gig ports get half rx ring of 10 gig ports. Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit 0b72e659a10ec50acbef90756bf04177b66c8266 Author: Dhananjay Phadke Date: Fri Mar 13 14:52:02 2009 +0000 netxen: add suspend resume support Detach network interface on PCI suspend and recreate hardware context after resumes. Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit fbb52f2272e6265295f0e5f6187b628e4c162eca Author: Dhananjay Phadke Date: Fri Mar 13 14:52:01 2009 +0000 netxen: fix endianness in serial number Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit 09e1c061484005aa26264c3f82f2c83a273c4094 Author: PJ Waskiewicz Date: Fri Mar 13 22:15:54 2009 +0000 ixgbe: Add documentation for the driver Documentation for the ixgbe driver in the kernel docs area is missing. This adds that documentation. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 4df1046622797804150327bada9fdc564c090417 Author: Jesse Brandeburg Date: Fri Mar 13 22:15:31 2009 +0000 ixgbe: Cleanup some whitespace issues, fixup and add some comments Cleanup a bit of whitespace, add some function header comments, and fix a few comments around the driver. Signed-off-by: Jesse Brandeburg Signed-off-by: Peter P Waskiewicz Jr Acked-by: Mallikarjuna R Chilakala Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 885125399e2c72b6466cfd2fbcb755be499b53a2 Author: PJ Waskiewicz Date: Fri Mar 13 22:15:10 2009 +0000 ixgbe: Two small fixes for 82599 when bringing the device down and for WoL The Tx DMA unit should be disabled when bringing the device down. Also, the KX4 device with 82599 supports WoL, so we should clear the Wake Up Status (WUS) after a PCIe slot reset. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jesse Brandeburg Acked-by: Mallikarjuna R Chilakala Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 9891ca7cdc42354ec48c0f76256fdcc9808ffc7e Author: Jesse Brandeburg Date: Fri Mar 13 22:14:50 2009 +0000 ixgbe: Add a few safety nets for register writes and descriptor cleanups There are possible times that a driver may fail to completely initialize, due to a buggy platform or a buggy kernel. In those cases, we'd rather fail gracefully instead of a panic. Add a few safety checks to some critical paths to try and prevent a panic in these corner-case situations. Signed-off-by: Jesse Brandeburg Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 2a41ff81162c7c406bb2a04e425a7ed51c85d89d Author: Jesse Brandeburg Date: Fri Mar 13 22:14:30 2009 +0000 ixgbe: Cleanup on the Rx init path This cleans up the following pieces of the Rx initialization path: - Enable the ECC memory fault interrupt in OTHER causes. - Fix an 82598 initialization of RDRXCTL when depending on RSS and VMDq to be enabled. We don't need these features enabled to safely set the MVMEN bit to allow multiple SRRCTL register mappings into the RXDCTL registers. - Fix the RSS initialization path to not stomp on DCB accidentally. When configuring the MRQC (multiple Rx queue contol) register, we want to make sure we only OR in features as necessary, instead of full assignment. Signed-off-by: Jesse Brandeburg Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 9a1a69adad69ce4e85c9cbb40a3f960a7cb015cf Author: Jesse Brandeburg Date: Fri Mar 13 22:14:10 2009 +0000 ixgbe: Fix the Tx clean logic to return proper status The Tx accounting when cleaning during NAPI was not completely properly. We should use the work_limit to determine when to finish cleaning, and use the same to return the cleaned status. The impact of running like this causes the NAPI clean for this Tx to get stuck in a scheduling loop, and can result in Tx not getting cleaned, ending with a Tx hang and device reset. Signed-off-by: Jesse Brandeburg Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 4dd64df8954cc6d485f7c98ab18e0480f0c7d865 Author: Jesse Brandeburg Date: Fri Mar 13 22:13:49 2009 +0000 ixgbe: fix bug with napi add before request_irq Occasionally if the driver was loaded in a system that didn't support MSI-X or MSI and was on a shared interrupt, the driver would then panic in NAPI on the first shared interrupt because we hadn't called napi_add yet. Solution: call napi_add before calling request_irq Signed-off-by: Jesse Brandeburg Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 509ee935ec0828e534e4d48d08d4d0b4bc17ea92 Author: Jesse Brandeburg Date: Fri Mar 13 22:13:28 2009 +0000 ixgbe: Fix interrupt configuration for 82599 The interrupt models using EITR have changed in 82599. The way the register is laid out, the change is transparent to some of the existing code. However, some of it isn't. This patch fixes all the cases where EITR handling is different than 82598. Signed-off-by: Jesse Brandeburg Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 40dcd79a7bd2e0d6bf4680db4bc0268c9f149a1d Author: PJ Waskiewicz Date: Fri Mar 13 22:13:08 2009 +0000 ixgbe: Disable DROP_EN for Rx queues 82599 mistakenly enabled drop on Rx queues in the packet buffer. The default mode should be store-and-forward from the FIFO. Signed-off-by: Peter P Waskiewicz Jr Acked-by: Mallikarjuna R Chilakala Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit d51019a4daac885ac4dead9d45d3a2a61189d9fd Author: PJ Waskiewicz Date: Fri Mar 13 22:12:48 2009 +0000 ixgbe: Fix an accounting problem when the Rx FIFO is full The rx_no_dma_resources counter reported by ethtool -S ethX is not counting correctly. In 82599, the queue mappings for the counters need to be mapped properly, and accounted for properly. Signed-off-by: Peter P Waskiewicz Jr Acked-by: Mallikarjuna R Chilakala Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 1339b9e975902dcb8ef81ace678cfb6626d4bf3f Author: PJ Waskiewicz Date: Fri Mar 13 22:12:29 2009 +0000 ixgbe: Fix get_supported_physical_layer() due to new 82599 PHY types A purely cosmetic change. Report which physical layer is present, instead of PHY unknown. 82599 added new PHY types for the SFP+ devices, and this was missed getting updated. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit c8ea5ea9da338d6af015148105f07fc35eda8a92 Author: Alexander Duyck Date: Fri Mar 13 20:42:35 2009 +0000 igb: add support for 82576 quad copper adapter Add support for 82576 copper adapter and necessary code to restrict wol for quad port adapter to first port. Signed-off-by: Alexander Duyck Acked-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 9eb2341d0df6e5d33508008879987bf5bb146804 Author: Alexander Duyck Date: Fri Mar 13 20:42:15 2009 +0000 igb: add support for another dual port 82576 non-security nic Adding device id to support 82576NS dual port copper NIC. Signed-off-by: Alexander Duyck Acked-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 75f4f382e3f92d1d2fcb77fe6ed7beda19185f0f Author: Alexander Duyck Date: Fri Mar 13 20:41:55 2009 +0000 igb: correct typo that was setting vfta mask to 1 This patch corrects a typo that was doing a less than comparison instead of a left shift due to the fact that I didn't get enough <'s in there. This resolves an issue in which vlans were not functioning correctly. Signed-off-by: Alexander Duyck Acked-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit cad6d05f5676d879bb2a48154aea26cd81ebf1bb Author: Alexander Duyck Date: Fri Mar 13 20:41:37 2009 +0000 igb: add PF to pool Add Pf to pool if adding a VLVF register value and the VFTA bit is already set. This patch addresses the unlikely situation that the PF adds a vlan entry when the vlvf is full, and a vf later adds the vlan to the vlvf. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit a2cf8b6ce17415fc84f51300fd6be372d95bfcea Author: Alexander Duyck Date: Fri Mar 13 20:41:17 2009 +0000 igb: support wol on second port We need to support wol on the second port for situations such as when the lan ports are on the motherboard itself. Signed-off-by: Alexander Duyck Acked-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit bd38e5d124ddd11c457c5ae7242cd039045d80e0 Author: Alexander Duyck Date: Fri Mar 13 20:40:58 2009 +0000 igb: resolve warning of unused adapter struct If DCA is undefined then the adapter struct becomes unnecessary. To resolve this issue the DCA calls can simply make a call to the adapter struct through the rx_ring adapter struct member. Signed-off-by: Alexander Duyck Acked-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 5e6d5b17db099dd575490545a4f0af9a99fa8bbe Author: Alexander Duyck Date: Fri Mar 13 20:40:38 2009 +0000 igb: remove netif running call from igb_poll The netif_running check in igb poll is a hold over from the use of fake netdevs to use multiple queues with NAPI prior to 2.6.24. It is no longer necessary to have the call there and it currently can cause errors if work_done == budget. Signed-off-by: Alexander Duyck Acked-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 92be791759945a9170394e92c03a2e75175d6bbe Author: Maciej Sosnowski Date: Fri Mar 13 20:40:21 2009 +0000 igb: switch to new dca API With the new DCA API, the driver should use dca3_get_tag() instead of the obsolete dca_get_tag(). Signed-off-by: Maciej Sosnowski < maciej.sosnowski@intel.com> Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 85fab7802a4bc00cc752f430e22a0d9fc41fe199 Author: Mark Brown Date: Fri Mar 13 14:27:08 2009 +0000 ASoC: Fix Zylonite for non-networked SSP mode This also simplifies the code a bit. Signed-off-by: Mark Brown commit 0ce36c5f7f87632f26c8fbefe68b5116eda152d2 Author: Mark Brown Date: Fri Mar 13 14:26:08 2009 +0000 ASoC: Fix non-networked I2S mode for PXA SSP Two issues are fixed here: - I2S transmits the left frame with the clock low but I don't seem to get LRCLK out without SFRMDLY being set so invert SFRMP and set a delay. - I2S has a clock cycle prior to the first data byte in each channel so we need to delay the data by one cycle. Tested-by: Daniel Mack Signed-off-by: Mark Brown commit 9c705260feea6ae329bc6b6d5f6d2ef0227eda0a Author: Gabriele Paoloni Date: Fri Mar 13 16:09:12 2009 -0700 ppp: ppp_mp_explode() redesign I found the PPP subsystem to not work properly when connecting channels with different speeds to the same bundle. Problem Description: As the "ppp_mp_explode" function fragments the sk_buff buffer evenly among the PPP channels that are connected to a certain PPP unit to make up a bundle, if we are transmitting using an upper layer protocol that requires an Ack before sending the next packet (like TCP/IP for example), we will have a bandwidth bottleneck on the slowest channel of the bundle. Let's clarify by an example. Let's consider a scenario where we have two PPP links making up a bundle: a slow link (10KB/sec) and a fast link (1000KB/sec) working at the best (full bandwidth). On the top we have a TCP/IP stack sending a 1000 Bytes sk_buff buffer down to the PPP subsystem. The "ppp_mp_explode" function will divide the buffer in two fragments of 500B each (we are neglecting all the headers, crc, flags etc?.). Before the TCP/IP stack sends out the next buffer, it will have to wait for the ACK response from the remote peer, so it will have to wait for both fragments to have been sent over the two PPP links, received by the remote peer and reconstructed. The resulting behaviour is that, rather than having a bundle working @1010KB/sec (the sum of the channels bandwidths), we'll have a bundle working @20KB/sec (the double of the slowest channels bandwidth). Problem Solution: The problem has been solved by redesigning the "ppp_mp_explode" function in such a way to make it split the sk_buff buffer according to the speeds of the underlying PPP channels (the speeds of the serial interfaces respectively attached to the PPP channels). Referring to the above example, the redesigned "ppp_mp_explode" function will now divide the 1000 Bytes buffer into two fragments whose sizes are set according to the speeds of the channels where they are going to be sent on (e.g . 10 Byets on 10KB/sec channel and 990 Bytes on 1000KB/sec channel). The reworked function grants the same performances of the original one in optimal working conditions (i.e. a bundle made up of PPP links all working at the same speed), while greatly improving performances on the bundles made up of channels working at different speeds. Signed-off-by: Gabriele Paoloni Signed-off-by: David S. Miller commit a2025b8b1039e5abaa38319b2eaab3b17867479a Author: Roel Kluin Date: Fri Mar 13 16:05:14 2009 -0700 tcp: '< 0' test on unsigned promote 'cnt' to size_t, to match 'len'. Signed-off-by: Roel Kluin Signed-off-by: David S. Miller commit 8db09f26f912f7c90c764806e804b558da520d4f Author: Roel Kluin Date: Fri Mar 13 16:04:12 2009 -0700 x25: '< 0' and '>= 0' test on unsigned skb->len is an unsigned int, so the test in x25_rx_call_request() always evaluates to true. len in x25_sendmsg() is unsigned as well. so -ERRORS returned by x25_output() are not noticed. Signed-off-by: Roel Kluin Signed-off-by: David S. Miller commit 73ce7b01b4496a5fbf9caf63033c874be692333f Author: Denys Fedoryshchenko Date: Fri Mar 13 16:02:07 2009 -0700 ipv4: arp announce, arp_proxy and windows ip conflict verification Windows (XP at least) hosts on boot, with configured static ip, performing address conflict detection, which is defined in RFC3927. Here is quote of important information: " An ARP announcement is identical to the ARP Probe described above, except that now the sender and target IP addresses are both set to the host's newly selected IPv4 address. " But it same time this goes wrong with RFC5227. " The 'sender IP address' field MUST be set to all zeroes; this is to avoid polluting ARP caches in other hosts on the same link in the case where the address turns out to be already in use by another host. " When ARP proxy configured, it must not answer to both cases, because it is address conflict verification in any case. For Windows it is just causing to detect false "ip conflict". Already there is code for RFC5227, so just trivially we just check also if source ip == target ip. Signed-off-by: Denys Fedoryshchenko Signed-off-by: David S. Miller commit 1f8ae0a21d83f43006d7f6d2862e921dbf2eeddd Author: Tomasz Lemiech Date: Fri Mar 13 15:43:38 2009 -0700 tulip: Fix for MTU problems with 802.1q tagged frames The original patch was submitted last year but wasn't discussed or applied because of missing maintainer's CCs. I only fixed some formatting errors, but as I saw tulip is very badly formatted and needs further work. Original description: This patch fixes MTU problem, which occurs when using 802.1q VLANs. We should allow receiving frames of up to 1518 bytes in length, instead of 1514. Based on patch written by Ben McKeegan for 2.4.x kernels. It is archived at http://www.candelatech.com/~greear/vlan/howto.html#tulip I've adjusted a few things to make it apply on 2.6.x kernels. Tested on D-Link DFE-570TX quad-fastethernet card. Signed-off-by: Tomasz Lemiech Signed-off-by: Ivan Vecera Signed-off-by: Ben McKeegan Acked-by: Grant Grundler Signed-off-by: David S. Miller commit a390d1f379cf821248b735f43d2e1147ebb8241d Author: Marcin Slusarz Date: Fri Mar 13 15:41:19 2009 -0700 phylib: convert state_queue work to delayed_work It closes a race in phy_stop_machine when reprogramming of phy_timer (from phy_state_machine) happens between del_timer_sync and cancel_work_sync. Without this change it could lead to crash if phy_device would be freed after phy_stop_machine (timer would fire and schedule freed work). Signed-off-by: Marcin Slusarz Acked-by: Jean Delvare Signed-off-by: David S. Miller commit 34cd347cec6dba8075ceca06efd4fb0c6574cb75 Author: Pavel Roskin Date: Fri Mar 13 14:17:16 2009 -0700 bmac: remove unused variable bp in bmac_misc_intr() From: Pavel Roskin Signed-off-by: David S. Miller commit 52e21b1bd96444c452f6eab7dc438a8a898aa14a Author: Jan-Bernd Themann Date: Fri Mar 13 13:50:40 2009 -0700 ehea: fix circular locking problem This patch fixes the circular locking problem by changing the locking strategy concerning the logging of firmware handles. Signed-off-by: Jan-Bernd Themann Signed-off-by: David S. Miller commit f9ac30f080d23ef0a2d4a1b7c6806c9a21c0f324 Author: Eric Biederman Date: Fri Mar 13 13:16:13 2009 -0700 macvlan: Deterministic ingress packet delivery Changing the mac address when a macvlan device is up will leave the device on the wrong hash chain making it impossible to receive packets. There is no checking of the mac address set on the macvlan. Allowing a misconfiguration to grab packets from the the underlying device or another macvlan. To resolve these problems I update the hash table of macvlans when the mac address of a macvlan changes, and when updating the hash table I verify that the new mac address is usable. The result is well defined and predictable if not perfect handling of mac vlan mac addresses. To keep the code clear I have created a set of hash table maintenance in macvlan so I am not open coding the hash function and the logic needed to update the hash table all over the place. Signed-off-by: Eric Biederman Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit b0832a2961022a076c812384435b5f0290b3fc91 Author: Eric Biederman Date: Fri Mar 13 13:15:37 2009 -0700 macvlan: Support creating macvlans from macvlans When running in a network namespace whose only link to the outside world is a macvlan device, not being able to create another macvlan is a real pain. So modify macvlan creation to allow automatically forward a creation of a macvlan on a macvlan to become a creation of a macvlan on the underlying network device. Signed-off-by: Eric Biederman Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit f7efb6ccc2113911e4e064f78bcd0343c4673038 Author: Steve Glendinning Date: Wed Mar 4 07:33:25 2009 +0000 smsc911x: improve EEPROM loading timeout logic in open This patch from Juha Leppanen suppresses a false warning if the eeprom load succeeds on the very last attempt. Juha> In function smsc911x_open smsc911x_reg_read+udelay can be run 50 Juha> times with timeout reaching -1, and the following if statetement Juha> does not catch the timeout and no warning is issued. Also if the Juha> 50th smsc911x_reg_read is GOOD, loop is exited with timeout as 0 Juha> and bogus warning issued. Replace testing order and --timeout Juha> instead of timeout-- and now max 50 smsc911x_reg_read's are done, Juha> with max 49 udelays. Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit 8dacd548129d03e87751f75ea83b42a8a17ee651 Author: Steve Glendinning Date: Wed Mar 4 07:33:24 2009 +0000 smsc911x: check for FFWD success before checking for timeout This patch from Juha Leppanen suppresses a false warning if a fast forward operation succeeds on the very last attempt. Juha> If smsc911x_reg_read loop is executed 500 times, timeout reaches 0 Juha> and the 500th smsc911x_reg_read result in val is ignored. If Juha> testing order is changed, then val is checked first. The 500th Juha> reg_read might be GOOD, why ignore it! Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit 273ae44b9cb9443e0b5265cdc99f127ddb95c8db Author: Neil Horman Date: Wed Mar 11 09:53:16 2009 +0000 Network Drop Monitor: Adding Build changes to enable drop monitor Network Drop Monitor: Adding Build changes to enable drop monitor Signed-off-by: Neil Horman include/linux/Kbuild | 1 + net/Kconfig | 11 +++++++++++ net/core/Makefile | 1 + 3 files changed, 13 insertions(+) Signed-off-by: David S. Miller commit 9a8afc8d3962f3ed26fd6b56db34133860ed1e72 Author: Neil Horman Date: Wed Mar 11 09:51:26 2009 +0000 Network Drop Monitor: Adding drop monitor implementation & Netlink protocol Signed-off-by: Neil Horman include/linux/net_dropmon.h | 56 +++++++++ net/core/drop_monitor.c | 263 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 319 insertions(+) Signed-off-by: David S. Miller commit ead2ceb0ec9f85cff19c43b5cdb2f8a054484431 Author: Neil Horman Date: Wed Mar 11 09:49:55 2009 +0000 Network Drop Monitor: Adding kfree_skb_clean for non-drops and modifying end-of-line points for skbs Signed-off-by: Neil Horman include/linux/skbuff.h | 4 +++- net/core/datagram.c | 2 +- net/core/skbuff.c | 22 ++++++++++++++++++++++ net/ipv4/arp.c | 2 +- net/ipv4/udp.c | 2 +- net/packet/af_packet.c | 2 +- 6 files changed, 29 insertions(+), 5 deletions(-) Signed-off-by: David S. Miller commit 4893d39e865b2897bf9fcd329697d37032d853a1 Author: Neil Horman Date: Wed Mar 11 09:48:26 2009 +0000 Network Drop Monitor: Add trace declaration for skb frees Signed-off-by: Neil Horman include/trace/skb.h | 8 ++++++++ net/core/Makefile | 2 ++ net/core/net-traces.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+) Signed-off-by: David S. Miller commit 26ccfc37da21e6f02d5e805c38ca7551c16b2fe0 Author: Andy Fleming Date: Tue Mar 10 12:58:28 2009 +0000 gianfar: Convert to use netdev_ops Signed-off-by: Andy Fleming Signed-off-by: David S. Miller commit db46db157746e57fb1ca59223bf0f72d9f875d89 Author: Andy Fleming Date: Tue Mar 10 12:58:27 2009 +0000 gianfar: remove gianfar_mii.c commit 1577ecef766650a57fceb171acee2b13cbfaf1d3 Author: Andy Fleming Date: Wed Feb 4 16:42:12 2009 -0800 netdev: Merge UCC and gianfar MDIO bus drivers left out the deletion of gianfar_mii.c. Signed-off-by: Andy Fleming Signed-off-by: David S. Miller commit bda6a15a0d283d531b865fb7c596bb3ff258e87e Author: Jiri Pirko Date: Fri Mar 13 11:48:18 2009 -0700 8139too: allow to set mac address on running device Similar patch as for 8139cp posted yesterday, so the same comment: So far there was not a chance to set a mac address on running 8139too device. This is for example needed when you want to use this NIC as a bonding slave in bonding device in mode balance-alb. This simple patch allows it. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit c048aaf4ca854fa67a3bfa9dab5b9ddc5083b3b7 Author: Jiri Pirko Date: Fri Mar 13 11:47:48 2009 -0700 8139cp: allow to set mac address on running device So far there was not a chance to set a mac address on running 8139cp device. This is for example needed when you want to use this NIC as a bonding slave in bonding device in mode balance-alb. This simple patch allows it. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 6fc791ee631728b2beddda87560f1af59e32230e Author: malc Date: Thu Mar 12 09:49:20 2009 +0000 sctp: add Adaptation Layer Indication parameter only when it's set RFC5061 states: Each adaptation layer that is defined that wishes to use this parameter MUST specify an adaptation code point in an appropriate RFC defining its use and meaning. If the user has not set one - assume they don't want to sent the param with a zero Adaptation Code Point. Rationale - Currently the IANA defines zero as reserved - and 1 as the only valid value - so we consider zero to be unset - to save adding a boolean to the socket structure. Including this parameter unconditionally causes endpoints that do not understand it to report errors unnecessarily. Signed-off-by: Malcolm Lashley Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 76595024ffab3599bd28ea014f6c23c1a8c8dd2c Author: Wei Yongjun Date: Thu Mar 12 09:49:19 2009 +0000 sctp: fix to send FORWARD-TSN chunk only if peer has such capable RFC3758 Section 3.3.1. Sending Forward-TSN-Supported param in INIT Note that if the endpoint chooses NOT to include the parameter, then at no time during the life of the association can it send or process a FORWARD TSN. If peer does not support PR-SCTP capable, don't send FORWARD-TSN chunk to peer. Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 5ffad5acebec735b7a368851bf22394b734cae8a Author: Wei Yongjun Date: Thu Mar 12 09:49:18 2009 +0000 sctp: fix to indicate ASCONF support in INIT-ACK only if peer has such capable This patch fix to indicate ASCONF support in INIT-ACK only if peer has such capable. This patch also fix to calc the chunk size if peer has no FWD-TSN capable. Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 5e8f3f703ae4e4af65e2695e486b3cd198328863 Author: Vlad Yasevich Date: Thu Mar 12 09:49:17 2009 +0000 sctp: simplify sctp listening code sctp_inet_listen() call is split between UDP and TCP style. Looking at the code, the two functions are almost the same and can be merged into a single helper. This also fixes a bug that was fixed in the UDP function, but missed in the TCP function. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 3bcb1255bae39cae1b4d2660f2b5a6ab2f404c10 Author: Divy Le Ray Date: Thu Mar 12 21:14:29 2009 +0000 cxgb3: update driver version update driver version to 1.1.1-ko Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit d9507a532acd25588b0d7957c660da35de41701b Author: Divy Le Ray Date: Thu Mar 12 21:14:24 2009 +0000 cxgb3: update FW Update FW to 7.1 Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit bf792094ef830117312b3990b63474320ec864c0 Author: Divy Le Ray Date: Thu Mar 12 21:14:19 2009 +0000 cxgb3: detect mac link faults. The driver currently ignores the local or remote link faults raised at the mac layer. This patch fixes it. Our mac however only advertizes link events, so wait for the phy to stabilize the link, then enable mac link events interrupts. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit cd40658a616050df0a50d0a3ded06e3ebcc0a04a Author: Divy Le Ray Date: Thu Mar 12 21:14:14 2009 +0000 cxgb3: Update Rev3 mac workaround Update the heurstics workaround unlocking a hung mac: - reduce Tx mac toggling by enabling Tx drain before resetting the mac - Take Tx (lack of) activity in account only - Update the monitoring counter range to 64 bits Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit fc88219601aa3f94def89433a6afde154e8faa8c Author: Divy Le Ray Date: Thu Mar 12 21:14:09 2009 +0000 cxgb3: disable high freq non-data interrupts Under RX pressure, The HW might generate a high load of interrupts to signal mac fifo or free lists overflow. Disable the interrupts, and poll the relevant status bits to maintain stats. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit 42c8ea17e8f78752ed5a354791b0ea1697dc3480 Author: Divy Le Ray Date: Thu Mar 12 21:14:04 2009 +0000 cxgb3: separate TX and RX reclaim handlers Separate TX and RX reclaim handlers Don't disable interrupts in RX reclaim handler. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit b2b964f0647c5156038834dd879f90442e33f2a5 Author: Divy Le Ray Date: Thu Mar 12 21:13:59 2009 +0000 cxgb3: prefetch buffer access in GRO mode Elmininate a cache miss when accessing the CPL header within the first aggregated buffer. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit 8f4358044d7d694f2e0c18a6ce5db6ec0790451a Author: Divy Le Ray Date: Thu Mar 12 21:13:54 2009 +0000 cxgb3: fix skb truesize in jumbo mode Update skb truesize correctly for the 2nd buffer from a Jumbo frame Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit 9bb2b31e6f87dba06b81429af91362a9127f5bf2 Author: Divy Le Ray Date: Thu Mar 12 21:13:49 2009 +0000 cxgb3: release page ref on mapping error Release page chunk reference in case we fail to map it. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit 26b3871d2c82b7c733a3b6d631a6e48c9ebf1c5a Author: Divy Le Ray Date: Thu Mar 12 21:13:43 2009 +0000 cxgb3: ring rx door bell less frequently Ring free lists door bell less frequently, specifically every quarter of the active FL size. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit 58d8395b74f78a2f4225c5faea8b5bffb8af1cf9 Author: Takashi Iwai Date: Fri Mar 13 17:04:34 2009 +0100 ALSA: hda - Add another HP model with IDT92HD71bx codec HP laptops require GPIO0 on as EAPD. Signed-off-by: Takashi Iwai commit cb065c06b6cc615a58860d619d7fa7952cd6a18b Author: Thomas Gleixner Date: Fri Mar 13 14:40:27 2009 +0100 genirq: deprecate obsolete typedefs and defines More than two years is enough migration time. Remove the compability cruft. Signed-off-by: Thomas Gleixner commit 0e57aa11abb15b70db53d1f95ae70b3c980ac885 Author: Thomas Gleixner Date: Fri Mar 13 14:34:05 2009 +0100 genirq: deprecate __do_IRQ Two years migration time is enough. Remove the compability cruft. Add the deprecated warning in kernel/irq/handle.c because marking __do_IRQ itself is way too noisy. Signed-off-by: Thomas Gleixner commit a9d0a1a38352c4fb8946e73b3e42ba4ada29e733 Author: Thomas Gleixner Date: Tue Mar 3 16:58:16 2009 +0100 genirq: add doc to struct irqaction Impact: documentation struct irqaction is not documented. Add kernel doc comments and add interrupt.h to the genirq docbook. Signed-off-by: Thomas Gleixner commit 4553573277906901f62f73c0432b332c53de5e2c Author: Thomas Gleixner Date: Sun Feb 22 23:00:32 2009 +0100 genirq: use kzalloc instead of explicit zero initialization Impact: simplification Signed-off-by: Thomas Gleixner Reviewed-by: Peter Zijlstra commit bedd30d986a05e32dc3eab874e4b9ed8a38058bb Author: Thomas Gleixner Date: Tue Sep 30 23:14:27 2008 +0200 genirq: make irqreturn_t an enum Impact: cleanup Remove the 2.4 compabiliy cruft Signed-off-by: Thomas Gleixner Reviewed-by: Peter Zijlstra commit c8e2aeef0b8ac9fb8821b8b3734c031579d0b77a Author: Thomas Gleixner Date: Mon Mar 9 20:26:23 2009 +0100 genirq: remove redundant if condition Impact: cleanup The code is only compiled if CONFIG_GENERIC_HARDIRQS=y so another check for this define in the code is redundant. Remove it. Signed-off-by: Thomas Gleixner commit 3dd3d46b78c22503957230ca5981849b7bb29b9a Author: Thomas Gleixner Date: Mon Mar 9 21:48:32 2009 +0100 genirq: remove unused hw_irq_controller typedef hw_irq_controller is unused. Remove the typedef Impact: cleanup Signed-off-by: Thomas Gleixner commit 72d7466468b471f99cefae3c5f4a414bbbaa0bdd Author: Daniel Mack Date: Thu Mar 12 11:27:49 2009 +0100 ASoC: switch PXA SSP driver from network mode to PSP This switches the pxa ssp port usage from network mode to PSP mode. Removed some comments and checks for configured TDM channels. A special case is added to support configuration where BCLK = 64fs. We need to do some black magic in this case which doesn't look nice but there is unfortunately no other option than that. Diagnosed-by: Tim Ruetz Signed-off-by: Daniel Mack Signed-off-by: Mark Brown commit 77dd7e17b86bd81b3638e01d784a72652071508b Author: Lopez Cruz, Misael Date: Thu Mar 12 21:45:27 2009 -0500 ASoC: Move headset jack registration to device initialization for SDP3430 Move headset jack registration to the codec/machine specific initialization. Having the jack registration in machine init causes that the jack device gets initialized but not registered since the sound card is registered before the jack. Moving jack registration to device initialization will register the jack device along with all other devices associated to the card when the card is registed. As a consequence of jack device registered properly, the jack is detected as an input device. Signed-off-by: Misael Lopez Cruz Signed-off-by: Mark Brown commit bb6ac72fb19c6676eb8bafa8e3b8bf970a2294a2 Author: Takashi Iwai Date: Fri Mar 13 09:02:42 2009 +0100 ALSA: hda - power up before codec initialization Change the power state of each widget before starting the initialization work so that all verbs are executed properly. Also, keep power-up during hwdep reconfiguration. Signed-off-by: Takashi Iwai commit f6411fe7e09b67470a2569231d6fa566c7c29b8b Merge: df1c99d... f24ade3... 9ead649... Author: Ingo Molnar Date: Fri Mar 13 04:50:44 2009 +0100 Merge branches 'sched/clock', 'sched/urgent' and 'linus' into sched/core commit 307282c8990c5658604b9fda8a64a9a07079b850 Author: Takashi Iwai Date: Thu Mar 12 18:17:58 2009 +0100 ALSA: hda - Add model=vaio for STAC9872 Add the default pin config for model=vaio (in case of broken BIOS). Signed-off-by: Takashi Iwai commit 9421f9543b3a0a870499f64498406003de8214b4 Author: Takashi Iwai Date: Thu Mar 12 17:06:07 2009 +0100 ALSA: hda - Print multiple out-amp values of pin widgets on Conext codecs Add a flag to work around the non-standard amp-value handling on Conexant codecs. Signed-off-by: Takashi Iwai commit 3b7523fc828e41b2988feb400704e01b67859d78 Author: Takashi Iwai Date: Thu Mar 12 16:45:01 2009 +0100 ALSA: hda - Add comments for the previous fix for conexant codecs Signed-off-by: Takashi Iwai commit eb5f6d753e337834c7ceb07824ee472e43d9a7a2 Author: Philipp Zabel Date: Thu Mar 12 11:07:54 2009 +0100 ASoC: Replace remaining uses of snd_soc_cnew with snd_soc_add_controls. The drivers are basically duplicating the same code over and over. As snd_soc_cnew is going to be made static some time after the next merge window, we might as well convert them now. Signed-off-by: Philipp Zabel Signed-off-by: Mark Brown commit 6f7cb44ba1a5195bf719f9ba1d57bd79e13262c1 Author: Mark Brown Date: Wed Mar 11 18:31:08 2009 +0000 ASoC: Move WM8580 to normal I2C device probe Refactor the WM8580 device registration to probe via standard I2C device registration, registering the DAIs once the device has probed via I2C. Signed-off-by: Mark Brown commit 5d75bc557859805f00eeddb09d7cc8ffc7e5334e Author: Gregorio Guidi Date: Thu Mar 12 16:41:51 2009 +0100 ALSA: hda - fix headphone settings and master volume (Conexant CX20551) Update the places where the 0x1d widget is used for Conexant 5047, fixing mismatch introduced after changing the connection. Signed-off-by: Gregorio Guidi Signed-off-by: Takashi Iwai commit eb53b4e8fef10ccccb49a6dbb5e19ca84ba5a305 Author: Magnus Damm Date: Thu Mar 12 21:05:59 2009 +0900 irq: export remove_irq() and setup_irq() symbols Export the setup_irq() and remove_irq() symbols. I'd like to export these functions since I have timer code that needs to use setup_irq() early on (too early for request_irq()), and the same code can also be compiled as a module. Signed-off-by: Magnus Damm LKML-Reference: <20090312120559.2926.82371.sendpatchset@rx1.opensource.se> [ changed to _GPL as these are special APIs deep inside the irq layer. ] Signed-off-by: Ingo Molnar commit cbf94f06824780183e4bba165c7c29d5c7bd9a51 Author: Magnus Damm Date: Thu Mar 12 21:05:51 2009 +0900 irq: match remove_irq() args with setup_irq() Modify remove_irq() to match setup_irq(). Signed-off-by: Magnus Damm LKML-Reference: <20090312120551.2926.43942.sendpatchset@rx1.opensource.se> Signed-off-by: Ingo Molnar commit f21cfb258df6dd3ea0b3e56d75c7e994edb81b35 Author: Magnus Damm Date: Thu Mar 12 21:05:42 2009 +0900 irq: add remove_irq() for freeing of setup_irq() irqs Impact: add new API This patch adds a remove_irq() function for releasing interrupts requested with setup_irq(). Without this patch we have no way of releasing such interrupts since free_irq() today tries to kfree() the irqaction passed with setup_irq(). Signed-off-by: Magnus Damm LKML-Reference: <20090312120542.2926.56609.sendpatchset@rx1.opensource.se> Signed-off-by: Ingo Molnar commit f8cb22cbb8383c9f41e6ccbcd4fb94edb1048bda Merge: 044d408... ebdcc81... Author: Ingo Molnar Date: Thu Mar 12 13:16:18 2009 +0100 Merge branch 'linus' into irq/genirq commit ff5e2b4732b8386d8354da2cdf7c146487f51736 Author: Randy Dunlap Date: Wed Mar 11 23:24:03 2009 -0700 wimax: fix i2400m printk formats Fix printk format warnings: drivers/net/wimax/i2400m/netdev.c:523: warning: format '%zu' expects type 'size_t', but argument 7 has type 'unsigned int' drivers/net/wimax/i2400m/netdev.c:548: warning: format '%zu' expects type 'size_t', but argument 7 has type 'unsigned int' Signed-off-by: Randy Dunlap Signed-off-by: Inaky Perez-Gonzalez Signed-off-by: David S. Miller commit 64cc2c63694a03393985ffc8b178e72f52dd8a06 Author: Steve French Date: Wed Mar 4 19:54:08 2009 +0000 [CIFS] work around bug in Samba server handling for posix open Samba server (version 3.3.1 and earlier, and 3.2.8 and earlier) incorrectly required the O_CREAT flag on posix open (even when a file was not being created). This disables posix open (create is still ok) after the first attempt returns EINVAL (and logs an error, once, recommending that they update their server). Acked-by: Jeff Layton Signed-off-by: Steve French commit 276a74a4835ad86d6da42f3a084b060afc5656e8 Author: Steve French Date: Tue Mar 3 18:00:34 2009 +0000 [CIFS] Use posix open on file open when server supports it Signed-off-by: Steve French commit fcc7c09d94be7b75c9ea2beb22d0fae191c6b4b9 Author: Jeff Layton Date: Sat Feb 28 12:59:03 2009 -0500 cifs: fix buffer format byte on NT Rename/hardlink Discovered at Connnectathon 2009... The buffer format byte and the pad are transposed in NT_RENAME calls (which are used to set hardlinks). Most servers seem to ignore this fact, but NetApp filers throw back an error due to this problem. This patch fixes it. CC: Stable Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 0382457744969b0a3aa39ba997944903c5972cbc Author: Steve French Date: Wed Feb 25 16:24:04 2009 +0000 [CIFS] Add definitions for remoteably fsctl calls There are about 60 fsctl calls which Windows claims would be able to be sent remotely and handled by the server. This adds the #defines for them. A few of them look immediately useful, but need to also add the structure definitions for them so they can be sent as SMBs. Signed-off-by: Steve French commit 1adcb71092f6461c4002ccf29d316f6da3e1f39b Author: Steve French Date: Wed Feb 25 14:19:56 2009 +0000 [CIFS] add extra null attr check Although attr == NULL can not happen, this makes cifs_set_file_info safer in the future since it may not be obvious that the caller can not set attr to NULL. Signed-off-by: Steve French commit 4717bed6806dab0270e5bfbc45e9f999e63ededd Author: Steve French Date: Tue Feb 24 14:44:19 2009 +0000 [CIFS] fix build error Signed-off-by: Steve French commit 7fc8f4e95bf9564045985bb206af8e28a5e4e28f Author: Steve French Date: Mon Feb 23 20:43:11 2009 +0000 [CIFS] reopen file via newer posix open protocol operation if available If the network connection crashes, and we have to reopen files, preferentially use the newer cifs posix open protocol operation if the server supports it. Signed-off-by: Steve French commit be652445fdccb8e5d4391928c3b45324ea37f9e1 Author: Steve French Date: Mon Feb 23 15:21:59 2009 +0000 [CIFS] Add new nostrictsync cifs mount option to avoid slow SMB flush If this mount option is set, when an application does an fsync call then the cifs client does not send an SMB Flush to the server (to force the server to write all dirty data for this file immediately to disk), although cifs still sends all dirty (cached) file data to the server and waits for the server to respond to the write write. Since SMB Flush can be very slow, and some servers may be reliable enough (to risk delaying slightly flushing the data to disk on the server), turning on this option may be useful to improve performance for applications that fsync too much, at a small risk of server crash. If this mount option is not set, by default cifs will send an SMB flush request (and wait for a response) on every fsync call. Signed-off-by: Steve French commit 10e70afa75c90702b2326abaaa757d6b7835636f Author: Steve French Date: Sun Feb 22 01:33:07 2009 +0000 [CIFS] DFS no longer experimental Also updates some DFS flag definitions Signed-off-by: Steve French commit b298f223559e0205244f553ceef8c7df3674da74 Author: Steve French Date: Sat Feb 21 21:17:43 2009 +0000 [CIFS] Send SMB flush in cifs_fsync In contrast to the now-obsolete smbfs, cifs does not send SMB_COM_FLUSH in response to an explicit fsync(2) to guarantee that all volatile data is written to stable storage on the server side, provided the server honors the request (which, to my knowledge, is true for Windows and Samba with 'strict sync' enabled). This patch modifies the cifs_fsync implementation to restore the fsync-behavior of smbfs by triggering SMB_COM_FLUSH after sending outstanding data on the client side to the server. Signed-off-by: Horst Reiterer Acked-by: Jeff Layton Signed-off-by: Steve French commit 793730bfb6711d6d14629e63845c25a3c14d205e Author: Yevgeny Petrilin Date: Wed Mar 11 15:47:18 2009 -0700 mlx4_core: Don't perform SET_PORT command for Ethernet ports The same operation is performed when the Ethernet driver initializes the port. Signed-off-by: Yevgeny Petrilin Signed-off-by: Roland Dreier commit 2a9f0ba7a976bc2b1bcf9156c1e57ffbc8f8fb64 Merge: 65ec1cd... 603b6fd... Author: Mark Brown Date: Wed Mar 11 18:30:48 2009 +0000 Merge branch 's3c-iis-header' into for-2.6.30 commit 603b6fd5b8d313a109d3739d8706ee51962ff402 Author: Mark Brown Date: Wed Mar 11 18:28:24 2009 +0000 [ARM] Revert futher extraneous changes from the S3C header move Can't see any immediate need for these; build tested. Signed-off-by: Mark Brown commit 65ec1cd1e2c6228752d2f167b01e6d291014d249 Merge: 5314adc... 6335d05... Author: Mark Brown Date: Wed Mar 11 16:51:31 2009 +0000 ASoC: Merge dai_ops factor out Merge Eric Maio's patch to merge snd_soc_dai_ops out of line. Fixed merge issues and updated drivers, plus an issue with the ops for the two s3c2443 AC97 DAIs having been merged. Signed-off-by: Mark Brown commit 5314adc3612d893c7cc526b3312d124805e45bc3 Author: Mark Brown Date: Wed Mar 11 16:28:29 2009 +0000 ASoC: Fix formats for s3c24xx-i2s register prints The register values are all u32 so don't need the long format. Signed-off-by: Mark Brown commit fc1ad92dfc4e363a055053746552cdb445ba5c57 Author: Eric Dumazet Date: Wed Mar 11 09:23:57 2009 -0700 tcp: allow timestamps even if SYN packet has tsval=0 Some systems send SYN packets with apparently wrong RFC1323 timestamp option values [timestamp tsval=0 tsecr=0]. It might be for security reasons (http://www.secuobs.com/plugs/25220.shtml ) Linux TCP stack ignores this option and sends back a SYN+ACK packet without timestamp option, thus many TCP flows cannot use timestamps and lose some benefit of RFC1323. Other operating systems seem to not care about initial tsval value, and let tcp flows to negotiate timestamp option. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 908002161247e6e68c478052926b62d9a3d72418 Author: Herbert Xu Date: Wed Mar 11 23:18:32 2009 +0800 nlattr: Fix build error with NET off We moved the netlink attribute support from net to lib in order for it to be available for general consumption. However, parts of the code (the bits that we don't need :) really depends on NET because the target object is sk_buff. This patch fixes this by wrapping them in CONFIG_NET. Some EXPORTs have been moved to make this work. Tested-by: Geert Uytterhoeven Signed-off-by: Herbert Xu commit 02b7cbc3994622900e8fc201f5f229b591c43628 Author: Mark Brown Date: Wed Mar 11 14:12:28 2009 +0000 ASoC: Remove version display from WM8580 driver Signed-off-by: Mark Brown commit aaf1e176fa9a96fe1eea33b710684bba066aedc1 Author: Mark Brown Date: Tue Mar 10 10:55:15 2009 +0000 ASoC: Add initial driver for the WM8400 CODEC The WM8400 is a highly integrated audio CODEC and power management unit intended for mobile multimedia application. This driver supports the primary audio CODEC features, including: - 1W speaker driver - Fully differential headphone output - Up to 4 differential microphone inputs Signed-off-by: Mark Brown commit 5706d5013212c8afcb9fe5332ee6442488280c66 Author: David Brownell Date: Wed Mar 11 02:37:25 2009 -0800 ASoC: buildfix for OSK Buildfix: CC sound/soc/omap/osk5912.o sound/soc/omap/osk5912.c: In function 'osk_soc_init': sound/soc/omap/osk5912.c:189: error: implicit declaration of function 'clk_get_usecount' make[3]: *** [sound/soc/omap/osk5912.o] Error 1 There's no such (standard) clock interface. Signed-off-by: David Brownell Signed-off-by: Mark Brown commit 3c081384007332ab95c8d8753f47719d6646bcb2 Merge: f455dfb... a2b0346... Author: Mark Brown Date: Wed Mar 11 11:12:48 2009 +0000 Merge branch 's3c-iis-header' into for-2.6.30 Conflicts: arch/arm/mach-shark/include/mach/io.h commit a2b03461cb072eb6097a55ec0289294b09382284 Author: Mark Brown Date: Wed Mar 11 11:02:33 2009 +0000 [ARM] Revert extraneous changes from the S3C audio header move These changes were included in the S3C audio header move but are not directly related to it. Signed-off-by: Mark Brown commit df1c99d416500da8d26a4d78777467c53ee7689e Author: Mike Galbraith Date: Tue Mar 10 19:08:11 2009 +0100 sched: add avg_overlap decay Impact: more precise avg_overlap metric - better load-balancing avg_overlap is used to measure the runtime overlap of the waker and wakee. However, when a process changes behaviour, eg a pipe becomes un-congested and we don't need to go to sleep after a wakeup for a while, the avg_overlap value grows stale. When running we use the avg runtime between preemption as a measure for avg_overlap since the amount of runtime can be correlated to cache footprint. The longer we run, the less likely we'll be wanting to be migrated to another CPU. Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1236709131.25234.576.camel@laptop> Signed-off-by: Ingo Molnar commit 78a05b522044a50dc2a6811d10b9ee3f7c3e78f8 Author: Takashi Iwai Date: Wed Mar 11 09:52:28 2009 +0100 ALSA: Use define for ioctl definitions Use define instead of enum for ioctl definitions since strace can't parse ioctls defined via enum properly. Signed-off-by: Takashi Iwai commit 47e78ecc2adb778c7d2b54924e90433a0182a6ba Author: Takashi Iwai Date: Wed Mar 11 09:50:19 2009 +0100 ALSA: Remove obsolete snd_xferv struct and ioctls Removed obsleted snd_xferv struct and ioctls that are no longer used in the current codebase. Signed-off-by: Takashi Iwai commit 600fa578a95f65bc1f2a03210d3d418747024b43 Author: Magnus Damm Date: Wed Mar 11 08:14:26 2009 +0000 sh: improve sh7785lcr power off code Improve the sh7785lcr power off implementation to never return. It takes some time before the board is actually powered off, just hang after asking the harware to power down. This removes the serial port garbage printout. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 49976927de5c52c415d4809c7d56700cc8ff4215 Author: Magnus Damm Date: Wed Mar 11 08:04:23 2009 +0000 input: sh_keysc suspend can use to_platform_device() This patch changes sh_keysc to use to_platform_device() for suspend. Thanks to Trilok Soni for this suggestion. Signed-off-by: Magnus Damm Reviewed-by: Trilok Soni Signed-off-by: Paul Mundt commit 4a55026fd7a08074676e87932578ff9e327e82a3 Author: Francesco VIRLINZI Date: Wed Mar 11 07:42:05 2009 +0000 sh: clkfwk: Add resume from hibernation support. This patch adds PM support to the clock framework. With this, resume from hibernation is properly supported. Signed-off-by: Francesco Virlinzi Signed-off-by: Paul Mundt commit d680c76eccd9222031ee30dcee5fdedba2467610 Author: Francesco VIRLINZI Date: Wed Mar 11 07:40:54 2009 +0000 sh: clkfwk: add clk_set_parent/clk_get_parent This patch adds the clk_set_parent/clk_get_parent routines to the sh clock framework. Signed-off-by: Francesco Virlinzi Signed-off-by: Paul Mundt commit f455dfb106916d855d59686fe16575c2ceb2cb2a Author: Mark Brown Date: Tue Mar 10 19:51:07 2009 +0000 ASoC: Fix up merge with the ARM tree The same change has been made with the final lines in slightly differnet orders. Signed-off-by: Mark Brown commit cbf1146d5ee113152c5cdeb54ff9d4b2f0c91736 Author: Daniel Mack Date: Tue Mar 10 16:41:00 2009 +0100 ASoC: don't touch pxa-ssp registers when stream is running In pxa_ssp_set_dai_fmt(), check whether there is anything to do at all. If there would be but the SSP port is in use already, bail out. Signed-off-by: Daniel Mack Signed-off-by: Mark Brown commit f24ade3a3332811a512ed3b6c6aa69486719b1d8 Author: Ingo Molnar Date: Tue Mar 10 19:02:30 2009 +0100 x86, sched_clock(): mark variables read-mostly Impact: micro-optimization There's a number of variables in the sched_clock() path that are in .data/.bss - but not marked __read_mostly. This creates the danger of accidental false cacheline sharing with some other, write-often variable. So mark them __read_mostly. Signed-off-by: Ingo Molnar commit 57310a98a354e84279d7c8af2f48805a62372e53 Author: Peter Zijlstra Date: Mon Mar 9 13:56:21 2009 +0100 sched: optimize ttwu vs group scheduling Impact: micro-optimization We can avoid the sched domain walk on try_to_wake_up() when we know there are no groups. Signed-off-by: Peter Zijlstra LKML-Reference: <1236603381.8389.455.camel@laptop> Signed-off-by: Ingo Molnar commit 090cec81ae9b4ff0c1d301b722f0e6c5fb72d8f9 Author: Hugo Villeneuve Date: Mon Mar 9 23:32:08 2009 -0400 ALSA: ASoC: Davinci: Updated sffsdr_hw_params() function to new format Signed-off-by: Hugo Villeneuve Signed-off-by: Mark Brown commit 14cbba89ae967d2e9106a80b270b078d7699109a Author: Hugo Villeneuve Date: Mon Mar 9 23:32:07 2009 -0400 ALSA: ASoC: Davinci: Replaced DAI format RIGHT_J by DSP_B for SFFSDR Signed-off-by: Hugo Villeneuve Signed-off-by: Mark Brown commit b3d7e3c99d855faf093b06dc381b821a9d8d3c23 Merge: eac8473... 0a4e1c9... Author: Mark Brown Date: Tue Mar 10 15:42:03 2009 +0000 Merge commit 'takashi/topic/asoc' into for-2.6.30 commit 8c54436ae9f59146b3d02820a3ebbf71e61f2aee Merge: 5ed0cec... 7a203f3... Author: Ingo Molnar Date: Tue Mar 10 16:34:43 2009 +0100 Merge branches 'sched/cleanups' and 'linus' into sched/core commit df481e41b963b7fc3d7e3543a0c7bb140a682146 Author: Takashi Iwai Date: Tue Mar 10 15:35:35 2009 +0100 ALSA: hda - Clean up Cxt5047 parser Clean up Conexant 5047 pareser code: - Split mixer elements to separate arrays to reduce the duplicated entires - Fix mixer element names to the standard ones - Remove unneeded cxt5047_hp2_unsol_event; the normal unsol_event handler works fine. Signed-off-by: Takashi Iwai commit 5b3a7440cbabdda07cfb3dcf4a07e0115a3dff9a Author: Takashi Iwai Date: Tue Mar 10 15:10:55 2009 +0100 ALSA: hda - Fix / clean up init verbs for Cxt5047 codec Fix the initial connections of output pins 0x13 and 0x1d for Conexant 5047 codec to point to the mixer amp properly. Removed unneeded (doubly) verbs from arrays, also removed the unneeded changing of widget 0x1c, which is now completely unused. Signed-off-by: Takashi Iwai commit 3b628867f328cfe1ad4811d63961579874f87041 Author: Takashi Iwai Date: Tue Mar 10 14:53:54 2009 +0100 ALSA: hda - Remove superfluous verbs for Cxt5047 laptop-eapd model Remove superfluous verbs from cxt5047_toshiba_init_verbs[]. Also fix comments and minor coding style issues. Signed-off-by: Takashi Iwai commit b880c74adf7e79b97de710a152ea82f292f9abc7 Author: Takashi Iwai Date: Tue Mar 10 14:41:05 2009 +0100 ALSA: hda - Create "Capture Source" control dynamically in patch_conexant.c Create "Capture Source" control dynamically for Conexant codecs. If only one capture item is available, don't create such a control since it's just useless. Signed-off-by: Takashi Iwai commit dd5746a85cb21ea5b3afca0b569586a05aa56846 Author: Takashi Iwai Date: Tue Mar 10 14:30:40 2009 +0100 ALSA: hda - Create vmaster for conexant codecs Instead of binding volumes, create a virtual master volume for Conexant codecs. This allows separate HP and speaker volume controls. Signed-off-by: Takashi Iwai commit 3e1a3ce2f19a8a74fe6771f6dcd642d61ae050dc Author: Ayaz Abdulla Date: Thu Mar 5 08:02:38 2009 +0000 forcedeth: version bump to 64 This patch bumps up the version to 0.64 Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit 1b2bb76f575699eff3f58b18dcfebf5d3b1f6ddb Author: Ayaz Abdulla Date: Thu Mar 5 08:02:34 2009 +0000 forcedeth: fix irq clearing and napi spin lock changes This patch clears the irqstatus register with the exact same events it has read from it. Since the read-write operation is not atomic, a new irqstatus bit could have been set in between these operations and would then be cleared accidentally. Secondly, we now don't need any spin lock protection when scheduling/completing napi poll as the isr will not execute anymore (as we turn off all interrupts now). Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit 6cef67a02f7994c97dbd716dbeb592265fb5b7b0 Author: Ayaz Abdulla Date: Thu Mar 5 08:02:30 2009 +0000 forcedeth: performance changes This patch modifies the throughput mode poll settings to reduce the number of interrupts. This is only used by older hardware that need a timer irq in throughput mode. Secondly, this patch increases the default rx ring from 128 to 512. This drastically improves bandwidth utilization for small packets sizes i.e 512 bytes. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit 4145ade2bb265b34331265bfa2221e40b069b3ca Author: Ayaz Abdulla Date: Thu Mar 5 08:02:26 2009 +0000 forcedeth: add interrupt moderation logic This patch adds the logic to moderate the interrupts by changing the mode between throughput and poll. If there has been a large amount of time without any burst of network load, the code will transition to pure throughput mode (where each tx/rx/other will cause an interrupt). If bursts of network load occurs, it will transition to poll based mode to help reduce cpu utilization (it will not interrupt on each packet) while maintaining the optimum network bandwidth utilization. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit b67874ac1604cda8070d60d432e892c09d761b2e Author: Ayaz Abdulla Date: Thu Mar 5 08:02:22 2009 +0000 forcedeth: remove isr processing loop This patch is only a subset of changes so that it is easier to see the modifications. This patch removes the isr 'for' loop and shifts all the logic to account for new tab spacing. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit 9e184767c956e71d9535c9fc8433e140f819d07d Author: Ayaz Abdulla Date: Thu Mar 5 08:02:18 2009 +0000 forcedeth: add new optimization mode A new optimization mode called Dynamic has been added. This will be mode where interrupt moderation logic will dynamically switch between pure throughput mode and poll based (called 'cpu') mode. Also, for newer chipsets, the timer irq is not needed for throughput mode. Secondly, since we are modifying the irqmask to change between modes, msix is not supported. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit f27e6f39fc37f378f5485b9a0ff905796e789f80 Author: Ayaz Abdulla Date: Thu Mar 5 08:02:14 2009 +0000 forcedeth: napi - handle all processing The napi poll routine has been modified to handle all interrupt events and process them accordingly. Therefore, the ISR will now only schedule the napi poll and disable all interrupts instead of just disabling rx interrupt. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit 33912e72d00c3627dbbb7c59463df9535176059f Author: Ayaz Abdulla Date: Thu Mar 5 08:02:10 2009 +0000 forcedeth: add/modify tx done with limit There are two tx_done routines to handle tx completion processing. Both these functions now take in a limit value and return the amount of tx completions. This will be used by a future patch to determine the total amount of work done. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit 2daac3e8f831beba2012fdefda17770456be9b7e Author: Ayaz Abdulla Date: Thu Mar 5 08:02:06 2009 +0000 forcedeth: remove overhead This patch removes unnecessary overhead code. Firstly, there is no nead to mask off unwanted interrupts as we will be checking against the irqmask field anyways. Secondly, there has been no value in last few years from detecting error or unknown interrupts. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit 582806be066bd35dc5d2739b090b561a5efd787a Author: Ayaz Abdulla Date: Thu Mar 5 08:02:03 2009 +0000 forcedeth: save irq events for napi processing This patch will save the irq events in the driver's context so that the napi routine knows which interrupts have occurred. Subsequent changes will be moving all interrupt processing into the napi poll routine. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit d41c628c514bceb33037c26f83585c629594bed5 Author: Ayaz Abdulla Date: Thu Mar 5 08:01:59 2009 +0000 forcedeth: remove msix + napi This patch removes support for msix running in conjunction with napi. There has been reported issues regarding the behaviour of irqmask and generation of interrupts by the HW when in MSIX mode. When running napi, the driver is constantly turning off/on the irqmask. For the time being, I am going to disable it until I can root cause the issue. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit 08d935757440872d46be77f95153972cdbfe550d Author: Ayaz Abdulla Date: Thu Mar 5 08:01:55 2009 +0000 forcedeth: fix missing napi enable/disable calls This patch adds missing napi enable/disable calls. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit 8ed1454aa8ab6c616f9c457238c6397c0529ceb9 Author: Ayaz Abdulla Date: Thu Mar 5 08:01:49 2009 +0000 forcedeth: fix stats version feature Newer versions of the stats feature would not encompass all older versions. This would result in only retreiving a subset of all available stats in HW. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit a2205472c3017bfe97b6cb6f5acd6ca141a97eda Author: Stephen Hemminger Date: Mon Mar 9 13:51:55 2009 +0000 net: fix warning about non-const string Since dev_set_name takes a printf style string, new gcc complains if arg is not const. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 7546dd97d27306d939c13e03318aae695badaa88 Author: Stephen Hemminger Date: Mon Mar 9 08:18:29 2009 +0000 net: convert usage of packet_type to read_mostly Protocols that use packet_type can be __read_mostly section for better locality. Elminate any unnecessary initializations of NULL. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 3f612132c7164d5cc9ed677a2fdf8950222d2170 Author: Paul Bolle Date: Sun Mar 8 05:23:13 2009 +0000 gigaset: return -ENOTTY for unimplemented functions A number of functions in the usb_gigaset module will return -EINVAL if CONFIG_GIGASET_UNDOCREQ is not set. Make these return -ENOTTY as it's more specific and it might make it easier to see (from userspace) why these functions actually fail. Impact: some error return codes changed Signed-off-by: Paul Bolle Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit 3c420f27b7b2340a81989c8d9ed619e545dd2ad7 Author: Tilman Schmidt Date: Sat Mar 7 12:11:02 2009 +0000 gigaset: Kconfig cleanup Streamline dependencies and remove some obsolete or redundant comments in the Gigaset ISDN driver's Kconfig file. In particular, remove the strong warning against the GIGASET_UNDOCREQ option, as in seven years of existence, the code in question has never been reported to cause any harm. Impact: Kconfig cleanup, no functional change Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit 1e2d0059fc24c84356721c16c2ad0590c38015a0 Author: Dhananjay Phadke Date: Mon Mar 9 08:50:56 2009 +0000 netxen: annotate board_config and board_type Remove huge board config structure from each instance, read only necessary fields from flash. Replace board_type with port_type (1G/10G), there's another board_type field describing card type (SFP/XFP/CX4). Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit becf46a012db667c562bbbe589c14e100b62e5a4 Author: Dhananjay Phadke Date: Mon Mar 9 08:50:55 2009 +0000 netxen: cleanup superfluous multi-context code MAX_RCV_CTX was set to 1, there's only rx context per PCI function. Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit 9f5bc7f1908665d7cf379f698c7bdc53bc10da85 Author: Dhananjay Phadke Date: Mon Mar 9 08:50:54 2009 +0000 netxen: refactor netdev open close rearrange open and close into hardware attach(), detach() and nic up() and down(). this will be used for suspend/resume subsequently. Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit d32cc3d24eace8a271a39ffe8aeae1861f400d2d Author: Dhananjay Phadke Date: Mon Mar 9 08:50:53 2009 +0000 netxen: small xmit optimizations Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit 0ddc110c6fef34c554999448cdffe9c174a15fc9 Author: Dhananjay Phadke Date: Mon Mar 9 08:50:52 2009 +0000 netxen: cleanup rx handling o remove unused rx fragment handling code. o imporove check for status descriptor ownership. Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit d5df2a16133f4eb22f9a6bbc07723443568d362f Merge: d4a4aba... db434ac... Author: David S. Miller Date: Tue Mar 10 05:04:16 2009 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/bnx2x_main.c drivers/net/wireless/iwlwifi/iwl3945-base.c drivers/net/wireless/rt2x00/rt73usb.c commit d4a4aba61731ce6d102a6a93e22b8fa26511c9d5 Author: Ron Mercer Date: Mon Mar 9 10:59:28 2009 +0000 qlge: bugfix: Fix endian issue related to rx buffers. This was introduced in an earlier net-next patch. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 74c50b4bae225b8e5aff9a1ceca256ba46c665c6 Author: Ron Mercer Date: Mon Mar 9 10:59:27 2009 +0000 qlge: bugfix: Pad outbound frames smaller than 60 bytes. With some asic configurations xmit of frames smaller than 60 bytes may fail. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 6b318cb36813d03dd20f80e63c37176a55edae30 Author: Ron Mercer Date: Mon Mar 9 10:59:26 2009 +0000 qlge: bugfix: Move netif_napi_del() to common call point. Moving netif_napi_del() up the call chain so it will get called from all exit points. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 39a28bc480bff0f778d043877aff2fd16ad5f769 Author: Ron Mercer Date: Mon Mar 9 10:59:25 2009 +0000 qlge: Remove spinlock from asic init path. There is nothing to contend with it. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit b25215d0433f6c71b68eede3548815196a2ed5d5 Author: Ron Mercer Date: Mon Mar 9 10:59:24 2009 +0000 qlge: Clear shadow registers before use. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 08b1bc8f4aba4ddbc4ccef7ebc899e6faae81bbf Author: Ron Mercer Date: Mon Mar 9 10:59:23 2009 +0000 qlge: Get rid of irqsave/restore in intr disable. The completion interrupt disable routine is only called from the ISR, so there is no need for irqsave/restore. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit c9cf0a04a0c20c26388c51052296d774ec92e2bd Author: Ron Mercer Date: Mon Mar 9 10:59:22 2009 +0000 qlge: bugfix: Tell hw to strip vlan header. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 1e213303d8ef2a5d43fb64d2b373858ef70cc79b Author: Ron Mercer Date: Mon Mar 9 10:59:21 2009 +0000 qlge: Add tx multiqueue support. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 22bdd4f599b87734b7fc8137f47e62c13ab27e93 Author: Ron Mercer Date: Mon Mar 9 10:59:20 2009 +0000 qlge: Add support for GRO. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit d555f5921f2b0d9f65b547dd0be67c870ff5a56f Author: Ron Mercer Date: Mon Mar 9 10:59:19 2009 +0000 qlge: Increase filtering for inbound csum settings. Chip does not do UDP checksum when fragmentation occurs. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit a75ee7f1ccace560642e5dc6b1c0e22c73da5a8c Author: Ron Mercer Date: Mon Mar 9 10:59:18 2009 +0000 qlge: Remove debug junk from asic reset logic. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit db98812f6bbe17c5994d6290a68f8de8aa5ff8b9 Author: Ron Mercer Date: Mon Mar 9 10:59:17 2009 +0000 qlge: Move reset logic into asic_reset_worker func. Get rid of extraneous ql_cycle_adapter. It's only called from the one place. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 47a72688fae7298e1ad5fdc9bff7e04b6a549620 Author: Adrian McMenamin Date: Wed Mar 4 00:31:04 2009 +0000 mtd: flash mapping support for Dreamcast VMU. This patch adds support for the Sega Dreamcast visual memory unit as a flash mapping. It requires changes in the maple bus driver (posted separately) to support block reads and writes. The VMU is a 'smart' flash device, with a built-in 8-bit controller - for instance there is an erase before a write but it is hidden from the user. But the device's overall behaviour means it works well with the mtd layer and it is appropriate to add it as an mtd mapping. Signed-off-by: Adrian McMenamin Acked-By: David Woodhouse Signed-off-by: Paul Mundt commit 71b973a42c5456824c8712e00659d9616d395919 Author: Nobuhiro Iwamatsu Date: Tue Mar 10 17:26:49 2009 +0900 sh: dma-sh updates for multi IRQ and new SH-4A CPUs. This adds DMA support for newer SH-4A CPUs, particularly SH7763/64/80/85. This also enables multi IRQ support for platforms that have multiple vectors bound to the same IRQ source. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit ae68df5635a191c7edb75f5c1c1406353cb24a9f Author: Paul Mundt Date: Tue Mar 10 17:00:48 2009 +0900 sh: Generate uImage by default on Urquell board. Signed-off-by: Paul Mundt commit dc65a977ce59f2c3171ea451b90c7e5effb6737e Author: Paul Mundt Date: Tue Mar 10 16:26:29 2009 +0900 sh: Define ARCH_SHMOBILE for SH-Mobile CPUs. Signed-off-by: Paul Mundt commit 6dfc0d2c4b9a5455c60e0b9ee95bbf22fc516cef Author: Takashi Iwai Date: Tue Mar 10 07:54:20 2009 +0100 ALSA: hda - Add missing models to documentation Signed-off-by: Takashi Iwai commit 8ffe31334262108be343d92e81649f9dc3efe826 Author: Yoshihiro Shimoda Date: Tue Mar 10 15:51:49 2009 +0900 sh: pci-sh7780: fix pci memory address for fixed PMB Fix the problem that cannot work a PCI device when 32-bit physical address mode. Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit df4d4f1a47ed6080c7b4010149126bd1013dc3f1 Author: Yoshihiro Shimoda Date: Tue Mar 10 15:50:44 2009 +0900 sh: sh7785lcr: Updates for fixed PMB. Add a new defconfig for SH7785LCR in 32-bit mode, and update the power off code to avoid 29-bit assumptions. Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit 2f47f44790a9c8fc43e515df3c6be19a35ee5de5 Author: Yoshihiro Shimoda Date: Tue Mar 10 15:49:54 2009 +0900 sh: Support fixed 32-bit PMB mappings from bootloader. This provides a method for supporting fixed PMB mappings inherited from the bootloader, as an alternative to the dynamic PMB mapping currently used by the kernel. In the future these methods will be combined. P1/P2 area is handled like a regular 29-bit physical address, and local bus device are assigned P3 area addresses. Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit 6fce61aeaf0dc1dfa306092539397ab903a9afc4 Author: Takashi Iwai Date: Tue Mar 10 07:48:57 2009 +0100 ALSA: hda - Fix coding style issues in last two patches Also re-ordered the quirk entries per SSID. Signed-off-by: Takashi Iwai commit 443e26d014c242623dd70cda054cc6e5ebf7993d Author: Christoph Plattner Date: Tue Mar 10 00:05:56 2009 +0100 ALSA: hda - Rework on patch_sigmatel.c for HP HDX16/HDX18 Code rework, comments of mail tiwai@suse.de (2009-03-09) incorporated. Code tested on HP HDX16 (not tested on HDX18 yet). Signed-off-by: Christoph Plattner Signed-off-by: Takashi Iwai commit ae6241fbf5c8863631532e8069037bae460607be Author: Christoph Plattner Date: Sun Mar 8 23:19:05 2009 +0100 ALSA: hda - Added HP HDX16/HDX18 notebook support for HDA codecs (82HD71) Added codec recognition of HP HDX platforms and added support of the MUTE LED (orange/white). For this feature the CONFIG_SND_HDA_POWER_SAVE is needed to use event handling for mute control. Signed-off-by: Christoph Plattner Signed-off-by: Takashi Iwai commit a29b99eccecefe5026713b226f66f117c8837ad5 Author: Magnus Damm Date: Tue Mar 10 06:24:21 2009 +0000 input: add suspend wakeup support to sh_keysc This patch adds wakeup support to the sh_keysc driver. With this feature the ".../power/wakeup" file can be used to enable and disable if the device takes the system out of suspend. Default is enabled. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 508407149a7f927c4b65a20e0a08a2a94dc769c6 Author: Magnus Damm Date: Tue Mar 10 06:13:22 2009 +0000 sh: Show sleep state with Migo-R LEDs If CONFIG_PM is set, let Migo-R LEDs show sleep states. D11 will show STATUS0 and D12 PDSTATUS. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 74aaf024c9a4def24f3eb91a675e4712142d3c87 Merge: e161183... 467fc49... Author: Paul Mundt Date: Tue Mar 10 15:25:18 2009 +0900 Merge branch 'sh/stable-updates' commit e161183ba674f97fce748384f5bb037d07bdc5c9 Merge: 2ef7f0d... 99adcd9... Author: Paul Mundt Date: Tue Mar 10 15:17:26 2009 +0900 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit 2ef7f0dab6b3d171b6aff00a47077385ae3155b5 Author: Magnus Damm Date: Fri Mar 6 09:47:02 2009 +0000 sh: hibernation support Add Suspend-to-disk / swsusp / CONFIG_HIBERNATION support to the SuperH architecture. To suspend, use "swapon /dev/sda2; echo disk > /sys/power/state" To resume, pass "resume=/dev/sda2" on the kernel command line. The patch "pm: rework includes, remove arch ifdefs V2" is needed to allow the generic swsusp code to build properly. Hibernation is not enabled with this patch though, a patch setting ARCH_HIBERNATION_POSSIBLE will be submitted later. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit df7f54c012b92ec93d56b68547351dcdf8a163d3 Author: Eric Paris Date: Mon Mar 9 14:35:58 2009 -0400 SELinux: inode_doinit_with_dentry drop no dentry printk Drop the printk message when an inode is found without an associated dentry. This should only happen when userspace can't be accessing those inodes and those labels will get set correctly on the next d_instantiate. Thus there is no reason to send this message. Signed-off-by: Eric Paris Signed-off-by: James Morris commit eac84739721857f4d5be3d9127f4644f16a9bea4 Author: Ben Dooks Date: Mon Mar 9 17:47:13 2009 +0000 ASoC: Fix Samsung S3C2412_IISMOD_SDF_{MSB,LSB} definitions The definitions of S3C2412_IISMOD_SDF_MSB and S3C2412_IISMOD_SDF_LSB are incorrect, being the same S3C2412_IISMOD_SDF_IIS which is the only correct one in this series. Signed-off-by: Ben Dooks Signed-off-by: Mark Brown commit 6b849bcff0004aa5dd216b4d3eb56f51c9df8a72 Author: Mark Brown Date: Mon Mar 9 18:18:33 2009 +0000 ASoC: Convert PXA AC97 driver to probe with the platform device This will break any boards that don't register the AC97 controller device due to using ASoC. Signed-off-by: Mark Brown commit e776ec19a47a325ee1d9ece2d983526dcd626c53 Author: Randy Dunlap Date: Sat Feb 28 17:40:18 2009 +0100 ALSA: Move ALSA docbooks to be with the rest of the kernel docbooks Move ALSA docbooks to be with the rest of the kernel docbooks and add them to the Makefile so that they build. Latter required a few minor changes to alsa .tmpl files. (I did not remove all of the trailing whitespace in the .tmpl files.) Fixes kernel bugzilla #12726: http://bugzilla.kernel.org/show_bug.cgi?id=12726 Signed-off-by: Randy Dunlap Cc: documentation_man-pages@kernel-bugs.osdl.org Cc: Nicola Soranzo Signed-off-by: Takashi Iwai commit 5f8206c04857965cc2ff6c395633c4fdd977dd77 Author: Takashi Iwai Date: Mon Feb 9 08:50:43 2009 +0100 ALSA: Fix DocBook headers Signed-off-by: Takashi Iwai commit efdcd41b4e41560375bb34ad8b095bcaa1c3a93f Merge: 33dbe61... 79c7cdd... Author: Takashi Iwai Date: Mon Mar 9 15:21:57 2009 +0100 Merge branch 'topic/vmaster-update' into topic/docbook-fix commit 33dbe6114047496a5b6fee0941c52dad41250043 Merge: b1a0aac... 662c319... Author: Takashi Iwai Date: Mon Mar 9 15:21:51 2009 +0100 Merge branch 'topic/jack' into topic/docbook-fix commit 9a1b64caac82aa02cb74587ffc798e6f42c6170a Author: Takashi Iwai Date: Wed Feb 11 17:03:49 2009 +0100 ALSA: rawmidi - Refactor rawmidi open/close codes Refactor rawmidi open/close code messes. Signed-off-by: Takashi Iwai commit f9d202833d0beac09ef1c6a41305151da4fe5d4c Author: Takashi Iwai Date: Wed Feb 11 14:55:59 2009 +0100 ALSA: rawmidi - Fix possible race in open The module refcount should be handled in the register_mutex to avoid possible races with module unloading. Signed-off-by: Takashi Iwai commit 118dd6bfe7e0cddc8ab417ead19cc76000e92773 Author: Takashi Iwai Date: Mon Feb 23 16:35:21 2009 +0100 ALSA: Clean up snd_monitor_file management Use the standard linked list for snd_monitor_file management. Also, move the list deletion of shutdown_list element into snd_disconnect_release() (for simplification). Signed-off-by: Takashi Iwai commit 662c319ae4b4fb60001816dfe1dde5fdfc7a2af9 Author: Takashi Iwai Date: Mon Feb 9 08:53:50 2009 +0100 ALSA: Add sound/core/jack.c to driver-API docbook entry Signed-off-by: Takashi Iwai commit 79c7cdd5441f5d3900c1632adcc8cd2bee35c8da Author: Takashi Iwai Date: Mon Feb 9 14:47:19 2009 +0100 ALSA: Add kernel-doc comments to vmaster stuff Signed-off-by: Takashi Iwai commit 39661758631da37efbc961e57a4ddefad573cc52 Author: Roel Kluin Date: Wed Feb 25 13:40:26 2009 +0100 ALSA: snd-powermac: timeout reaches -1 If unsuccessful, timeout reaches -1 after the loop. Signed-off-by: Roel Kluin Signed-off-by: Takashi Iwai commit 6da6711385165eff76411b77974eec13c5ef6486 Author: Takashi Iwai Date: Thu Feb 5 16:02:46 2009 +0100 ALSA: powermac - Add missing KERN_* prefix to printk Signed-off-by: Takashi Iwai commit dca7c74172fee0cf6ee1e303df093c31b5561039 Author: Risto Suominen Date: Tue Jan 20 22:01:17 2009 +0200 ALSA: Add vmaster controls for Pmac 5500, iMac G3 SL, and PBook G3 Lombard Add virtual master controls for PowerMac 5500 (AWACS) and iMac G3 Slot-loading and PowerBook G3 Lombard (Screamer). Signed-off-by: Risto Suominen Signed-off-by: Takashi Iwai commit ed336d3404a8fdeda1e3f1c189b5f83186675448 Author: Risto Suominen Date: Tue Jan 20 22:01:16 2009 +0200 ALSA: powermac - Allow input from mic in iBook G3 Dual-USB Allow input from microphone on iBook G3 Dual-USB (Tumbler). Signed-off-by: Risto Suominen Signed-off-by: Takashi Iwai commit 4d9e93b1adf2923c0a0cbc545d6e78dec3334faf Author: Risto Suominen Date: Tue Jan 20 22:01:15 2009 +0200 ALSA: powermac - Correct volume controls and HP detection for PMac 8500/9500 Correct volume controls and headphone detection for PowerMac 8500/9500 (AWACS). Signed-off-by: Risto Suominen Signed-off-by: Takashi Iwai commit 573934bc038b0f47d17a5608e74b79dcd7c191ea Author: Risto Suominen Date: Tue Jan 20 22:01:14 2009 +0200 ALSA: powermac - Correct volume controls for PowerBook G3 Lombard Correct volume controls for PowerBook G3 Lombard (Screamer). Signed-off-by: Risto Suominen Signed-off-by: Takashi Iwai commit b0a8a8fd1b3bd6fbbb4b599191b859d41e12a002 Author: Risto Suominen Date: Tue Jan 20 22:01:13 2009 +0200 ALSA: powermac - Correct HP detection and input selectors for PMac 5500 Correct headphone detection and input selectors for PowerMac 5500 (AWACS). Signed-off-by: Risto Suominen Signed-off-by: Takashi Iwai commit f5b1db634280ecaf3147ee996f26aad0ed4828c4 Author: Takashi Iwai Date: Fri Jan 16 18:15:22 2009 +0100 ALSA: add snd_ctl_add_slave_uncached() Added snd_ctl_add_slave_uncached() function to add a slave element with volatile controls. The values of normal slave elements are supposed to be cachable, i.e. they are changed only via the put callbacks. OTOH, when a slave element is volatile and its values may be changed by other reason (e.g. hardware status change), the values will get inconsistent. The new function allows the slave elements with volatile changes. When the slave is tied with this call, the native get callback is issued at each time so that the values are always updated. Signed-off-by: Takashi Iwai commit 85122ea40c4fc82af5b66b8683f525c2c4a36d1a Author: Takashi Iwai Date: Fri Mar 6 16:30:07 2009 +0100 ALSA: Remove unneeded snd_pcm_substream.timer_lock The timer callbacks are called in the protected status by the lock of the timer instance, so there is no need for an extra lock in the PCM substream. Signed-off-by: Takashi Iwai commit ed3da3d9a0ef13c6fe1414ec73c9c1be12747b62 Author: Takashi Iwai Date: Tue Mar 3 17:00:15 2009 +0100 ALSA: Rewrite hw_ptr updaters Clean up and improve snd_pcm_update_hw_ptr*() functions. snd_pcm_update_hw_ptr() tries to detect the unexpected hwptr jumps more strictly to avoid the position mess-up, which often results in the bad quality I/O with pulseaudio. The hw-ptr skip error messages are printed when xrun proc is set to non-zero. Signed-off-by: Takashi Iwai commit 0a4e1c9069b3cc2a9e5b57898ac9be94314e8efa Merge: f271fa2... a381934... Author: Takashi Iwai Date: Mon Mar 9 12:05:21 2009 +0100 Merge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc commit a381934e5f9c0c3c292d780d61f5be9c22b2ef54 Author: Daniel Mack Date: Mon Mar 9 02:13:17 2009 +0100 ASoC: Add a driver for AK4104 S/PDIF transmitter This adds a driver for the SPI connected AK4104 S/PDIF transmitter device. Its features are fairly simple, but as there is need to set up certain bits in the IEC958 information, this better goes into a real driver. Signed-off-by: Daniel Mack Cc: Mark Brown Signed-off-by: Mark Brown commit 873591db59e66434fd0a484c92f69fc21100b33d Author: Clemens Ladisch Date: Mon Mar 9 09:12:55 2009 +0100 sound: oxygen: enable headphone output on Claro cards On the HT-Omega Claro (halo) sound cards, the headphone amplifier must be enabled explicitly by setting a GPIO bit. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit f271fa28fbaf947d9c79f188dd149176da727dd5 Author: Takashi Iwai Date: Mon Mar 9 00:52:17 2009 +0100 ASoC: Fix Kconfig dependency of CONFIG_SND_S3C24XX_SOC_JIVE_WM8750 Remove a non-existing Kconfig CONFIG_SND_SOC_WM8750_SPI. Signed-off-by: Takashi Iwai commit 055a49b0c92c6282e7db22e9e6ebcae6cb74ebb4 Author: Mark Brown Date: Sun Mar 8 18:57:34 2009 +0000 ASoC: Remove unneeded forward reference to WM8753 SPI implementation Signed-off-by: Mark Brown commit b191f63c4fe9fbcfe583180228080d02b8dcdebc Author: Daniel Mack Date: Sun Mar 8 17:51:52 2009 +0100 ASoC: bring cs4270 feature/limitations list in sync Removes numbers from the list of features/limitations and makes it reflect recent changes to the code. Signed-off-by: Daniel Mack Acked-by: Timur Tabi Signed-off-by: Mark Brown commit 3a638ff272744247aad4a75b1fac174ac5746114 Author: Timur Tabi Date: Fri Mar 6 18:39:34 2009 -0600 ASoC: Improve pause/unpause performance in Freescale 8610 drivers Add support for true pause and unpause. Without this, mplayer will drop some audio (less than one second, but still noticeable) when pausing playback. Remove support for PM suspend and resume from the trigger function, since the driver doesn't support PM anyway. Optimize the delay after starting capture. Instead of delaying 1ms, the driver now polls the hardware. The new delay is shorter by over 90% yet still effective. Signed-off-by: Timur Tabi Signed-off-by: Mark Brown commit 96deff6baf55da68b4b9b4dfe8ef572c6f1835fd Author: Hugo Villeneuve Date: Fri Mar 6 15:56:53 2009 -0500 ASoC: Davinci: Fix incorrect machine type for SFFSDR board Signed-off-by: Hugo Villeneuve Signed-off-by: Mark Brown commit 9d5ab13325d0bb855cf856946c140a68ceb20e32 Author: Faisal Latif Date: Fri Mar 6 15:15:01 2009 -0800 RDMA/nes: Handle MPA Reject message properly While doing testing, there are failures as MPA Reject call is not handled. To handle MPA Reject call, following changes are done: *Handle inbound/outbound MPA Reject response message. When nes_reject() is called for pending MPA request reply, send the MPA Reject message to its peer (active side)cm_node. The peer cm_node (active side) will indicate Reject message event for the pending Connect Request. *Handle MPA Reject response message for loopback connections and listener. When MPA Request is rejected, check if it is a loopback connection and if it is then it will send Reject message event to its peer loopback node. Also when destroying listener, check if the cm_nodes for that listener are loopback or not. *Add gracefull connection close with the MPA Reject response message. Send gracefull close (FIN, FIN ACK..) to terminate the cm_nodes. *Some code re-org while making the above changes. Removed recv_list and recv_list_lock from the cm_node structure as there can be only one receive close entry on the timer. Also implemented handle_recv_entry() as receive close entry is processed from both nes_rem_ref_cm_node() as well as nes_cm_timer_tick(). Signed-off-by: Faisal Latif Signed-off-by: Roland Dreier commit 0145f341a951b998d6d0fa38992a42d2a90b5bab Author: Don Wood Date: Fri Mar 6 15:15:00 2009 -0800 RDMA/nes: Improve use of PBLs Two level 256 byte PBLs was not implemented so the driver could report out of memory when in fact there were PBLs still available. This solution prefers to use 4KB PBLs over two level 256B PBLs until the number of 4KB PBLs falls below a threshold. At this point the 4KB PBL structure is converted to use 256B PBLs which prevents the driver from running out of 4KB PBLs too quickly. Signed-off-by: Don Wood Signed-off-by: Roland Dreier commit 2869975cfbd58dc6591d8c3ba1f171e7f758be28 Author: Faisal Latif Date: Fri Mar 6 15:12:11 2009 -0800 RDMA/nes: Remove LLTX NETIF_F_LLTX is deprecated. Remove private TX locking from the driver and remove the NETIF_F_LLTX feature flag. This also fixes a warning in some configs that comes from doing skb_linearize() call in the hard_start_xmit method with IRQs disabled (if HIGHMEM is enabled, skb_linearize() may end up enabling BHs, which is a no-no if hard IRQs are disabled in that context). By getting rid of LLTX, we do not disable IRQs when skb_linearize() is called. Remove the sq_lock as it is not needed for non-LLTX. Fix ethtool not to show the counter for sq_lock. Reported-by: aluno3@poczta.onet.pl Signed-off-by: Faisal Latif Signed-off-by: Roland Dreier commit fd87778cb99429f5e2e041213a5c9c564bbe7b78 Author: Don Wood Date: Fri Mar 6 15:12:11 2009 -0800 RDMA/nes: Inform hardware that asynchronous event has been handled When asynchronous events are processed by software, it is necessary to let the hardware know that software has handled the event. This frees up the entry in the asynchronous event queue. Signed-off-by: Don Wood Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit 7b14ab0b438f20c7d6599985b036bb2864fd2524 Author: Chien Tung Date: Fri Mar 6 15:12:11 2009 -0800 RDMA/nes: Fix tmp_addr compilation warning In find_node(), tmp_addr causes an "unused variable" warning when INFINIBAND_NES_DEBUG is not defined. It's only used in a nes_debug() and the print does not make sense. So take out the whole thing. Reported-by: Manish Katiyar Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit b9c367e7e694502085f21d9d2686645798080aa3 Author: Chien Tung Date: Fri Mar 6 15:12:10 2009 -0800 RDMA/nes: Report correct vendor_id and vendor_part_id ibv_devinfo displays 0 for vendor_id and vendor_part_id. Fill in OUI and device_id for those two fields. Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit cd6853d3eb453aee2574521b7ce2cd5a45492a59 Author: Chien Tung Date: Fri Mar 6 15:12:10 2009 -0800 RDMA/nes: Update copyright to new legal entity and year Update copyright to the new legal entity, Intel-NE, Inc., an Intel company. Update copyright for the new year. Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit dae5d13a7e6efcf6e0e00c0febb530b894fa13a3 Author: Don Wood Date: Fri Mar 6 15:12:09 2009 -0800 RDMA/nes: Account for freed PBL after HW operation Fix occurrences where the software PBL counts were changed before the hardware was updated. This bug allowed another thread to overallocate the hardware resources. Add proper PBL accounting in case nes_reg_mr() fails. Signed-off-by: Don Wood Signed-off-by: Roland Dreier commit b52a5195efd6173c06107ca5beb44389130596dc Author: Mark Brown Date: Fri Mar 6 18:13:43 2009 +0000 ASoC: Fix logging severity for some S3C error messages Upgrade the severity of some failure messages from debug level so they're displayed by default. Signed-off-by: Mark Brown commit ee7d476714464206317d4420d67e3bfa0308448d Author: Mark Brown Date: Fri Mar 6 18:04:34 2009 +0000 ASoC: Re-remove hand-rolled pr_debug() macros The recent set of S3C64xx patches re-added a lot of uses of DBG() that had previously been removed - revert this so the standard pr_debug() macro is used. Signed-off-by: Mark Brown commit 26bd7b496cabc232fcff9ae0249828420c52b5af Author: Mark Brown Date: Fri Mar 6 11:32:17 2009 +0000 ASoC: Staticise workqueue function for GPIO jack detection Signed-off-by: Mark Brown commit 67a9c573b5bf39bc6b40c322c58640687c1b79fe Author: Mike Frysinger Date: Fri Mar 6 15:53:30 2009 +0800 ASoC: Blackfin: fix typo in MUTE definition Reported-by: Rob Maris Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Mark Brown commit 3465d93a128acce836249e3de40932d2ed25cac6 Author: Mike Frysinger Date: Fri Mar 6 15:53:28 2009 +0800 ASoC: Blackfin: move gpio_err behind the define that is only user of it Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Mark Brown commit de0b988828a45f4fefc96ff2fbed3ba2184319b9 Author: Lopez Cruz, Misael Date: Thu Mar 5 11:32:31 2009 -0600 ASoC: Add headset jack detection for SDP3430 machine driver Add headset jack detection for SDP3430 boards using SoC jack reporting interface. Headset detection on SDP3430 board is achieved through TWL4030 GPIO_2 pin. Signed-off-by: Misael Lopez Cruz Signed-off-by: Mark Brown commit a454dad19e78388d9f140ad0dfa6a849c57d385d Author: Timur Tabi Date: Thu Mar 5 17:23:37 2009 -0600 ASoC: add support for SSI asynchronous mode to the Freescale SSI drivers Add a new device tree property for the SSI node: "fsl,ssi-asynchronous". If defined, the SSI is programmed into asynchronous mode, otherwise it is programmed into synchronous mode. In asynchronous mode, pin SRCK must be connected to the same clock source as STFS, and pin SRFS must be connected to the same signal as STFS. Asynchronous mode allows playback and capture to use different sample sizes. It also technically allows different sample rates, but the driver does not support that. Signed-off-by: Timur Tabi Signed-off-by: Mark Brown commit 499d8f4a528f1ebd0c19d89174fdc67130090c89 Author: Mark Brown Date: Thu Mar 5 17:26:15 2009 +0000 ASoC: Update Kconfig for Samsung CPUs to reflect S3C64xx support We now support the 64xx series as well as the 24xx series - make sure people using Kconfig know this. Signed-off-by: Mark Brown commit 07495f3e5af3a472f0f49957692cac15168fa528 Author: Mark Brown Date: Thu Mar 5 17:06:23 2009 +0000 ASoC: Fix memory allocation for snd_soc_dapm_switch names snd_soc_dapm_switch ends up ends up in dapm_new_mixer() (since a switch is a special case of a mixer with only one input) but this wasn't correctly handled in the code. Also fix the coding style for the switch below while we're here. Reported-by: Joonyoung Shim Signed-off-by: Mark Brown commit b0c5033f02182d1e9634edc737df88b82264e820 Author: Daniel Mack Date: Thu Mar 5 14:21:26 2009 +0100 ASoC: add two more bitfields for PXA SSP Add two more bitfields for the PSP register. As they seem to exist for PXA3xx only, define them conditionally. Signed-off-by: Daniel Mack Signed-off-by: Mark Brown commit 42aa3418ebd7b79be0e1ee7515e365c1574114f9 Author: Mark Brown Date: Sun Mar 1 19:21:10 2009 +0000 ASoC: Factor out DAPM widget power check into separate function Essentially simple code motion to facilitate refactoring of the power decisions. Signed-off-by: Mark Brown commit 20a41eac4fbaa22d051d0fbaeaf3315d2d8c4860 Author: Daniel Mack Date: Wed Mar 4 21:16:57 2009 +0100 ASoC: Fix name of register bit in pxa-ssp A bit in PXA's SSCR0 register was erroneously named ADC but its name is in fact ACS (audio clock select). Signed-off-by: Daniel Mack Signed-off-by: Mark Brown commit 89492be88616aa20b3a6c3eb512f83c0c7d0c8a3 Author: Peter Ujfalusi Date: Thu Mar 5 12:48:49 2009 +0200 ASoC: TWL4030: Make the HS ramp delay configurable Enum type for selecting the desired ramp delay for the headset output. Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown commit a1b3eaeb146937e954cdb6dcb67f8761b73e2eef Author: Mark Brown Date: Wed Mar 4 20:17:48 2009 +0000 ASoC: Refresh JIVE driver Remove uneeded startup callback and use snd_soc_dapm_nc_pin() Signed-off-by: Mark Brown commit c36623a7543e7a23ceeafbeb7b34a9e020100898 Author: Ben Dooks Date: Wed Mar 4 00:49:34 2009 +0000 ASoC: Select DMA if I2S is configured Select the relevant DMA implementation when the sound driver is selected. Signed-off-by: Ben Dooks Signed-off-by: Mark Brown commit f8cf8176c7fc2c790e900595755b93e30633754d Author: Ben Dooks Date: Wed Mar 4 00:49:31 2009 +0000 ASoC: Add s3c64xx-i2s support Add the initial code to support the S3C64XX I2S hardware using the s3c-i2s-v2 core code. Signed-off-by: Ben Dooks Signed-off-by: Mark Brown commit dc85447b196a683784eb85654c436fd58c3e2ed1 Author: Ben Dooks Date: Wed Mar 4 00:49:30 2009 +0000 ASoC: Split s3c2412-i2s.c into core and SoC specific parts The S3C2412 I2S (IIS) interface is replicated on further Samsung SoC parts in a broadly compatible way, so split the common code out into a core called s3c-i2s-v2.[ch] so that the newer SoCs such as the S3C6410 can make use of it. As such, all the original s3c2412 functions are currently being left with their original names, and will be renamed later in the series. Signed-off-by: Ben Dooks Signed-off-by: Mark Brown commit 3093e48c48b69ccc06a1f78ffe7ece7ee2ee09ef Author: Ben Dooks Date: Wed Mar 4 00:49:27 2009 +0000 ASoC: Add JIVE audio support Add support for the Jive's WM8750 codec attached via the S3C2412 IIS. Signed-off-by: Ben Dooks Signed-off-by: Mark Brown commit 979c036e090332cd3a090ce8b4eb50c3aa28dea0 Author: Lopez Cruz, Misael Date: Wed Mar 4 11:39:07 2009 -0600 ASoC: Add DAPM machine widgets to SDP3430 driver Add DAPM machine domain widgets to SDP3430 machine driver. Interconnection: * Ext Mic: MAINMIC, SUBMIC * Ext Spk: HFL, HFR * Headset Jack: HSMIC, HSOL, HSOR Signed-off-by: Misael Lopez Cruz Signed-off-by: Mark Brown commit 4f5b31c3f29f4351d2740faed3a6c569b800b39d Merge: 86027ae... 899e6cf... Author: Mark Brown Date: Fri Mar 6 13:36:37 2009 +0000 Merge commit 's3c-iis-header' into HEAD commit 90f349d96e1dc05b1f7916958282c30760eeacd6 Author: Takashi Iwai Date: Fri Mar 6 14:30:08 2009 +0100 ALSA: ac97 - Add patch entry for Conexant CX20468-31 chip Added the patch entry for Conexant CX20468-31 chip (4358:5430). Reference: Novell bnc#471265 https://bugzilla.novell.com/show_bug.cgi?id=471265 Signed-off-by: Takashi Iwai commit 5ed0cec0ac5f1b3759bdbe4d9df32ee4ff8afb5a Author: Lai Jiangshan Date: Fri Mar 6 19:40:20 2009 +0800 sched: TIF_NEED_RESCHED -> need_reshed() cleanup Impact: cleanup Use test_tsk_need_resched(), set_tsk_need_resched(), need_resched() instead of using TIF_NEED_RESCHED. Signed-off-by: Lai Jiangshan Cc: Peter Zijlstra LKML-Reference: <49B10BA4.9070209@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 139e071b0ff37800ed0a68b10c4bb325f51786eb Author: Takashi Iwai Date: Fri Mar 6 12:10:41 2009 +0100 ALSA: hda - Assign HP and speaker DACs before mic/line-in Assign DACs to HP and speaker before mic-in/line-in shared outputs. This improves the usability as it results in more intuitive mixer names. Signed-off-by: Takashi Iwai commit ee58a7ca21b2acf0d7ad0e1eb2f8d916ecf9fadc Author: Takashi Iwai Date: Fri Mar 6 12:00:24 2009 +0100 ALSA: hda - Connect to primary DAC if no individual DAC is available In stac92xx_auto_fill_dac_nids[], connect to the primary DAC if no individual DAC is available for each pin. This ensures that the pin works somehow at least. Signed-off-by: Takashi Iwai commit 7fc07d84108d54c5b94625c0e168f31b2d66976e Merge: b67802e... 8a0be9e... Author: Ingo Molnar Date: Fri Mar 6 11:47:52 2009 +0100 Merge branch 'sched/core' into sched/cleanups commit edab56f4c90f45ba4e61d06d3fc9658da4e94bde Author: Paul Mundt Date: Fri Mar 6 19:21:02 2009 +0900 sh: multiple vectors per irq - sh7720. Signed-off-by: Paul Mundt commit 56d604defa91684509ac842317ea14501f224299 Author: Paul Mundt Date: Fri Mar 6 19:20:48 2009 +0900 sh: multiple vectors per irq - sh7710. Signed-off-by: Paul Mundt commit 0caedb02c4a02b6fd0f1a62dfeb917353d3c6162 Author: Paul Mundt Date: Fri Mar 6 19:20:32 2009 +0900 sh: multiple vectors per irq - sh7705. Signed-off-by: Paul Mundt commit 592acbda89f40a93f7d71564cdf1da83229d226e Author: Paul Mundt Date: Fri Mar 6 19:20:14 2009 +0900 sh: multiple vectors per irq - sh770x. Signed-off-by: Paul Mundt commit 053bfc5360c106528bbb57464ad2cbf4a2af8133 Author: Paul Mundt Date: Fri Mar 6 19:19:54 2009 +0900 sh: multiple vectors per irq - mxg. Signed-off-by: Paul Mundt commit 5dece2bbda728fbf6a70e48be782c24c427072b0 Author: Paul Mundt Date: Fri Mar 6 19:19:31 2009 +0900 sh: multiple vectors per irq - sh7619. Signed-off-by: Paul Mundt commit e26b926a561ba24bfeb8a15bfc848f97052a50f4 Author: Paul Mundt Date: Fri Mar 6 18:51:33 2009 +0900 rtc: rtc-sh: Bump version up to reflect single IRQ support changes. Signed-off-by: Paul Mundt commit f858abbecd0a3ec0ab3e3678612d626a0bd49686 Author: Paul Mundt Date: Fri Mar 6 18:34:15 2009 +0900 sh: multiple vectors per irq - sh7206. Signed-off-by: Paul Mundt commit d55eedd57d05dbb00e4b66d1c01ea6fac0274c38 Author: Paul Mundt Date: Fri Mar 6 18:21:38 2009 +0900 sh: multiple vectors per irq - sh7201. Follow the conversions as per the other subtypes. Signed-off-by: Paul Mundt commit 668b9652be33510a2a42b290dd335d34d38e2068 Author: Takashi Iwai Date: Fri Mar 6 10:13:24 2009 +0100 ALSA: hda - Create multiple HP / speaker controls with index Create multiple "Headphone" and "Speaker" controls with non-zero index numbers instead of "Headphone2", etc. Signed-off-by: Takashi Iwai commit 7a411ee01bf3114ba2a2ae013eaae4e3c41f8eb5 Author: Takashi Iwai Date: Fri Mar 6 10:08:14 2009 +0100 ALSA: hda - Allow slave controls with non-zero indices Fix snd_hda_add_vmaster() to check the non-zero indices of slave controls. Signed-off-by: Takashi Iwai commit dc04d1b4d2043e2fca2d94d6d5542b930f2bc5b3 Author: Takashi Iwai Date: Fri Mar 6 10:00:05 2009 +0100 ALSA: hda - Create output controls according to pin types for IDT/STAC Improve the parser to pick up more intuitive control names for the outputs judging from the pin type, instead of fixed names assigned to channels. Also, revive the multi-HP workaround since this change fixes the problem with the multi-HP detection. Signed-off-by: Takashi Iwai commit e45efe68d11e9f3c836b019a32b879a26a2b9b33 Author: Paul Mundt Date: Fri Mar 6 18:02:33 2009 +0900 sh: multiple vectors per irq - sh7263. Convert over the SH7263 IRQ groups as well. Signed-off-by: Paul Mundt commit bb943a286c6f2993a737cc44c170d8b26e72c8ff Author: Paul Mundt Date: Fri Mar 6 17:58:51 2009 +0900 sh: multiple vectors per irq - sh7203. Follow the conversions as per the other subtypes. Signed-off-by: Paul Mundt commit f033599aac86f4eb08a1b6b851568a2587e8c6ad Author: Paul Mundt Date: Fri Mar 6 17:56:58 2009 +0900 sh: intc: Make missing unique IRQ mask warning more verbose. This includes the IRQ number in addition to the vector, as not all platforms wrap in with INTC_VECT(). Signed-off-by: Paul Mundt commit b3225190c1991449086395f85a3cc07ac936e8f0 Merge: f03d311... c50ff7c... Author: Takashi Iwai Date: Fri Mar 6 09:52:36 2009 +0100 Merge branch 'fix/hda' into topic/hda commit 075901af281b2afb47b1423ac488e713844db396 Author: Nobuhiro Iwamatsu Date: Fri Mar 6 14:37:34 2009 +0900 sh: Restore RTC IRQ setting for SH7763 setup. This was accidentally dropped in the multiple vectors per irq conversion. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Paul Mundt commit a6bc77241d79d39ad2ad8010a82ce7e0f437ae05 Author: Nobuhiro Iwamatsu Date: Fri Mar 6 05:06:27 2009 +0000 sh: multiple vectors per irq - sh7763 Update intc tables and platform data to use one linux irq per maskable interrupt source instead of keeping the one-to-one mapping between vectors and linux irqs. This fixes potential irq masking issues for sh7763 hardware blocks such as RTC/SCIF/DMAC/GETHER/PCIC5/MMCIF/SIM/GPIO/USBF. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Paul Mundt commit dd34b5d75a0405814a3de83f02a44ac297e81629 Author: Eric Paris Date: Thu Mar 5 13:43:35 2009 -0500 SELinux: new permission between tty audit and audit socket New selinux permission to separate the ability to turn on tty auditing from the ability to set audit rules. Signed-off-by: Eric Paris Acked-by: Stephen Smalley Signed-off-by: James Morris commit 6a25b27d602aac24f3c642722377ba5d778417ec Author: Eric Paris Date: Thu Mar 5 13:40:35 2009 -0500 SELinux: open perm for sock files When I did open permissions I didn't think any sockets would have an open. Turns out AF_UNIX sockets can have an open when they are bound to the filesystem namespace. This patch adds a new SOCK_FILE__OPEN permission. It's safe to add this as the open perms are already predicated on capabilities and capabilities means we have unknown perm handling so systems should be as backwards compatible as the policy wants them to be. https://bugzilla.redhat.com/show_bug.cgi?id=475224 Signed-off-by: Eric Paris Acked-by: Stephen Smalley Signed-off-by: James Morris commit 1a77733ccb9654716160fdfb3f1f2a9e1759de19 Author: Michael Buesch Date: Wed Mar 4 16:41:10 2009 +0100 b43: Fix compilation for devices without PCI core This fixes compilation, if the PCI core is disabled. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 39d89cd34d9900cd2415f46e179b91cdd14b15fe Author: Jouni Malinen Date: Tue Mar 3 19:23:40 2009 +0200 ath9k: Add a debugfs interface for controlling virtual wiphys debugfs ath9k/phy#/wiphy can be used to show the current list of virtual wiphys and to add/remove virtual wiphys. Eventually, this interface could be replaced with a cfg80211/nl80211 command that is passed through mac80211. For example: # cat /debug/ath9k/phy0/wiphy primary: phy0 # echo add > /debug/ath9k/phy0/wiphy # cat /debug/ath9k/phy0/wiphy primary: phy0 secondary: phy1 # echo del=phy1 > /debug/ath9k/phy0/wiphy # cat /debug/ath9k/phy0/wiphy primary: phy0 In addition, following commands can be used to test pausing and unpausing of the virtual wiphys: pause=phy1 unpause=phy1 select=phy1 (select pauses and unpauses wiphys automatically based on channel) schedule=500 (set wiphy scheduling interval in msec; 0 = disable; default value: 500) Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit f98c3bd24161e9aaa73b9cd4dc6b1742c085ac17 Author: Jouni Malinen Date: Tue Mar 3 19:23:39 2009 +0200 ath9k: Add a simple virtual wiphy scheduler This is a very simple scheduler that goes through the wiphys and schedules one at a time every N milliseconds (current default value: 500 ms). This is enough for initial testing, but there are number of areas where a more complex scheduler can improve operations greatly. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 8089cc47ed45df8f5a44f92f53140e6fd0958409 Author: Jouni Malinen Date: Tue Mar 3 19:23:38 2009 +0200 ath9k: Special processing for channel changes during scan Allow mac80211-controlled channel changes on an active wiphy and especially during a scan. We need this as long as the scan is controlled by mac80211. Moving this control into the driver could allow some optimizations on scanning while using multiple virtual interfaces, but for now, try to work as well as possible with the current scan mechanism. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 7ec3e514d9361596cbd8aa71ce41d6e5b0220103 Author: Jouni Malinen Date: Tue Mar 3 19:23:37 2009 +0200 ath9k: Add workaround to recover from failed channel changes It looks like channel change may fail in some cases and end up leaving the hardware in state where it cannot transmit any frames. Add a workaround to recover from this state if we detect that wiphy selection is failing due to wiphys not leaving PAUSING state. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit ee166a0e71947e0ebeb044fd2277435f665270ac Author: Jouni Malinen Date: Tue Mar 3 19:23:36 2009 +0200 ath9k: Check virtual wiphy state on tx() mac80211 should not be requesting us to transmit frames on paused wiphys since we stop the TX queues. Just in case, add debug code to make sure we catch if this were to happen. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 18eb62f87a8d1dc6ed8a01a52e6b2b1600802608 Author: Jouni Malinen Date: Tue Mar 3 19:23:35 2009 +0200 ath9k: Pause other virtual wiphys on channel change For now, allow channel changes immediately and just force the other virtual wiphys to paused state. This is needed to allow mac80211-controlled scan to control channel changes. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 465ca84d95deeab37b7c3b10b2cb96b3fa07a891 Author: Jouni Malinen Date: Tue Mar 3 19:23:34 2009 +0200 ath9k: Register larger listen interval Notify the AP that we may be sleeping longer to allow the AP power save code to buffer larger number of frames for us when using virtual wiphys. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 9580a222b8a371c145d7439c1a289b9e77f8fe31 Author: Jouni Malinen Date: Tue Mar 3 19:23:33 2009 +0200 ath9k: Make start/stop operations aware of virtual wiphys Instead of always going through initialization/deinitialization steps, do this only for the first/last wiphy to not break the other wiphys. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 0e2dedf971f3feefd4d3d3d8cb5c57b1757f1101 Author: Jouni Malinen Date: Tue Mar 3 19:23:32 2009 +0200 ath9k: Add routines for switching between active virtual wiphys ath9k_wiphy_select() can be used to select a virtual wiphy to be activated. Other virtual wiphys will be paused and once that is done, the operational channel is changed and the wiphys that are on the selected channel will be unpaused. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit f0ed85c6c7960b26666db013e02e748b56eef98a Author: Jouni Malinen Date: Tue Mar 3 19:23:31 2009 +0200 ath9k: Virtual wiphy pause/unpause functionality Allow virtual wiphys to be paused/unpaused to allow off-channel operations. Pause will stop all TX queues for the wiphy and move the STA into power save mode if in managed mode. Unpause wakes up the TX queues and notifies the AP that the STA woke up if in managed mode. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit b93bce2a5e8fd5c9f5d8c982efd6bca71a9b83f3 Author: Jouni Malinen Date: Tue Mar 3 19:23:30 2009 +0200 ath9k: Configure RX filter for multi-BSSID broadcast Allow RX filter to pass through all broadcast/multicast frames (i.e., no BSSID filtering) if virtual interfaces are used. Software filtering will be used in this case to drop broadcast/multicast frames for foreign BSSIDs. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit c52f33d05e5f8d59f02722fbc308f5f391575ca5 Author: Jouni Malinen Date: Tue Mar 3 19:23:29 2009 +0200 ath9k: Add support for multiple secondary virtual wiphys The new struct ath_softc::sec_wiphy array is used to store information about virtual wiphys and select which wiphy is used in calls to mac80211. Each virtual wiphy will be assigned a different MAC address based on the virtual wiphy index. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit bce048d77dff3dcfd75d54dc38580c81baa95853 Author: Jouni Malinen Date: Tue Mar 3 19:23:28 2009 +0200 ath9k: Add data structure for supporting virtual radio/wiphy operation This is the initial step in allowing ath9k to register multiple virtual radios (wiphys). The goal of virtual radios is to allow the same radio to be shared for multiple virtual interfaces that may operate on different channels. The mac80211 virtual interface support is designed only for single channel operation and as such, it is not suitable for this type of use. Anyway, it can be used on top of the virtual radio concept, if desired (e.g., use two virtual radios to handle two channels and then add multiple mac80211 virtual interfaces on top of each virtual radio). The new struct ath_wiphy is now registered as the driver data structure for wiphy. This structure has a pointer to the shared (among virtual wiphys of the same physical radio) struct ath_softc data. The primary wiphy maintains the allocated memory for ath_softc. Secondary (virtual) wiphys will only allocate the new ath_wiphy structure. Registration of secondary wiphys is added in a separate patch. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 8ca21f0185a606c490867f7471196aa29639e638 Author: Jouni Malinen Date: Tue Mar 3 19:23:27 2009 +0200 ath9k: Set BSSID mask based on configured interfaces Instead of using a hardcoded BSSID mask (mask for own addresses), iterate through all active interfaces and determine the minimal mask that covers all local addresses. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 2c3db3d51ee1fcf84f5828788905a4c091b9ae27 Author: Jouni Malinen Date: Tue Mar 3 19:23:26 2009 +0200 ath9k: Cleanup multiple VIF processing Replace the internal sc_vaps array and index values by using vif pointer from mac80211. Allow multiple VIPs to be registered. Though, number of beaconing VIFs is still limited by ATH_BCBUF (currently 1). Multiple virtual STAs support is not yet complete, but at least the data structures should now be able to handle this. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 860559fe686b44a533c83c79fe5d1ad41bf9e090 Author: Ivo van Doorn Date: Tue Mar 3 18:14:18 2009 +0100 rt2x00: Export all register stats through debugfs By exporting the register base, and word size to userspace through debugfs it will be easier to create scripts which parse the register information. This makes debugging and register dumps information easier. This will break my previous scripts which dumped and parsed all information, but since this is only for debugging purposes this change should not be a problem. Dumpfiles created with the old version can be easily manually edited to make them compatible with this new approach, which means there will be no problems comparing dumps from the different versions either. Also be more consistent with using tabs to seperate different fields. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit d216aaa674feb14a4aeb56bc3708f69d81c39d45 Author: Jouni Malinen Date: Tue Mar 3 13:11:53 2009 +0200 ath9k: Clean up setkey operations There is no need to use ath_keyset() wrapper for ath9k_hw_set_keycache_entry() calls. In addition, improve the comments describing the key setting operations. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit aebe2b5624b9a3c00b78b1b285c43de73c81f7c5 Author: Gabor Juhos Date: Tue Mar 3 10:49:59 2009 +0100 ath9k: fix AR_TXCFG_DMASZ_MASK value The current bitmask is invalid, because the tx dma size is a 3 bit wide value. Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit b75bc150af4f276fd0e197c8409c62b71cc86118 Author: Sujith Date: Tue Mar 3 10:16:59 2009 +0530 ath9k: Remove unused variables in struct ath_beacon_config We don't store the beacon timestamp internally, nor do we do any TIM handling in ath9k. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 2554935b08f87e0ce1852635720d2d3ac91fc512 Author: Sujith Date: Tue Mar 3 10:16:57 2009 +0530 ath9k: Lock config_interface() callback with a mutex Signed-off-by: Sujith Signed-off-by: John W. Linville commit b238e90e99fe51aed14d20eae8a6a1c04ce4ca30 Author: Sujith Date: Tue Mar 3 10:16:56 2009 +0530 ath9k: Handle TSF properly for AP mode The TSF has to be reset only once, upon bringing the interface up in AP mode. For any beacon reconfigure calls after that, resetting the TSF results in incorrect beacon generation. The only exception is a change in the beacon interval, which is indicated to the driver by mac80211 through IEEE80211_CONF_CHANGE_BEACON_INTERVAL, handle this properly. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 5379c8a26686e12058e23322615df68f9123bccd Author: Sujith Date: Tue Mar 3 10:16:54 2009 +0530 ath9k: Split beacon configuration into mode specific routines This makes the code easier to understand. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 9546aae0863c12a3d00b1ed5cbd316520733200b Author: Sujith Date: Tue Mar 3 10:16:53 2009 +0530 ath9k: Cleanup beacon stuck processing We never use SC_OP_NO_RESET, it is not configurable at all. Remove all code that deals with this flag and make beacon stuck processing simple. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 9fc9ab0a6929c9f137747df0ecf294e9582607f9 Author: Sujith Date: Tue Mar 3 10:16:51 2009 +0530 ath9k: Scrub beacon.c Remove useless comments, fix indentation. Also, remove all occurrences of ASSERT(vif) which are not needed. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 0c98de6535f4de746618547c057dccd442ba968a Author: Sujith Date: Tue Mar 3 10:16:45 2009 +0530 ath9k: Use new scan notifiers from mac80211 The only use case for this right now is ANI calibration, but more might come up in the future. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 707c1b4e68a2811ff2c9e75750a98a3310789a2d Author: Sujith Date: Tue Mar 3 10:15:10 2009 +0530 mac80211: Update IBSS beacon timestamp properly In IBSS mode, the beacon timestamp has to be filled with the BSS's timestamp when joining, and set to zero when creating a new BSS. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 0ad65bd7e1b38dd2c86da5f07dbfa35fe1f03099 Author: Alina Friedrichsen Date: Mon Mar 2 23:29:48 2009 +0100 ath5k: Set TSF fix The old code doesn't work correctly e.g. on newer chipsets like AR5418+AR2122 and AR5416+AR2133. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit b9a1619763a4b30273cd28fad75b3d962e53e020 Author: Alina Friedrichsen Date: Mon Mar 2 23:28:38 2009 +0100 ath9k: Set TSF fix The old code doesn't work correctly e.g. on newer chipsets like AR5418+AR2122 and AR5416+AR2133. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit ce4fbdbf161b2676b3833412367113572d739253 Author: Michael Buesch Date: Mon Mar 2 23:18:37 2009 +0100 b43: Pass more RX flags to mac80211 This changes the RX handler to pass more status flags to mac80211. It also changes part of the drop policy, if bad frames were requested. (Note that currently mac80211 will throw a WARN_ON in that case. But nothing bad will happen). This also removes some obsolete unused timestamping code. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 91ed19f5f66a7fe544f0ec385e981f43491d1d5a Author: Alina Friedrichsen Date: Mon Mar 2 23:13:40 2009 +0100 ath9k: Fix FIF_BCN_PRBRESP_PROMISC handling So that a new created IBSS network doesn't break on the first scan. It seems to Sujith and me that this stupid code unnecessary, too. So remove it... Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit 541d8dd5e848aa5f8223a9e8e13b369d64865f07 Author: Vivek Natarajan Date: Mon Mar 2 20:25:14 2009 +0530 ath9k: Handle power modes in isr for power save. Restore network sleep mode in isr if power save is enabled. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 9331ec8060da5783307a565792ded33bfb9e54fc Author: Sujith Date: Mon Mar 2 13:29:45 2009 +0530 ath9k: Fill in rate_update mac80211 callback This callback can be used to handle dynamic 20/40, and changes in the operating channel's HT parameters. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 25c9c8752849212a25bf7f38b40b64b3958d619b Author: Vivek Natarajan Date: Mon Mar 2 20:20:30 2009 +0530 mac80211: Always send a null data frame if TIM bit is set. If the AP thinks we are in power save state eventhough we are not truly in that state, it sets the TIM bit and does not send a data frame unless we send a null data frame to correct the state in the AP. This might happen if the null data frame for wake up is lost in the air after we disable power save. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit e0caf9eaae5182ab4e02a5d703ade64719738f87 Author: Jouni Malinen Date: Mon Mar 2 18:15:53 2009 +0200 ath9k: Remove unused key xoring This is not used anywhere in ath9k and is just making the code more confusing. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 672903b329579ff43ae3d553cf55bd82041921c1 Author: Jouni Malinen Date: Mon Mar 2 15:06:31 2009 +0200 ath9k: Document keycache operations There are number of small details about the keycache operations that are very easy to miss (and forget), so better include detailed comments in ath9k_hw_set_keycache_entry() to avoid having to figure out this every time when having to touch this area. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit e65c22633c14eabe9593a71a727f81544378b892 Author: Sujith Date: Mon Mar 2 13:28:31 2009 +0530 mac80211: Fix TKIP/WEP HT capability handling There is no need to parse the AP's HT capabilities if the STA uses TKIP/WEP cipher. This allows the rate control module to choose the correct(legacy) rate table. Signed-off-by: Sujith Signed-off-by: John W. Linville commit a412c8040d83366dcc24962207b8beed52f29344 Author: Frank Seidel Date: Sun Mar 1 20:25:38 2009 +0100 iwlwifi: reduce stack size Reduce stack memory footprint of iwlwifi. (From >1000 bytes for each *_table_read on i386 down to 32) Signed-off-by: Frank Seidel Signed-off-by: John W. Linville commit 64abd80330baba9d87df2b952a7eec5af5158470 Author: Ivo van Doorn Date: Sun Mar 1 17:42:00 2009 +0100 rt2x00: Fix SW antenna diversity Software antenna tuning is broken because of an function ordering problem during rt2x00link_tuner(). rt2x00link_precalculate_signal() rt2x00leds_led_quality() rt2x00lib_antenna_diversity() rt2x00link_precalculate_signal() will reset the quality TX/RX counters, however rt2x00lib_antenna_diversity() requires the RX counter to see what RSSI value must be used for a particular antenna. We can't change the ordering since rt2x00lib_antenna_diversity() might reset other statistics which are needed by the function called earlier. Move the reset of the quality TX/RX counters into a seperate function and move the call to after rt2x00lib_antenna_diversity(). Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 14d2aac580993ac8faeac0d903207e316c0881c3 Author: Abhijeet Kolekar Date: Fri Feb 27 16:21:24 2009 -0800 iwl3945 : use iwl_activate_qos 3945 can use iwl_activate_qos instead of iwl3945_activate_qos. Patch does two things 1) Patch adds iwl_activate_qos in core library. 2) 3945 makes use of iwl_activate_qos. Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 2a4ddaabe0055962fbfffb72633a97eadc7e93ac Author: Abhijeet Kolekar Date: Fri Feb 27 16:21:23 2009 -0800 iwl3945: add iwl3945_setup_mac Patch does following, 1) mac80211's shared data is now initialized in iwl3945_setup_mac. 2) Set the rfkill to right state after initialization Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit c8f16138b5099bfd928942c3775aaecfd649e9e5 Author: Reinette Chatre Date: Fri Feb 27 16:21:22 2009 -0800 iwlwifi: fix *pci_probe error flow for iwlagn: - Have to free eeprom of version check fails - otherwise we end up with memory leak. - Include removal of workqueue (created in _setup_deferred_work) in error handling. for iwl3945: - Fix a few places to jump to correct error handling. - Reorganize error handling to match with code flow. - Include iwl_free_channel_map as part of error handling. - Include releasing eeprom as part of error handling. Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 6e21f15cac2c6c25b6a5874a98420e1b9064f0c1 Author: Abhijeet Kolekar Date: Fri Feb 27 16:21:21 2009 -0800 iwl3945: unify set key flow with iwlwifi unify the set key flow with iwlwifi. Signed-off-by: Abhijeet Kolekar Acked-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 7c4cbb6ee0a55885d697a5b07b6c4c8fd10d573a Author: Abhijeet Kolekar Date: Fri Feb 27 16:21:20 2009 -0800 iwl3945: synchronize timestamp with uCode In IBSS, TSF maintains local clock counters at each station. Network Synchronization follows a completely distributed scheme where beacon frames are generated. Each station maintain its own TSF timestamp, extracted from beacon timestamps they recieved. Following patch synchronize this beacon timestamp with uCode. Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 39e6d2256b8b8265ef16297887b5521f3e0155c6 Author: Jay Sternberg Date: Fri Feb 27 16:21:19 2009 -0800 iwlwifi: update 5150 API version to support new firmware update API to support new numbering that is used for other newer devices. 5150 ucode has not been released yet, so the first released API will be v2. For those who do have a v1 API the driver does have backward compatibility support new value of REPLY_TX_POWER_DBM_CMD Signed-off-by: Jay Sternberg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 24776cfd5559d3171054d3a7ea76d5febc54b03d Author: Johannes Berg Date: Fri Feb 27 16:33:55 2009 -0600 mac80211: Fix quality reporting for wireless stats Since "mac80211/cfg80211: move iwrange handler to cfg80211", the results for link quality from "iwlist scan" and "iwconfig" commands have been very different. The results are now consistent. Signed-off-by: Johannes Berg Reported- and tested-by: Larry Finger Signed-off-by: John W. Linville commit e79c1ba84c68de9161d541bd2bcc8ea65c89955c Author: Michael Buesch Date: Fri Feb 27 16:59:05 2009 +0100 ssb: Add SPROM fallback support This adds SSB functionality to register a fallback SPROM image from the architecture setup code. Weird architectures exist that have half-assed SSB devices without SPROM attached to their PCI busses. The architecture can register a fallback SPROM image that is used if no SPROM is found on the SSB device. Signed-off-by: Michael Buesch Cc: Florian Fainelli Signed-off-by: John W. Linville commit e31ae0508315ebf5d8b1b8a1fca8550737fb3996 Author: Sujith Date: Fri Feb 27 09:44:00 2009 +0530 mac80211: Notify the driver only when the beacon interval changes Currently, the driver is unconditionally notified of beacon interval. This is a problem in AP mode, because the driver has to know that the beacon interval has actualy changed to recalculate TBTT and reset the HW TSF. Fix this to make mac80211 notify the driver only when the beacon interval has been reconfigured to a new value. Signed-off-by: Sujith Signed-off-by: John W. Linville commit db5b4f7ae3901fdc48c5b988fc2a5e0cb4ec1870 Author: Jiri Slaby Date: Thu Feb 26 23:44:31 2009 +0100 ath5k: fix hw rate index condition Make sure we print out a warning when the index is out of bounds, i.e. even on hw_rix == AR5K_MAX_RATES. Also change to WARN and print text with the reported hw_rix. Signed-off-by: Jiri Slaby Cc: Nick Kossifidis Cc: Luis R. Rodriguez Cc: Bob Copeland Signed-off-by: John W. Linville commit 3f53dd64f192450cb331c0fecfc26ca952fb242f Author: Jouni Malinen Date: Thu Feb 26 11:18:46 2009 +0200 ath9k: Fix hw crypto configuration for TKIP in AP mode Incorrect Michael MIC key (RX, should have been TX) was set for the group key in AP mode. This resulted in all broadcast frames triggering Michael MIC errors and eventual TKIP countermeasures. The change here sets the correct Michael MIC key based on whether the local end is the authenticator (well, AP for now). Signed-off-by: Jouni Malinen Tested-by: Pat Erley Signed-off-by: John W. Linville commit 998a5a7d6aabe7e450759e0d82c8a79afd5a97ff Author: Frank Seidel Date: Wed Feb 25 15:39:57 2009 +0100 airo: reduce stack memory footprint Applying kernel janitors todos (reduce stack footprint where possible) to airo wireless driver. (Before 1124 bytes on i386, now 876) Signed-off-by: Frank Seidel Signed-off-by: John W. Linville commit b837e606d17a765f404175ae42a15ce17631e7d2 Author: Roel Kluin Date: Wed Feb 25 13:35:34 2009 +0100 wireless, wavelan: spin off by 1 spin can reach -1 after the loop, so 0 is still success. Signed-off-by: Roel Kluin Signed-off-by: John W. Linville commit fa09632b0277aa43c6f37161f0a592a1a5b2167d Author: Vasanthakumar Thiagarajan Date: Wed Feb 25 10:28:23 2009 +0530 ath9k: Remove ununsed ack duration stuff with long/short preamble Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit f40154e7f7be1c58e8041ed4fbe6cd3b8049f4b4 Author: Vasanthakumar Thiagarajan Date: Wed Feb 25 10:28:22 2009 +0530 ath9k: Configure Power control register appropriately for h/w with 4k eeprom Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 5fe73197d359248cbf32dfd3280540d6a0dfd31c Author: Alina Friedrichsen Date: Wed Feb 25 00:49:18 2009 +0100 zd1211rw: Implement get_tsf() This patch implements get_tsf() of ieee80211_ops in the zd1211rw driver. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit b3bd89ce956c220fe52a003103f14af48f695fda Author: Jouni Malinen Date: Tue Feb 24 13:42:01 2009 +0200 ath9k: Add module parameter to disable hardware crypto nohwcrypt=1 module parameter can now be used to disable hardware crypto in ath9k. While the hardware acceleration handles most cases, it may be useful to be able to force mac80211 software implementation to be used for some tests, e.g., with virtual interface combinations that may not yet be supported in the key cache configuration. In addition, this allows management frame protection to be tested with older hardware revisions. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit f03d3115a6bcb814019d945c50c2ef91e5f14477 Author: Takashi Iwai Date: Thu Mar 5 14:18:16 2009 +0100 ALSA: Fix sample rate of Lenovo Ideapad to 44.1kHz Noises can be heard on analog outputs of (some model of) Lenovo Ideapad due to the hardware problem, and the only workaround right now is to fix the sample rate to 44.1kHz. Signed-off-by: Takashi Iwai commit 8a0be9ef8225638d26b455788f988c8f84ce9e75 Author: Frederic Weisbecker Date: Thu Mar 5 01:27:02 2009 +0100 sched: don't rebalance if attached on NULL domain Impact: fix function graph trace hang / drop pointless softirq on UP While debugging a function graph trace hang on an old PII, I saw that it consumed most of its time on the timer interrupt. And the domain rebalancing softirq was the most concerned. The timer interrupt calls trigger_load_balance() which will decide if it is worth to schedule a rebalancing softirq. In case of builtin UP kernel, no problem arises because there is no domain question. In case of builtin SMP kernel running on an SMP box, still no problem, the softirq will be raised each time we reach the next_balance time. In case of builtin SMP kernel running on a UP box (most distros provide default SMP kernels, whatever the box you have), then the CPU is attached to the NULL sched domain. So a kind of unexpected behaviour happen: trigger_load_balance() -> raises the rebalancing softirq later on softirq: run_rebalance_domains() -> rebalance_domains() where the for_each_domain(cpu, sd) is not taken because of the NULL domain we are attached at. Which means rq->next_balance is never updated. So on the next timer tick, we will enter trigger_load_balance() which will always reschedule() the rebalacing softirq: if (time_after_eq(jiffies, rq->next_balance)) raise_softirq(SCHED_SOFTIRQ); So for each tick, we process this pointless softirq. This patch fixes it by checking if we are attached to the null domain before raising the softirq, another possible fix would be to set the maximal possible JIFFIES value to rq->next_balance if we are attached to the NULL domain. v2: build fix on UP Signed-off-by: Frederic Weisbecker Cc: Steven Rostedt Cc: Peter Zijlstra LKML-Reference: <49af242d.1c07d00a.32d5.ffffc019@mx.google.com> Signed-off-by: Ingo Molnar commit 899e6cf5e6d83a91d2e257f7a4e8ca98db3831cc Author: Ben Dooks Date: Wed Mar 4 00:49:28 2009 +0000 S3C: Move to The file needs to be common to both ARCH_S3C2410 and ARCH_S3C64XX as they share common driver code, so move it to . Signed-off-by: Ben Dooks Signed-off-by: Mark Brown commit 8150bc886be5ce3cc301a2baca1fcf2cf7bd7f39 Author: Ben Dooks Date: Wed Mar 4 00:49:26 2009 +0000 S3C24XX: Move and update IIS headers Move the IIS headers to their correct place. Signed-off-by: Ben Dooks Signed-off-by: Mark Brown commit 49d2d266adff27793fed247a2e9e672d59b6ddc6 Merge: 5512b3e... fec6c6f... Author: Ingo Molnar Date: Thu Mar 5 11:59:10 2009 +0100 Merge commit 'v2.6.29-rc7' into sched/core commit 508827ff0ac3981d420edac64a70de7f4e304d38 Merge: 2c3c3d0... 72e2240... Author: David S. Miller Date: Thu Mar 5 02:06:47 2009 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/tokenring/tmspci.c drivers/net/ucc_geth_mii.c commit a4b1fddcd40f10820fbc123d4d02cd62eeef476c Author: Paul Mundt Date: Thu Mar 5 17:52:34 2009 +0900 sh: Set a sensible default for the SH7786 pclk. Signed-off-by: Paul Mundt commit 37db623ae2a7bde234a8ed683d0d13d6f939199c Author: Takashi Iwai Date: Thu Mar 5 09:40:16 2009 +0100 ALSA: hda - Fix check of ALC888S-VC in alc888_coef_init() Fixed the wrong bits check to identify ALC888S-VC model in alc888_coef_init(). Signed-off-by: Takashi Iwai commit c2503cd3be9eacb1dd06ec5b6fba8bb06aac12a8 Author: Takashi Iwai Date: Thu Mar 5 09:37:40 2009 +0100 ALSA: hdsp - Ignore MIDI and PCM events in interrupts until initialized Ignore MIDI and PCM events in the interrupt handler until the device gets initialized properly. Otherwise you may get kernel panic by the access to uninitialized devices via hotplugging. Signed-off-by: Takashi Iwai commit 929ef1a1f566087e4b362e3a56c50bf9db30e3c5 Author: Kuninori Morimoto Date: Thu Mar 5 17:37:12 2009 +0900 sh: urquell: Add smc91x support and update defconfig accordingly. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 36e8abf3edcd2d207193ec5741d1a2a645d470a5 Author: Dave Jones Date: Thu Mar 5 00:16:26 2009 -0500 [CPUFREQ] Prevent p4-clockmod from auto-binding to the ondemand governor. The latency of p4-clockmod sucks so hard that scaling on a regular basis with ondemand is a really bad idea. Signed-off-by: Matthew Garrett Signed-off-by: Dave Jones commit 2c3c3d02f28801d7ad2da4952b2c7ca6621ef221 Author: Ben Hutchings Date: Wed Mar 4 10:01:57 2009 +0000 sfc: Improve NIC internal error recovery Make the error count a per-NIC variable. Reset this the count after an hour if it has not reached the critical value. Set the critical value back to 5. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 4720bc6cfe70b606cf62a244c7a5391e59923e45 Author: Ben Hutchings Date: Wed Mar 4 10:01:15 2009 +0000 sfc: Fix search for flush completion events When flushing queues we disable normal interrupt and event handling and poll event queue 0 looking for flush completions. Unfortunately the flush event polling loop fails to move past any other type of event. This problem has not been observed in production hardware but appears to be a possibility. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 32d760073eacd41ecc815db1e958f0e1e0b82d57 Author: Ben Hutchings Date: Wed Mar 4 09:53:15 2009 +0000 sfc: Don't wake TX queues while they're being flushed Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 8c870379d2db81a11ede65e9fd9774e4e6efe84a Author: Ben Hutchings Date: Wed Mar 4 09:53:02 2009 +0000 sfc: Clear I2C adapter structure in falcon_remove_nic() i2c_del_adapter() leaves dangling pointers in the structure. If we retry the NIC probe and pass the structure to i2c_add_adapter() again it will lead to an oops unless we clear it first. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 115122afc5e34499a0edfd2b057e9c352fa7c78f Author: Ben Hutchings Date: Wed Mar 4 09:52:52 2009 +0000 sfc: Clean up properly on reset failure paths If MAC switching fails, stop the port properly. If PHY reinitialisation fails, clear the port_initialized flag. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit a7ef59332b33cb1924ea76cce2aa620a32bb0d7a Author: Ben Hutchings Date: Wed Mar 4 09:52:37 2009 +0000 sfc: Reject packets from the kernel TX queue during a loopback self-test Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit ca83db369c1c633142c08dd0bfafca6ac4247c63 Author: Ben Hutchings Date: Wed Mar 4 09:51:12 2009 +0000 sfc: Fix efx_ethtool_nway_result() to use clause 45 MDIO registers Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 6432f366842c78d17b2df974c68f39cb5794f2c2 Author: Roland Dreier Date: Wed Mar 4 15:22:39 2009 -0800 IB: Remove useless ibdev_is_alive() tests from sysfs code Some attribute show functions test ibdev_is_alive() to make sure that it's OK to access device state. However, the sysfs attributes will not be registered until the device is fully initialized, and they'll be unregistered before anything is torn down, so ibdev_is_alive() doesn't do anything useful. Remove it. Signed-off-by: Roland Dreier commit 6335d05548eece40092000aa91b64a50310d69d5 Author: Eric Miao Date: Tue Mar 3 09:41:00 2009 +0800 ASoC: make ops a pointer in 'struct snd_soc_dai' Considering the fact that most cpu_dai or codec_dai are using a same 'snd_soc_dai_ops' for several similar interfaces, 'ops' would be better made a pointer instead, to make sharing easier and code a bit cleaner. The patch below is rather preliminary since the asoc tree is being actively developed, and this touches almost every piece of code, (and possibly many others in development need to be changed as well). Building of all codecs are OK, yet to every SoC, I didn't test that. Signed-off-by: Eric Miao Acked-by: Timur Tabi Signed-off-by: Mark Brown commit 113a0e4590881ce579ca992a80ddc562b3372ede Author: etienne Date: Wed Mar 4 07:33:51 2009 +0100 smack: fixes for unlabeled host support The following patch (against 2.6.29rc5) fixes a few issues in the smack/netlabel "unlabeled host support" functionnality that was added in 2.6.29rc. It should go in before -final. 1) smack_host_label disregard a "0.0.0.0/0 @" rule (or other label), preventing 'tagged' tasks to access Internet (many systems drop packets with IP options) 2) netmasks were not handled correctly, they were stored in a way _not equivalent_ to conversion to be32 (it was equivalent for /0, /8, /16, /24, /32 masks but not other masks) 3) smack_netlbladdr prefixes (IP/mask) were not consistent (mask&IP was not done), so there could have been different list entries for the same IP prefix; if those entries had different labels, well ... 4) they were not sorted 1) 2) 3) are bugs, 4) is a more cosmetic issue. The patch : -creates a new helper smk_netlbladdr_insert to insert a smk_netlbladdr, -sorted by netmask length -use the new sorted nature of smack_netlbladdrs list to simplify smack_host_label : the first match _will_ be the more specific -corrects endianness issues in smk_write_netlbladdr & netlbladdr_seq_show Signed-off-by: Acked-by: Casey Schaufler Reviewed-by: Paul Moore Signed-off-by: James Morris commit 7ec30f0e7768985ab2ef6334840e3fc8fa253421 Author: Herton Ronaldo Krzesinski Date: Wed Mar 4 14:22:52 2009 -0300 ALSA: hda - Map 3stack-hp model (ALC888) for HP Educ.ar Added model=3stack-hp for HP Educ.ar desktop machine (103c:2a72). Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Takashi Iwai commit 8718b700ccbcc3c6016d38a75e005293c3660f1c Author: Herton Ronaldo Krzesinski Date: Wed Mar 4 14:22:51 2009 -0300 ALSA: hda - Add headphone automute support for 3stack-hp model (ALC888) Mute speaker outputs on headphone insertion for machines that use 3stack-hp model. Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Takashi Iwai commit 3ea0d7cf472c6118bb8c0842d606f5436251e179 Author: Herton Ronaldo Krzesinski Date: Wed Mar 4 14:22:50 2009 -0300 ALSA: hda - Add 4 channel mode for 3stack-hp model (ALC888) Add additional 4 channel mode for 3stack-hp models. Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Takashi Iwai commit 86027ae78c9294bb450b76eec28cfb431a8fb3ee Author: Jonas Andersson Date: Wed Mar 4 08:24:26 2009 +0100 ASoC: wm8510 pll settings When setting WM8510_MCLKDIV the pll was turned off. When setting pll frequency you got twice the expected freq, because the code calculated with postscaler of 8, but the hardware divide by 4. Signed-off-by: Jonas Andersson Signed-off-by: Mark Brown commit ec67624d33d5639bcc6ee6918cb1fc0bd1bac3a8 Author: Lopez Cruz, Misael Date: Tue Mar 3 15:25:04 2009 -0600 ASoC: Add GPIO support for jack reporting interface Add GPIO support to jack reporting framework in ASoC using gpiolib calls. The gpio support exports two new functions: snd_soc_jack_add_gpios and snd_soc_jack_free_gpios. Client drivers using gpio feature must pass an array of jack_gpio pins belonging to a specific jack to the snd_soc_jack_add_gpios function. The framework will request the gpios, set the data direction and request irq. The framework will update power status of related jack_pins when an event on the gpio pins comes according to the reporting bits defined for each gpio. All gpio resources allocated when adding jack_gpio pins can be released using snd_soc_jack_free_gpios function. Signed-off-by: Misael Lopez Cruz Signed-off-by: Mark Brown commit bd6afe3f34d41ed81e0c62a5a2181bb7bd51aebf Author: Takashi Iwai Date: Wed Mar 4 11:30:25 2009 +0100 ALSA: hda - Fix conflict of mixer controls on Sony VAIO VGN-AR71S The recent update enabled the model=sony-assamd for all ALC262 with PCI SSID 104d:90xx. But this includes the VAIO VGN-AR* that has the primary codec of STAC92xx and the secondary ALC262 as a slave digital-only codec. For this device, the model=auto must be chosen to work properly. Signed-off-by: Takashi Iwai commit 79d7d5333b598e9a559bf27833f0ad2b8bf6ad2c Author: Takashi Iwai Date: Wed Mar 4 09:03:50 2009 +0100 ALSA: hda - Fix HP dv6736 mic input Fix the mic input of HP dv6736 with Conexant 5051 codec chip. This laptop seems have no mic-switching per jack connection. A new model hp-dv6736 is introduced to match with the h/w implementation. Reference: Novell bnc#480753 https://bugzilla.novell.com/show_bug.cgi?id=480753 Signed-off-by: Takashi Iwai commit 0c5c2d3089068d4aa378f7a40d2b5ad9d4f52ce8 Author: Eric Biederman Date: Wed Mar 4 00:03:08 2009 -0800 neigh: Allow for user space users of the neighbour table Currently it is possible to do just about everything with the arp table from user space except treat an entry like you are using it. To that end implement and a flag NTF_USE that when set in a netwlink update request treats the neighbour table entry like the kernel does on the output path. This allows user space applications to share the kernel's arp cache. Signed-off-by: Eric Biederman Signed-off-by: David S. Miller commit fc1f9ea51de726b3b8003539788d918814c9deff Author: Ron Mercer Date: Tue Mar 3 12:10:37 2009 +0000 qlge: Add support for lost firmware events. When the firmware is issuing events to the driver the events must be removed from the queue. If the queue overflows, the firmware will build and special event that captures those that are lost. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit bb6676705e41efdf4ba788340a885b19fd5a0215 Author: Ron Mercer Date: Tue Mar 3 12:10:36 2009 +0000 qlge: Save status from firmware crash (system err). Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 7c92191cb4203d3900461074f90851e9e7b56fcb Author: Ron Mercer Date: Tue Mar 3 12:10:35 2009 +0000 qlge: Improve handling for firmware init failure. This event will arrive at boot time or after an MPI processor reset if the firmware failed to initialize. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit f56b54f5423177d26da0aee1f8e7d5da6225ce6d Author: Ron Mercer Date: Tue Mar 3 12:10:34 2009 +0000 qlge: Clean up event handler for firmware init. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 2ee1e272d1661d7846da753248a4141ad5f16d69 Author: Ron Mercer Date: Tue Mar 3 12:10:33 2009 +0000 qlge: Add worker-handler for firmware events. This worker and it's supporting routines are used for IDC 'inter-device-communication' events that require an ACK mailbox command be sent to allow completion of the request. These requests are originated by another function wanting to change some common port paramters. Typical example would be: 1) Change max TX/RX frame size allowed. 2) Change pause parameters. 3) Change loopback mode. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 5700abe94794cd548d9cb8bfb7e00eb7a8bedb60 Author: Ron Mercer Date: Tue Mar 3 12:10:32 2009 +0000 qlge: Clean up link up processing. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 11d9fe68acd8213b50f3a8b5b6a4b66f623a82c3 Author: Ron Mercer Date: Tue Mar 3 12:10:31 2009 +0000 qlge: Clean up link down processing. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit eae6b58fb229bd17fea38d596020b80547e51381 Author: Ron Mercer Date: Tue Mar 3 12:10:30 2009 +0000 qlge: Add firmware support for insert/remove SFP. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 0c01aed50d4844f54f59e875e05d211e80874464 Author: Geert Uytterhoeven Date: Wed Mar 4 15:42:15 2009 +0800 crypto: testmgr - add zlib test Signed-off-by: Geert Uytterhoeven Signed-off-by: Herbert Xu commit 38d408152a86598a50680a82fe3353b506630409 Author: Eric Biederman Date: Tue Mar 3 23:36:04 2009 -0800 veth: Allow setting the L3 MTU The limitation to only 1500 byte mtu's limits the utility of the veth device for testing routing. So implement implement a configurable MTU. For consistency I drop packets on the receive side when they are larger than the MTU. I count those drops. And I allow a little padding for vlan headers. I also test the mtu when a new device is created with netlink because that path currently bypasses the current mtu setting code. Signed-off-by: Eric Biederman Signed-off-by: David S. Miller commit bf68e65ec9ea61e32ab71bef59aa5d24d255241f Author: Geert Uytterhoeven Date: Wed Mar 4 15:15:49 2009 +0800 crypto: zlib - New zlib crypto module, using pcomp Signed-off-by: Geert Uytterhoeven Cc: James Morris Signed-off-by: Herbert Xu commit 8064efb8740b8a0141d99a181cb5b9a430b1836c Author: Geert Uytterhoeven Date: Wed Mar 4 15:08:03 2009 +0800 crypto: testmgr - Add support for the pcomp interface Signed-off-by: Geert Uytterhoeven Signed-off-by: Herbert Xu commit a1d2f09544065b60598b8167d94a6371bff3e892 Author: Geert Uytterhoeven Date: Wed Mar 4 15:05:33 2009 +0800 crypto: compress - Add pcomp interface The current "comp" crypto interface supports one-shot (de)compression only, i.e. the whole data buffer to be (de)compressed must be passed at once, and the whole (de)compressed data buffer will be received at once. In several use-cases (e.g. compressed file systems that store files in big compressed blocks), this workflow is not suitable. Furthermore, the "comp" type doesn't provide for the configuration of (de)compression parameters, and always allocates workspace memory for both compression and decompression, which may waste memory. To solve this, add a "pcomp" partial (de)compression interface that provides the following operations: - crypto_compress_{init,update,final}() for compression, - crypto_decompress_{init,update,final}() for decompression, - crypto_{,de}compress_setup(), to configure (de)compression parameters (incl. allocating workspace memory). The (de)compression methods take a struct comp_request, which was mimicked after the z_stream object in zlib, and contains buffer pointer and length pairs for input and output. The setup methods take an opaque parameter pointer and length pair. Parameters are supposed to be encoded using netlink attributes, whose meanings depend on the actual (name of the) (de)compression algorithm. Signed-off-by: Geert Uytterhoeven Signed-off-by: Herbert Xu commit e9cc8bddaea3944fabfebb968bc88d603239beed Author: Geert Uytterhoeven Date: Wed Mar 4 14:53:30 2009 +0800 netlink: Move netlink attribute parsing support to lib Netlink attribute parsing may be used even if CONFIG_NET is not set. Move it from net/netlink to lib and control its inclusion based on the new config symbol CONFIG_NLATTR, which is selected by CONFIG_NET. Signed-off-by: Geert Uytterhoeven Acked-by: David S. Miller Signed-off-by: Herbert Xu commit 8c882f64130071eaebdc0861bee34a73e436f004 Author: Adrian-Ken Rueegsegger Date: Wed Mar 4 14:43:52 2009 +0800 crypto: Fix dead links Signed-off-by: Adrian-Ken Rueegsegger Signed-off-by: Herbert Xu commit abb79972b4d1dff00f79cb0d123173abac48a6ae Author: Randy Dunlap Date: Tue Mar 3 21:39:40 2009 -0800 rds: fix iband RDMA dependencies Fix RDS Infiniband dependencies for RDMA so that these build errors won't happen: ERROR: "rdma_accept" [net/rds/rds.ko] undefined! ERROR: "rdma_destroy_id" [net/rds/rds.ko] undefined! ERROR: "rdma_connect" [net/rds/rds.ko] undefined! ERROR: "rdma_destroy_qp" [net/rds/rds.ko] undefined! ERROR: "rdma_listen" [net/rds/rds.ko] undefined! ERROR: "rdma_notify" [net/rds/rds.ko] undefined! ERROR: "rdma_create_id" [net/rds/rds.ko] undefined! ERROR: "rdma_create_qp" [net/rds/rds.ko] undefined! ERROR: "rdma_bind_addr" [net/rds/rds.ko] undefined! ERROR: "rdma_resolve_route" [net/rds/rds.ko] undefined! ERROR: "rdma_disconnect" [net/rds/rds.ko] undefined! ERROR: "rdma_reject" [net/rds/rds.ko] undefined! ERROR: "rdma_resolve_addr" [net/rds/rds.ko] undefined! Signed-off-by: Randy Dunlap Acked-by: Andy Grover Signed-off-by: David S. Miller commit 6b708b3dde0ab3a10a0eea7774c1d6482f32f587 Author: Jack Morgenstein Date: Tue Mar 3 14:30:01 2009 -0800 IB/sa_query: Fix AH leak due to update_sm_ah() race Our testing uncovered a race condition in ib_sa_event(): spin_lock_irqsave(&port->ah_lock, flags); if (port->sm_ah) kref_put(&port->sm_ah->ref, free_sm_ah); port->sm_ah = NULL; spin_unlock_irqrestore(&port->ah_lock, flags); schedule_work(&sa_dev->port[event->element.port_num - sa_dev->start_port].update_task); If two events occur back-to-back (e.g., client-reregister and LID change), both may pass the spinlock-protected code above before the scheduled work updates the port->sm_ah handle. Then if the scheduled work ends up running twice, the second operation will then find a non-NULL port->sm_ah, and will simply overwrite it in update_sm_ah -- resulting in an AH leak. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 4780c1953f9bef07365b13af01ae4e8238ecd3de Author: Ralph Campbell Date: Tue Mar 3 14:22:17 2009 -0800 IB/mad: Fix ib_post_send_mad() returning 0 with no generate send comp If ib_post_send_mad() returns 0, the API guarantees that there will be a callback to send_buf->mad_agent->send_handler() so that the sender can call ib_free_send_mad(). Otherwise, the ib_mad_send_buf will be leaked and the mad_agent reference count will never go to zero and the IB device module cannot be unloaded. The above can happen without this patch if process_mad() returns (IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_CONSUMED). If process_mad() returns IB_MAD_RESULT_SUCCESS and there is no agent registered to receive the mad being sent, handle_outgoing_dr_smp() returns zero which causes a MAD packet which is at the end of the directed route to be incorrectly sent on the wire but doesn't cause a hang since the HCA generates a send completion. Signed-off-by: Ralph Campbell Signed-off-by: Roland Dreier commit 5f2a9384a9291d898b4bf85c4fbf497eef582977 Author: Philipp Zabel Date: Tue Mar 3 16:10:52 2009 +0100 ASoC: UDA1380: DATAI is slave only Only allow SND_SOC_DAIFMT_CBS_CFS for the playback DAI. Signed-off-by: Philipp Zabel Signed-off-by: Mark Brown commit aa4ef01de5f2e7ed948b88f9f1cfc93c8e0c3f25 Author: Philipp Zabel Date: Tue Mar 3 16:10:51 2009 +0100 ASoC: Use network mode with 2 slots for 16-bit stereo in pxa-ssp/Zylonite For consistency with 24-bit and 32-bit modes, don't send 16-bit stereo in one 32-bit transfer. Use 2 slots instead on Zylonite. It should result in exactly the same behaviour. Now it is possible to use 16-bit single slot transfers in pxa-ssp, which are needed for Magician to get two frame clock pulses per sample (one for each channel). Signed-off-by: Philipp Zabel Tested-by: Mark Brown Signed-off-by: Mark Brown commit ef9e5e5c31cb2c6254760611289ac13e4e41b964 Author: Philipp Zabel Date: Tue Mar 3 16:10:54 2009 +0100 ASoC: UDA1380: change decimator/interpolator register handling If the UDA1380's interpolator or decimator are set to be clocked from the WSPLL (which syncs to the WSI signal), the DAI link must be running to change the interpolator/decimator registers (which include volume controls and digital mute setting). * Queue work in the alsa PCM_START .trigger to flush registers as soon as the link is running. This replaces the .prepare and .digital_mute callbacks. * Use the SILENCE override instead of MTM for muting and remove its alsa control to avoid confusion. Signed-off-by: Philipp Zabel Signed-off-by: Mark Brown commit a3c7729e6c5d41bbeb3e13befbcf8e4ef76e55dc Author: Philipp Zabel Date: Tue Mar 3 16:10:53 2009 +0100 ASoC: Remove version display from the UDA1380 driver Signed-off-by: Philipp Zabel Signed-off-by: Mark Brown commit 82ad39f9391fca1d3177bd9f6a5264eff5b5346a Author: Takashi Iwai Date: Tue Mar 3 15:00:35 2009 +0100 ALSA: hda - Fix gcc compile warning It's false positive, but annoying. sound/pci/hda/hda_codec.c: In function ‘get_empty_pcm_device’: sound/pci/hda/hda_codec.c:2772: warning: ‘dev’ may be used uninitialized in this function Signed-off-by: Takashi Iwai commit 567c6c4e2b92f4b8632b043f9395b216b7e7c3ce Author: Dhananjay Phadke Date: Mon Mar 2 16:02:17 2009 +0000 netxen: firmware download improvements o set port mode after resetting device. o prefer cut-through firmware (doesn't require on-card memory). o load flashed firmware if newer. Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit 1f434f638457712732238329dfdf089eab25e5b3 Author: Dhananjay Phadke Date: Mon Mar 2 16:02:16 2009 +0000 netxen: support larger dma addressing Support larger dma mask if firmware indicates capability to handle larger addresses. Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit 5ac072e110ff358a9ebc318a1b54f0182b799f72 Author: Kuninori Morimoto Date: Tue Mar 3 16:22:00 2009 +0900 sh: Urquell board support. This adds preliminary support for the SH7786-based Urquell board. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 37042fbd8b3256d2a44b17646fa9de8777d5a34a Author: Paul Mundt Date: Tue Mar 3 15:57:02 2009 +0900 sh: SH7786 is an SH-X3 core, select CPU_SHX3. Signed-off-by: Paul Mundt commit 7e99013a5043cacd375375c3efad35b57c3afdba Author: Vlad Yasevich Date: Mon Mar 2 09:46:14 2009 +0000 sctp: Fix broken RTO-doubling for data retransmits Commit faee47cdbfe8d74a1573c2f81ea6dbb08d735be6 (sctp: Fix the RTO-doubling on idle-link heartbeats) broke the RTO doubling for data retransmits. If the heartbeat was sent before the data T3-rtx time, the the RTO will not double upon the T3-rtx expiration. Distingish between the operations by passing an argument to the function. Additionally, Wei Youngjun pointed out that our treatment of requested HEARTBEATS and timer HEARTBEATS is the same wrt resetting congestion window. That needs to be separated, since user requested HEARTBEATS should not treat the link as idle. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit f61f6f82c90cbaa85270f26b89e3309a8c6e2e88 Author: Wei Yongjun Date: Mon Mar 2 09:46:13 2009 +0000 sctp: use time_before or time_after for comparing jiffies The functions time_before or time_after are more robust for comparing jiffies against other values. Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit c6db93a58f1745cfe1acc2e1a1d68afc3245eced Author: Wei Yongjun Date: Mon Mar 2 09:46:12 2009 +0000 sctp: fix the length check in sctp_getsockopt_maxburst() The code in sctp_getsockopt_maxburst() doesn't allow len to be larger then struct sctp_assoc_value, which is a common case where app writers just pass down the sizeof(buf) or something similar. This patch fix the problem. Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit d212318c9d1b11ff44b57f90b4f9d9c9b31a6ced Author: Wei Yongjun Date: Mon Mar 2 09:46:11 2009 +0000 sctp: remove dup code in net/sctp/socket.c Remove dup check of "if (optlen < sizeof(int))". Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 906f8257eedf64c9f4da0adfacca76d06d8e8cb0 Author: Wei Yongjun Date: Mon Mar 2 09:46:10 2009 +0000 sctp: Add some missing types for debug message This patch add the type name "AUTH" and primitive type name "PRIMITIVE_ASCONF" for debug message. Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit bcc2cb3b97e37317c301309d7052bb61e6cce2c4 Author: Ron Mercer Date: Mon Mar 2 08:07:32 2009 +0000 qlge: Add support for getting/setting port config. This patch adds functionality to get and set port parameters. Currently it is used to set maximum TX/RX frame sizes. This process is also capable of setting: 1) Pause type: Standard or Priority based. 2) Loop back mode. 3) Enable Jumbo frame mode (included here...) Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit cdca8d02ea4229c2ccf3c27fb537b150843f67c9 Author: Ron Mercer Date: Mon Mar 2 08:07:31 2009 +0000 qlge: Add support for device ID 8000. This device has more firmware support for link management, setting TX and RX maximum frame sizes. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit ca0413b66ab44ee0ea40d04eab44ff0fdaf32a1d Author: Ron Mercer Date: Mon Mar 2 08:07:30 2009 +0000 qlge: Add support for firmware mailbox commands. This interface will be used for setting things like maximum frame size, setting WOL, and ACKing changes requested by the FCOE function. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit ee7537b63a28b42b22e48842dfeedc66d96b71f1 Author: Hantzis Fotis Date: Mon Mar 2 22:42:02 2009 -0800 tcp: tcp_init_wl / tcp_update_wl argument cleanup The above functions from include/net/tcp.h have been defined with an argument that they never use. The argument is 'u32 ack' which is never used inside the function body, and thus it can be removed. The rest of the patch involves the necessary changes to the function callers of the above two functions. Signed-off-by: Hantzis Fotis Signed-off-by: David S. Miller commit 55ba99eb211a06709237cb322ecd8c8b6faf6159 Author: Kuninori Morimoto Date: Tue Mar 3 15:40:25 2009 +0900 sh: Add support for SH7786 CPU subtype. This adds preliminary support for the SH7786 CPU subtype. While this is a dual-core CPU, only UP is supported for now. L2 cache support is likewise not yet implemented. More information on this particular CPU subtype is available at: http://www.renesas.com/fmwk.jsp?cnt=sh7786_root.jsp&fp=/products/mpumcu/superh_family/sh7780_series/sh7786_group/ Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit c1accad323372ab788066974844fe4db3c43acb0 Author: Eilon Greenstein Date: Mon Mar 2 08:01:17 2009 +0000 bnx2x: Version update Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 0a64ea57486acd9e17b80bb70b966e81d904b61c Author: Eilon Greenstein Date: Mon Mar 2 08:01:12 2009 +0000 bnx2x: Register dump Adding "ethtool -d" support. Due to the complexity of the FW and HW, there are a lot of different regions in the chip - to keep the code as clean as possible, the ranges were put in an H file. Some areas cannot be read if the driver is running - so by default, the driver will not access those areas - but any programmer facing a problem will be able to easily manipulate the driver to extract full dump. The full dump can also be used with kernel dump modules in case of kernel panic. Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit c3eefaf676646281c07f93cb523a7be4eab67f8c Author: Eilon Greenstein Date: Mon Mar 2 08:01:09 2009 +0000 bnx2x: Debug prints Add the FP index to relevant debug prints and simply beautify some others Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit c016201c5c6520abfcbd0c539fbf2524dd431ce6 Author: Eilon Greenstein Date: Mon Mar 2 08:01:05 2009 +0000 bnx2x: Whitespace Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 8660d8c3abd988d1601b78046733450cc3554a35 Author: Eilon Greenstein Date: Mon Mar 2 08:01:02 2009 +0000 bnx2x: Loopback support at external PHY Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 9223dea6c75f3cb77ca644d84cb152525e6e329d Author: Eilon Greenstein Date: Mon Mar 2 08:00:15 2009 +0000 bnx2x: Display BCM8481 FW version Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 3b313b618b2acbeb2954368980ab52b7f9fd05ef Author: Eilon Greenstein Date: Mon Mar 2 08:00:10 2009 +0000 bnx2x: BCM8705 has no microcode Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit d7bc788beca5879f03e0120ac27b99bdeed95921 Author: Eilon Greenstein Date: Mon Mar 2 08:00:07 2009 +0000 bnx2x: Enable BCM8726 module transmitter When 8726 module detection option is disabled, module should be transmitting regardless of invalid read from EEPROM Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit cc1cb004dfa27c63b43941076b490045a43d5fbd Author: Eilon Greenstein Date: Mon Mar 2 08:00:03 2009 +0000 bnx2x: Supporting new BCM8726 FW Microcode download requires write of another register and read from "Limiting/LRM mode" register before setting Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 762d5f6c95e4c7036aaaf67ec0749ed64ebb71e7 Author: Eilon Greenstein Date: Mon Mar 2 07:59:56 2009 +0000 bnx2x: Calling tx disable unconditionally On unload, the FW assumes that no packets will be sent after the driver sends the FW stop command. To ensure that, the driver must always call netif_tx_disable Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 490c3c9bf986545bdd99dcd4b0045c747564be39 Author: Eilon Greenstein Date: Mon Mar 2 07:59:52 2009 +0000 bnx2x: Using DMA engine Using DMA engine (DMAE) to initialize large consecutive memories in the chip Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 2059aba7e40afb18e578ce57cc48fc3c782a531b Author: Eilon Greenstein Date: Mon Mar 2 07:59:48 2009 +0000 bnx2x: Missing module parameter description Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 8534f32c2fb86bff629f7152bc3096245252062c Author: Eilon Greenstein Date: Mon Mar 2 07:59:45 2009 +0000 bnx2x: napi_poll budget check Check the napi_poll budget only when updating it. Also add a comment to explain the rmb Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 7961f79123604a395dc467c605a94bbaed74df83 Author: Eilon Greenstein Date: Mon Mar 2 07:59:31 2009 +0000 bnx2x: Unlimited Tx interrupt work The Tx interrupt is very short and there is no need to limit it to a budget Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 161197853de91eb1eebdde05f13223c377cf3be0 Author: Eilon Greenstein Date: Mon Mar 2 07:59:27 2009 +0000 bnx2x: Add rmb to read status block indices on load Add rmb to read status block indices on load Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 6044735d8ddd96bf23cf975bae8729c65479aa14 Author: Eilon Greenstein Date: Mon Mar 2 07:59:24 2009 +0000 bnx2x: Reduce the likelihood of smb_mb As the comment explains, this smb_mb is needed only if the queue is stopped (which is unlikely) so the barrier can be moved to that location Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 0d1a8d2d7dd9f6588ed9544a9aa88fd9bd9467d3 Author: Eilon Greenstein Date: Mon Mar 2 07:59:20 2009 +0000 bnx2x: Misleading name As noted by Ben Hutchings , these are the capabilities offsets and not the ID itself Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 98589bb1099732847c5deedc213c17c50dd1bc75 Author: Eilon Greenstein Date: Mon Mar 2 07:59:17 2009 +0000 bnx2x: Remove redundant smb_mb on unload As noted by Ben Hutchings , these smb_mb are not needed Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit a8c9a53c22441efcd57ad7955231b2804696b133 Author: David Dillow Date: Mon Mar 2 22:15:09 2009 -0800 typhoon: repair firmware loading The conversion to avoid using pci_alloc_consistent() broke the firmware load process, as well as added an order-4 kmalloc and doubled the memory usage of the firmware image. Go back to loading a page at a time. Also, since the user can now give us utter garbage for firmware, do a cursory validation so we don't try to load just anything. Signed-off-by: David Dillow Signed-off-by: David S. Miller commit 93fde774546c947ac8563da431f0a6d47452551d Author: Kay Sievers Date: Tue Mar 3 12:16:12 2009 +0900 sh: struct device - replace bus_id with dev_name(), dev_set_name() Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers Signed-off-by: Paul Mundt commit d20b606c99c7fd9f1b6c6ec43c877eaae827d169 Author: Jesse Brandeburg Date: Mon Mar 2 16:03:21 2009 -0800 e1000: fix unmap bug This is in reference to the issue shown in kerneloops (search e1000 unmap) The e1000 transmit code was calling pci_unmap_page on dma handles that it might have called pci_map_single on. Same bug as e1000e Signed-off-by: Jesse Brandeburg Acked-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 8ddc951c73cbc317148c0b9973dde81eece57e4c Author: Jesse Brandeburg Date: Mon Mar 2 16:02:53 2009 -0800 e1000e: fix unmap bug This is in reference to https://bugzilla.redhat.com/show_bug.cgi?id=484494 Also addresses issue show in kerneloops The e1000e transmit code was calling pci_unmap_page on dma handles that it might have called pci_map_single on. Signed-off-by: Jesse Brandeburg Acked-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 19147bb5f1f7e7ee79f0c92f59f67da8c0031dc0 Author: Alexander Duyck Date: Mon Mar 2 16:01:53 2009 -0800 igb: remove skb_orphan calls Remove skb_orphan call from igb driver as it can cause multiple issues due to the fact that it is calling the desctructor and removing the skb from the socket prior to transmission. The call was added to improve performance but did so by allowing the skb to be removed from the socket which gave the socket more window space to transmit. The performance gain is not worth the extra problems that this kind of workaround can introduce as this could lead to a potential DoS if a UDP stream decided to monopolize the transmit path. Signed-off-by: Alexander Duyck Acked-by: Mitch Williams Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 044d408409cc4e1bc75c886e27ca85c270db104c Author: Peter Zijlstra Date: Mon Mar 2 16:13:32 2009 +0100 genirq: assert that irq handlers are indeed running in hardirq context Make sure the genirq layer handlers are indeed running handlers in hardirq context. That is the genirq expectation and doing anything else is broken. Signed-off-by: Peter Zijlstra Cc: Andrew Morton LKML-Reference: <1236006812.5330.632.camel@laptop> Signed-off-by: Ingo Molnar commit c02368a9d059322f913a58111eade87a656fefd5 Merge: f17c754... 778ef1e... Author: Ingo Molnar Date: Mon Mar 2 22:08:56 2009 +0100 Merge branch 'linus' into irq/genirq commit d02b1f3910f12cfe377a31afebcbbde4f5664b74 Author: Takashi Iwai Date: Mon Mar 2 17:34:51 2009 +0100 ALSA: hda - Update documetation for hints sysfs entry Signed-off-by: Takashi Iwai commit 6565e4faca257fc51a4c55199d72e2701ba7e819 Author: Takashi Iwai Date: Mon Mar 2 14:38:35 2009 +0100 ALSA: hda - Add more hint options for IDT/Sigmatel codecs Allow more options to be set/reset via hwdep hint entry. hp_detect, gpio_mask, gpio_dir, gpio_data, eapd_mask and eapd_switch can be checked. For example, to disable hp_detect on the fly, # echo "hp_detect=0" > /sys/class/sound/hwC0D0/hints Signed-off-by: Takashi Iwai commit d78d7a90adf793943cc29a414b6f4364a700aad5 Author: Takashi Iwai Date: Mon Mar 2 14:26:25 2009 +0100 ALSA: hda - Create "Analog Loopback" controls optionally Don't create "Analog Loopback" controls as default since these controls are usually more harmful than useful for normal users. Only created when "loopback = yes" hint is given. Signed-off-by: Takashi Iwai commit ab1726f920275b52991b2eff7538ac6d313bf9a2 Author: Takashi Iwai Date: Mon Mar 2 17:09:25 2009 +0100 ALSA: hda - Add show for init_verbs and hints sysfs entries Added the show method for init_verbs and hints hwdep sysfs entries. They show the current values. Signed-off-by: Takashi Iwai commit 43b62713f67d9f0655f3a61f5bd14d6297ddd3ce Author: Takashi Iwai Date: Mon Mar 2 14:25:17 2009 +0100 ALSA: hda - Add hint string helper functions Added snd_hda_get_hint() and snd_hda_get_bool_hint() helper functions to retrieve a hint value. Internally, the hint is stored in a pair of two strings, key and val. Signed-off-by: Takashi Iwai commit ff09d49ad0176a5f52a398c137a7ff5f669d6be4 Author: Daniel Mack Date: Sat Feb 28 13:21:03 2009 +0100 ASoC: fix typo and removed unneeded switch case for cs4270 This removes a misspelled comment and got rid of superfluous switch case. Signed-off-by: Daniel Mack Acked-by: Timur Tabi Signed-off-by: Mark Brown commit b1c86bb807448701400abc6eb8e958475ab5424b Author: Clemens Ladisch Date: Mon Mar 2 12:06:28 2009 +0100 sound: usb-audio: fix queue length check for high speed devices When checking for the maximum queue length, we have to take into account that MAX_QUEUE is measured in milliseconds (i.e., frames) while the unit of urb_packs is whatever data packet interval the device uses (possibly less than one frame when using high speed devices). Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit eab2b553c3d3ed20698c4a9c7e049a60b804e2f5 Author: Clemens Ladisch Date: Mon Mar 2 11:45:50 2009 +0100 sound: usb-audio: fix rules check for 32-channel devices When storing the channel numbers used by a format, and if the device happens to support 32 channels, the code would try to store 1<<32 in a 32-bit value. Since no valid format can have zero channels, we can use 1<<(channels-1) instead of 1< Signed-off-by: Takashi Iwai commit 1713c0d508fbbb42aa5f90039195e5ac31a50625 Author: Krzysztof Helt Date: Fri Feb 27 21:41:40 2009 +0100 ALSA: opl3sa2 fix irq releasing and short name of card Two simple fixes: 1. Use the same pointer for the free_irq() and the request_irq() calls. 2. A short name of card is appended with '2' or '3' character depending on a detected chip. Remove the '2' character from the short name. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit d3a21be86c178964167aa54c39a01260d33e7509 Author: Randy Dunlap Date: Mon Mar 2 03:15:58 2009 -0800 skbuff.h: fix timestamps kernel-doc Fix skbuff.h kernel-doc for timestamps: must include "struct" keyword, otherwise there are kernel-doc errors: Error(linux-next-20090227//include/linux/skbuff.h:161): cannot understand prototype: 'struct skb_shared_hwtstamps ' Error(linux-next-20090227//include/linux/skbuff.h:177): cannot understand prototype: 'union skb_shared_tx ' Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 94f52cd152ce20aa72415bcf0804faee0d31d023 Author: Ben Hutchings Date: Fri Feb 27 13:08:18 2009 +0000 sfc: Add support for SFN4112F SFP+ reference design Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 8129d2173ea7a5b030b4cba044d1f92689895083 Author: Ben Hutchings Date: Fri Feb 27 13:08:03 2009 +0000 sfc: Clean up LED control Reinitialise LEDs after overriding them for identification. Rename set_fault_led method to set_id_led since we always use it for NIC identification and not faults. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit b4a44a69877960e620461c663805f7cc52e2a798 Author: Ben Hutchings Date: Fri Feb 27 13:07:42 2009 +0000 sfc: Delete unused efx_blinker::led_num field Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit d2d2c3731474614bff5cf47a605e59e847882f5d Author: Ben Hutchings Date: Fri Feb 27 13:07:33 2009 +0000 sfc: Add support for QT2025C PHY This is a new PHY supporting SFP+ modules, used in the SFN4112F reference design. It is similar to the QT2022C2 and shares much of its support code. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 3f39a5e9bff000025c2679101b4f83e4fc21dbba Author: Ben Hutchings Date: Fri Feb 27 13:07:15 2009 +0000 sfc: Fix reporting of PHY id Shuffle bits of the OUI into the conventional written order. Replace PHY id component macros with functions. Zero-pad PHY id components in log messages. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit f794fd440066ccd7d601f405f80aa514b95f15d1 Author: Ben Hutchings Date: Fri Feb 27 13:06:58 2009 +0000 sfc: Remove "XFP" from log messages that are not specific to XFP Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 190dbcfd6806c7c88fc028acda95731ffd43979d Author: Ben Hutchings Date: Fri Feb 27 13:06:45 2009 +0000 sfc: SFT9001/SFN4111T: Check PHY boot status during board initialisation During SFN4111T initialisation, check whether the PHY boot status indicates a bad firmware checksum. If so, prepare to reflash rather than continuing with normal initialisation. Remove redundant PHY boot status check from tenxpress_phy_init(). Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 7b065f91faf56f5445ba45878ce6c55ea6388bb3 Author: Ben Hutchings Date: Fri Feb 27 13:06:12 2009 +0000 sfc: Fix test for MDIO read failure Commit 27dd2caca4eabe7c13a052b7456495ba75535e6a changed mdio_clause45_check_mmds() to read both DEVS0 and DEVS1 registers and to combine their values into an unsigned 32-bit mask. This made the following test for a negative (failure) value useless. Fix it to check whether either read failed. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 22ef02c23a236cb825b13f3335ff05ef5072a03d Author: Ben Hutchings Date: Fri Feb 27 13:04:07 2009 +0000 sfc: SFT9001: Include non-breaking cable diagnostics in online self-tests Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit c747583d19d5d5147a9f0eae480c1fdbc84c4252 Author: Inaky Perez-Gonzalez Date: Sat Feb 28 23:42:54 2009 +0000 wimax/i2400m: implement RX reorder support Allow the device to give the driver RX data with reorder information. When that is done, the device will indicate the driver if a packet has to be held in a (sorted) queue. It will also tell the driver when held packets have to be released to the OS. This is done to improve the WiMAX-protocol level retransmission support when missing frames are detected. The code docs provide details about the implementation. In general, this just hooks into the RX path in rx.c; if a packet with the reorder bit in the RX header is detected, the reorder information in the header is extracted and one of the four main reorder operations are executed. In one case (queue) no packet will be delivered to the networking stack, just queued, whereas in the others (reset, update_ws and queue_update_ws), queued packet might be delivered depending on the window start for the specific queue. The modifications to files other than rx.c are: - control.c: during device initialization, enable reordering support if the rx_reorder_disabled module parameter is not enabled - driver.c: expose a rx_reorder_disable module parameter and call i2400m_rx_setup/release() to initialize/shutdown RX reorder support. - i2400m.h: introduce members in 'struct i2400m' needed for implementing reorder support. - linux/i2400m.h: introduce TLVs, commands and constant definitions related to RX reorder Last but not least, the rx reorder code includes an small circular log where the last N reorder operations are recorded to be displayed in case of inconsistency. Otherwise diagnosing issues would be almost impossible. Signed-off-by: Inaky Perez-Gonzalez Signed-off-by: David S. Miller commit 61b8d2688a0cc9434b18144342c719f809691d72 Author: Harvey Harrison Date: Sat Feb 28 23:42:53 2009 +0000 wimax: replace uses of __constant_{endian} Base versions handle constant folding now. Edited by Inaky to fix conflicts due to changes in netdev.c Signed-off-by: Harvey Harrison Signed-off-by: Inaky Perez-Gonzalez Signed-off-by: David S. Miller commit fd5c565c0c04d2716cfdac3f1de3c2261d6a457d Author: Inaky Perez-Gonzalez Date: Sat Feb 28 23:42:52 2009 +0000 wimax/i2400m: support extended data RX protocol (no need to reallocate skbs) Newer i2400m firmwares (>= v1.4) extend the data RX protocol so that each packet has a 16 byte header. This header is mainly used to implement host reordeing (which is addressed in later commits). However, this header also allows us to overwrite it (once data has been extracted) with an Ethernet header and deliver to the networking stack without having to reallocate the skb (as it happened in fw <= v1.3) to make room for it. - control.c: indicate the device [dev_initialize()] that the driver wants to use the extended data RX protocol. Also involves adding the definition of the needed data types in include/linux/wimax/i2400m.h. - rx.c: handle the new payload type for the extended RX data protocol. Prepares the skb for delivery to netdev.c:i2400m_net_erx(). - netdev.c: Introduce i2400m_net_erx() that adds the fake ethernet address to a prepared skb and delivers it to the networking stack. - cleanup: in most instances in rx.c, the variable 'single' was renamed to 'single_last' for it better conveys its meaning. Signed-off-by: Inaky Perez-Gonzalez Signed-off-by: David S. Miller commit 347707baa77d273d79258303e00200d40cf3b323 Author: Kay Sievers Date: Sat Feb 28 23:42:51 2009 +0000 wimax: struct device - replace bus_id with dev_name(), dev_set_name() Cc: inaky.perez-gonzalez@intel.com Cc: linux-wimax@intel.com Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers Signed-off-by: Inaky Perez-Gonzalez Signed-off-by: David S. Miller commit 8987691a4aa6622a1b58bb12c56abaf3d2098fad Author: Inaky Perez-Gonzalez Date: Sat Feb 28 23:42:50 2009 +0000 wimax/i2400m: allow control of the base-station idle mode timeout For power saving reasons, WiMAX links can be put in idle mode while connected after a certain time of the link not being used for tx or rx. In this mode, the device pages the base-station regularly and when data is ready to be transmitted, the link is revived. This patch allows the user to control the time the device has to be idle before it decides to go to idle mode from a sysfs interace. It also updates the initialization code to acknowledge the module variable 'idle_mode_disabled' when the firmware is a newer version (upcoming 1.4 vs 2.6.29's v1.3). The method for setting the idle mode timeout in the older firmwares is much more limited and can be only done at initialization time. Thus, the sysfs file will return -ENOSYS on older ones. Signed-off-by: Inaky Perez-Gonzalez Signed-off-by: David S. Miller commit 6a0f7ab8305cb60a43a6c4a548f57adab784e6cd Author: Inaky Perez-Gonzalez Date: Sat Feb 28 23:42:49 2009 +0000 wimax/i2400m: firmware_check() encodes the firmware version in i2400m->fw_version Upcoming modifications will need to test for the running firmware version before activating a feature or not. This is helpful to implement backward compatibility with older firmware versions. Modify i2400m_firmware_check() to encode in i2400m->fw_version the major and minor version numbers of the firmware interface. As well, move the call to be done as the very first operation once we have communication with the device during probe() [in __i2400m_dev_start()]. This is needed so any operation that is executed afterwards can determine which fw version it is talking to. Signed-off-by: Inaky Perez-Gonzalez Signed-off-by: David S. Miller commit efa05d0f0a723642fd0d88bb97b0f31800a3f716 Author: Inaky Perez-Gonzalez Date: Sat Feb 28 23:42:48 2009 +0000 wimax/i2400m: drop support for deprecated major fw interface, add for new minor Firmware interface version 8.x.x has long been deprecated and is no longer supported (nor available, as it is a preproduction firmware), so it can be safely dropped. Add support for firmware interface v9.2.x (current is 9.1.x). Firmware version 9.2.x is backwards compatible with 9.1.x; new features are enabled if switches are pressed to turn them on. Forthcoming commits to the driver will start pressing those switches when the firmware interface supports it. Signed-off-by: Inaky Perez-Gonzalez Signed-off-by: David S. Miller commit 1039abbc5b1bfa943b6daabbe9de1499037a90c0 Author: Inaky Perez-Gonzalez Date: Sat Feb 28 23:42:47 2009 +0000 wimax/i2400m: add the ability to fallback to other firmware files if the default is not there In order to support backwards compatibility with older firmwares when a driver is updated by a new kernel release, the i2400m bus drivers can declare a list of firmware files they can work with (in general these will be each a different version). The firmware loader will try them in sequence until one loads. Thus, if a user doesn't have the latest and greatest firmware that a newly installed kernel would require, the driver would fall back to the firmware from a previous release. To support this, the i2400m->bus_fw_name is changed to be a NULL terminated array firmware file names (and renamed to bus_fw_names) and we add a new entry (i2400m->fw_name) that points to the name of the firmware being currently used. All code that needs to print the firmware file name uses i2400m->fw_name instead of the old i2400m->bus_fw_name. The code in i2400m_dev_bootstrap() that loads the firmware is changed with an iterator over the firmware file name list that tries to load each form user space, using the first one that succeeds in request_firmware() (and thus stopping the iteration). The USB and SDIO bus drivers are updated to take advantage of this and reflect which firmwares they support. Signed-off-by: Inaky Perez-Gonzalez Signed-off-by: David S. Miller commit 86739fb96e8c8269fc5b3d300c959bede272a6f6 Author: Gerrit Renker Date: Fri Feb 27 22:38:29 2009 +0000 dccp: Do not let initial option overhead shrink the MPS This fixes a problem caused by the overlap of the connection-setup and established-state phases of DCCP connections. During connection setup, the client retransmits Confirm Feature-Negotiation options until a response from the server signals that it can move from the half-established PARTOPEN into the OPEN state, whereupon the connection is fully established on both ends (RFC 4340, 8.1.5). However, since the client may already send data while it is in the PARTOPEN state, consequences arise for the Maximum Packet Size: the problem is that the initial option overhead is much higher than for the subsequent established phase, as it involves potentially many variable-length list-type options (server-priority options, RFC 4340, 6.4). Applying the standard MPS is insufficient here: especially with larger payloads this can lead to annoying, counter-intuitive EMSGSIZE errors. On the other hand, reducing the MPS available for the established phase by the added initial overhead is highly wasteful and inefficient. The solution chosen therefore is a two-phase strategy: If the payload length of the DataAck in PARTOPEN is too large, an Ack is sent to carry the options, and the feature-negotiation list is then flushed. This means that the server gets two Acks for one Response. If both Acks get lost, it is probably better to restart the connection anyway and devising yet another special-case does not seem worth the extra complexity. The result is a higher utilisation of the available packet space for the data transmission phase (established state) of a connection. The patch (over-)estimates the initial overhead to be 32*4 bytes -- commonly seen values were around 90 bytes for initial feature-negotiation options. It uses sizeof(u32) to mean "aligned units of 4 bytes". For consistency, another use of 4-byte alignment is adapted. Signed-off-by: Gerrit Renker Signed-off-by: David S. Miller commit 361a5c1dd0bd7bb2b90e7fe9127b366d3566522e Author: Gerrit Renker Date: Fri Feb 27 22:38:28 2009 +0000 dccp: Minimise header option overhead in setting the MPS This patch resolves a long-standing FIXME to dynamically update the Maximum Packet Size depending on actual options usage. It uses the flags set by the feature-negotiation infrastructure to compute the required header option size. Most options are fixed-size, a notable exception are Ack Vectors (required currently only by CCID-2). These can have any length between 3 and 1020 bytes. As a result of testing, 16 bytes (2 bytes for type/length plus 14 Ack Vector cells) have been found to be sufficient for loss-free situations. There are currently no CCID-specific header options which may appear on data packets, thus it is not necessary to define a corresponding CCID field as suggested in the old comment. Further changes: ---------------- Adjusted the type of 'cur_mps' to match the unsigned return type of the function. Signed-off-by: Gerrit Renker Acked-by: Ian McDonald Signed-off-by: David S. Miller commit b67802ea8061393f7bd2d4db934646e76096027c Author: Wang Chen Date: Mon Mar 2 13:55:26 2009 +0800 sched: kill unused parameter of pick_next_task() Impact: micro-optimization Parameter "prev" is not used really. Signed-off-by: Wang Chen Signed-off-by: Ingo Molnar commit 72fd455ba54b5a02b9c74221b9ded8b1845b464a Author: Wang Chen Date: Mon Mar 2 13:55:14 2009 +0800 sched, documentation: remove old O(1) scheduler document Since we don't have O(1) scheduler implementation anymore, remove the legacy doc. Signed-off-by: Wang Chen Signed-off-by: Ingo Molnar commit 5512b3ece0cbb5024b83099963222700aa45f59e Merge: c40c6f8... 8325d9c... 54e9912... 778ef1e... Author: Ingo Molnar Date: Mon Mar 2 12:02:36 2009 +0100 Merge branches 'sched/clock', 'sched/urgent' and 'linus' into sched/core commit 9ce01461028d595a6f1cd724fbd7a0dd70464fe4 Author: Ilpo Järvinen Date: Sat Feb 28 04:44:42 2009 +0000 tcp: get rid of two unnecessary u16s in TCP skb flags copying I guess these fields were one day 16-bit in the struct but nowadays they're just using 8 bits anyway. This is just a precaution, didn't result any change in my case but who knows what all those varying gcc versions & options do. I've been told that 16-bit is not so nice with some cpus. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 0d6a775e27d975e5f9ea8e2911216d84face50ca Author: Ilpo Järvinen Date: Sat Feb 28 04:44:41 2009 +0000 tcp: in sendmsg/pages open code the real goto target copied was assigned zero right before the goto, so if (copied) cannot ever be true. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit cabeccbd172cc305f4383f5a4808ae254745275f Author: Ilpo Järvinen Date: Sat Feb 28 04:44:38 2009 +0000 tcp: kill eff_sacks "cache", the sole user can calculate itself Also fixes insignificant bug that would cause sending of stale SACK block (would occur in some corner cases). Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 758ce5c8d11d6fc57fe5f1dbc237aa8ff6386eac Author: Ilpo Järvinen Date: Sat Feb 28 04:44:37 2009 +0000 tcp: add helper for AI algorithm It seems that implementation in yeah was inconsistent to what other did as it would increase cwnd one ack earlier than the others do. Size benefits: bictcp_cong_avoid | -36 tcp_cong_avoid_ai | +52 bictcp_cong_avoid | -34 tcp_scalable_cong_avoid | -36 tcp_veno_cong_avoid | -12 tcp_yeah_cong_avoid | -38 = -104 bytes total Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 571a5dd8d01f2a7e279c502fa220a69262d73694 Author: Ilpo Järvinen Date: Sat Feb 28 04:44:36 2009 +0000 htcp: merge icsk_ca_state compare Similar to what is done elsewhere in TCP code when double state checks are being done. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit e6c7d0857905f1d642cb8dbadae6794bfa1dff30 Author: Ilpo Järvinen Date: Sat Feb 28 04:44:35 2009 +0000 tcp: drop unnecessary local var in collapse Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit bc079e9ede5fb0225bd3e84891a6266f77142094 Author: Ilpo Järvinen Date: Sat Feb 28 04:44:34 2009 +0000 tcp: cleanup ca_state mess in tcp_timer Redundant checks made indentation impossible to follow. However, it might be useful to make this ca_state+is_sack indexed array. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 7363a5b233734dba339f2874ff6ed6c489d3d865 Author: Ilpo Järvinen Date: Sat Feb 28 04:44:33 2009 +0000 tcp: separate timeout marking loop to it's own function Some comment about its current state added. So far I have seen very few cases where the thing is actually useful, usually just marginally (though admittedly I don't usually see top of window losses where it seems possible that there could be some gain), instead, more often the cases suffer from L-marking spike which is certainly not desirable (I'll bury improving it to my todo list, but on a low prio position). Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit d0af4160d19ff2849386140881e729f9ba86f2aa Author: Ilpo Järvinen Date: Sat Feb 28 04:44:32 2009 +0000 tcp: remove redundant code from tcp_mark_lost_retrans Arnd Hannemann noticed and was puzzled by the fact that !tcp_is_fack(tp) leads to early return near the beginning and the later on tcp_is_fack(tp) was still used in an if condition. The later check was a left-over from RFC3517 SACK stuff (== !tcp_is_fack(tp) behavior nowadays) as there wasn't clear way how to handle this particular check cheaply in the spirit of RFC3517 (using only SACK blocks, not holes + SACK blocks as with FACK). I sort of left it there as a reminder but since it's confusing other people just remove it and comment the missing-feature stuff instead. Signed-off-by: Ilpo Järvinen Cc: Arnd Hannemann Signed-off-by: David S. Miller commit 02276f3c962fd408fa9d441251067845f948bfcf Author: Ilpo Järvinen Date: Sat Feb 28 04:44:31 2009 +0000 tcp: fix corner case issue in segmentation during rexmitting If cur_mss grew very recently so that the previously G/TSOed skb now fits well into a single segment it would get send up in parts unless we calculate # of segments again. This corner-case could happen eg. after mtu probe completes or less than previously sack blocks are required for the opposite direction. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit d3d2ae454501a4dec360995649e1b002a2ad90c5 Author: Ilpo Järvinen Date: Sat Feb 28 04:44:30 2009 +0000 tcp: Don't clear hints when tcp_fragmenting 1) We didn't remove any skbs, so no need to handle stale refs. 2) scoreboard_skb_hint is trivial, no timestamps were changed so no need to clear that one 3) lost_skb_hint needs tweaking similar to that of tcp_sacktag_one(). Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 62ad27619cbcf23fb8581ae72f3806c1d90a861d Author: Ilpo Järvinen Date: Sat Feb 28 04:44:29 2009 +0000 tcp: deferring in middle of queue makes very little sense If skb can be sent right away, we certainly should do that if it's in the middle of the queue because it won't get more data into it. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 59a08cba6a604a265e45e9b970e372554cf46627 Author: Ilpo Järvinen Date: Sat Feb 28 04:44:28 2009 +0000 tcp: fix lost_cnt_hint miscounts It is possible that lost_cnt_hint gets underflow in tcp_clean_rtx_queue because the cumulative ACK can cover the segment where lost_skb_hint points to only partially, which means that the hint is not cleared, opposite to what my (earlier) comment claimed. Also I don't agree what I ended up writing about non-trivial case there to be what I intented to say. It was not supposed to happen that the hint won't get cleared and we underflow in any scenario. In general, this is quite hard to trigger in practice. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit ac11ba753f3aa839292c1a3b6c971c637ad2e839 Author: Ilpo Järvinen Date: Sat Feb 28 04:44:27 2009 +0000 tcp: don't backtrack to sacked skbs Backtracking to sacked skbs is a horrible performance killer since the hint cannot be advanced successfully past them... ...And it's totally unnecessary too. In theory this is 2.6.27..28 regression but I doubt anybody can make .28 to have worse performance because of other TCP improvements. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 79cb5def8dcad1a978841118bd14e155b3fd5589 Author: Guo-Fu Tseng Date: Mon Mar 2 01:55:15 2009 -0800 jme: Advance version number after previous changes From: Guo-Fu Tseng Advance version number after previous changes. Sorry for not come along with previous patch series. Signed-off-by: David S. Miller commit 093fb6968deeed46bf93266eee44baeb213bf253 Author: David S. Miller Date: Mon Mar 2 01:53:03 2009 -0800 typhoon: Add missing firmware copy. Noticed by David Dillow. Signed-off-by: David S. Miller commit c3b3240450ab8a1f3e52c5a69d53113deb6f91c5 Author: David S. Miller Date: Mon Mar 2 01:49:28 2009 -0800 rds: Fix build on powerpc. As reported by Stephen Rothwell. > Today's linux-next build (powerpc allyesconfig) failed like this: > > net/rds/cong.c: In function 'rds_cong_set_bit': > net/rds/cong.c:284: error: implicit declaration of function 'generic___set_le_bit' > net/rds/cong.c: In function 'rds_cong_clear_bit': > net/rds/cong.c:298: error: implicit declaration of function 'generic___clear_le_bit' > net/rds/cong.c: In function 'rds_cong_test_bit': > net/rds/cong.c:309: error: implicit declaration of function 'generic_test_le_bit' Signed-off-by: David S. Miller commit 6e655bf21697d2594243098a14e0699e8d4a4059 Author: Takashi Iwai Date: Mon Mar 2 10:46:03 2009 +0100 ALSA: hda - Don't return a fatal error at PCM-creation errors Don't return a fatal error to the driver but continue to probe when any error occurs at creating PCM streams for each codec. It's often non-fatal and keeping it would help debugging. Signed-off-by: Takashi Iwai commit f93d461bcde6ac3db542361c00a7e4167f88176d Author: Takashi Iwai Date: Mon Mar 2 10:44:15 2009 +0100 ALSA: hda - Revert the codec probe at control-creation errors Revert the codec probe instead of returning the error to the driver when any error occurs at creating the control elements. The control element conflict can be non-fatal in many cases, especially if it comes from the digital-only codec. Signed-off-by: Takashi Iwai commit d1f1af2dbf8207db590853a59bec465c4f68cfdc Author: Takashi Iwai Date: Mon Mar 2 10:35:29 2009 +0100 ALSA: hda - Intialize more codec fields in snd_hda_codec_reset() Initiailize forgotten fields in snd_hda_codec_reset(). Signed-off-by: Takashi Iwai commit 4c4531d64dd0442813c7307b860bf40a2aec51bc Author: Takashi Iwai Date: Mon Mar 2 08:06:11 2009 +0100 ALSA: hda - Remove Toshiba probe_mask quirk Revert the Toshiba probe_mask quirk for 2.6.29 kernel (commit 38f1df27e3191d76e983cb9c6b4392582fd32fda). In the current tree, the digital-only codec is handled properly so no codec conflict should occur. Signed-off-by: Takashi Iwai commit 892981ffbe9a5c4cbc9d75f423b145f32c765f9c Author: Takashi Iwai Date: Mon Mar 2 08:04:35 2009 +0100 ALSA: hda - Don't create a beep control for digital-only ALC268 When an ALC268 codec is set up as the digital-only (as found in Toshiba laptops), it shouldn't contain any beep control that conflict with the primary codec. Signed-off-by: Takashi Iwai commit b31b43e9fb49b71ae753bebc185fe55797ba20c6 Merge: c82c8ab... 38f1df2... Author: Takashi Iwai Date: Mon Mar 2 08:04:10 2009 +0100 Merge branch 'fix/hda' into topic/hda Conflicts: sound/pci/hda/hda_intel.c commit aa4abc9bcce0d2a7ec189e897f8f8c58ca04643b Merge: 814c01d... 52c0326... Author: David S. Miller Date: Sun Mar 1 21:35:16 2009 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-tx.c net/8021q/vlan_core.c net/core/dev.c commit 814c01dc7c533033b4e99981a2e24a6195bfb43c Author: Guo-Fu Tseng Date: Fri Feb 27 17:59:44 2009 +0000 jme: Adding {64,40}bits DMA mask back All JMC250 chips have no problem with higher bits support. Adding it back. Found-by: Ethan Hsiao Signed-off-by: Guo-Fu Tseng Signed-off-by: David S. Miller commit eb352b838d42e66f0267c40249798ffda3c63037 Author: Guo-Fu Tseng Date: Fri Feb 27 17:58:16 2009 +0000 jme: Clear all modified GHC register flags Clear all modified GHC register flags. Fixed-by: Ethan Hsiao Signed-off-by: Guo-Fu Tseng Signed-off-by: David S. Miller commit 7f7fd2da92b4ce20f55d3b7615089cf8e04cfffc Author: Guo-Fu Tseng Date: Fri Feb 27 17:57:01 2009 +0000 jme: Fix pci sync We should sync ring descriptor to pci device after modifying it. Signed-off-by: Guo-Fu Tseng Signed-off-by: David S. Miller commit 07c8d2aad7db8c649a49a22f713f83e6f24b8edd Author: Guo-Fu Tseng Date: Fri Feb 27 17:54:07 2009 +0000 jme: Modifies messages to display correct hardware version This patch modifies messages to display correct hardware version. Signed-off-by: Guo-Fu Tseng Signed-off-by: David S. Miller commit fc1f209514691af9167e462880e858efc8b22d83 Author: David S. Miller Date: Sun Mar 1 20:32:39 2009 -0800 ixgbe: Fix some compiler warnings. 'pap' is never used in ixgbe_dcb_hw_config_82599() and 'eec' in ixgbe_acquire_eeptom() is only used when status == 0 but GCC has some trouble seeing that. Signed-off-by: David S. Miller commit d517c4a1da590a7fa50325a5e5cd18f07e8fb5a7 Author: David S. Miller Date: Sun Mar 1 20:24:32 2009 -0800 typhoon: Need non-vmalloc memory to DMA firmware to the card. request_firmware() gives vmalloc'd memory, which is not suitable for pci_map_single() and friends. Use a kmalloc()'d copy of the firmware for this DMA operation. Signed-off-by: David S. Miller commit e8e26350f114fa212e277ea02332d9347c59865d Author: PJ Waskiewicz Date: Fri Feb 27 15:45:05 2009 +0000 ixgbe: Add 82599 device id's, hook it up into the main driver. With the hardware-specific code in place, add all supported device id's, along with base driver changes to enable 82599 devices. The devices being enabled are: 8086:10f7: 82599EB 10 Gigabit KX4 Network Connection 8086:10fb: 82599EB 10 Gigabit Network Connection The device 8086:10fb is a fully-pluggable SFP+ NIC. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 235ea828a1640ed493562a5fe08aa666ff84fbc4 Author: PJ Waskiewicz Date: Fri Feb 27 15:44:48 2009 +0000 ixgbe: Add DCB for 82599, remove BCN support This patch adds the DCB (Data Center Bridging) support for 82599 hardware. This is similar to how the 82598 DCB code works. This patch also removes the BCN (Backwards Congestion Notification) netlink configuration code from the driver. BCN was a pre-standard congestion notification framework, and was not what the IEEE body decided upon for standard congestion management. QCN (802.1Qau), Quantized Congestion Notification is the accepted standard, which is not supported by 82599, hence we remove the support altogether. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 11afc1b1fd802c11dc0fa986c210602c177f1e21 Author: PJ Waskiewicz Date: Fri Feb 27 15:44:30 2009 +0000 ixgbe: Add hardware specific initialization code for 82599 devices This patch adds the hardware initialization code specific to 82599. This is similar to the 82598 hardware initialization code. It also includes all changes to the existing hardware init code to support 82599. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 8010dc306ba39a8cdb3993d1e809fcb7dfdf089a Merge: 5d242f1... 2a07954... Author: David S. Miller Date: Sat Feb 28 22:32:16 2009 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 8b37dbd2a180667e51db0552383df18743239c25 Author: Mark Brown Date: Sat Feb 28 21:14:20 2009 +0000 ASoC: Add SND_SOC_DAPM_PIN_SWITCH controls for exposing DAPM pins On some systems it is desirable for control for DAPM pins to be provided to user space. This is the case with things like GSM modems which are controlled primarily from user space, for example. Provide a helper which exposes the state of a DAPM pin to user space for use in cases like this. Signed-off-by: Mark Brown commit 4eae080dda3a563160be2f642cfbda27ffc42178 Author: Daniel Mack Date: Wed Feb 25 14:37:21 2009 +0100 ASoC: Add cs4270 support for slave mode configurations Added support for scenarios where the Cirrus CS4270 audio codec is slave to the bitclk and lrclk. Mixed setups are unsupported. Signed-off-by: Daniel Mack Signed-off-by: Mark Brown commit c8efef1745d168b80c800e98cce48a59630dbbfc Author: Ben Dooks Date: Sat Feb 28 17:09:57 2009 +0000 ASoC: Fix copyright statements on Simtec files Fix the copyright statements in two of the S3C24XX ASoC files that have (c) when we require the full word. Signed-off-by: Ben Dooks Signed-off-by: Mark Brown commit d9620a4c82c61a91c9313f80ba951c902573c028 Author: Ralph Campbell Date: Fri Feb 27 14:44:32 2009 -0800 IB/mad: initialize mad_agent_priv before putting on lists There is a potential race in ib_register_mad_agent() where the struct ib_mad_agent_private is not fully initialized before it is added to the list of agents per IB port. This means the ib_mad_agent_private could be seen before the refcount, spin locks, and linked lists are initialized. The fix is to initialize the structure earlier. Signed-off-by: Ralph Campbell Signed-off-by: Roland Dreier commit 2a07954b83a3d4dc93031d3ce030fb9380a8e15a Author: Kalle Valo Date: Fri Feb 27 07:50:00 2009 +0200 at76c50x-usb: use dev_name() instead of struct device.bus_id Stephen Rothwell reported that bus_id from struct device will be removed, use dev_name() instead. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 0bfbce18b9c11201ebf1cfbc0deeab7bdbfe32a5 Author: Jouni Malinen Date: Tue Feb 24 16:49:58 2009 +0200 nl80211: Avoid AP mode BUG_ON hang with invalid lock assert "cfg80211: add assert_cfg80211_lock() to ensure proper protection" added assert_cfg80211_lock() calls into various places. At least one of them, nl80211_send_wiphy(), should not have been there. That triggers the BUG_ON in assert_cfg80211_lock() and pretty much kills the kernel whenever someone runs hostapd.. Remove that call and make assert_cfg80211_lock() use WARN_ON instead of BUG_ON to be a bit more friendly to users. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 222d0b33b3778a8fa156f3fca284d0a71f8e966b Author: Jouni Malinen Date: Tue Feb 24 13:40:01 2009 +0200 ath9k: Unlock sc->mutex on error path An error path in ath9k_add_interface() did not unlock the sc->mutex and could leave the driver in quite unresponsive state. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 99da185a72ba685a5aaf49dff6a5fe83885112e4 Author: John Daiker Date: Tue Feb 24 02:16:42 2009 -0800 b43: checkpatch.pl cleanups Keeping this one simple. Changing a few "foo * bar" to "foo *bar" Removes 22 checkpatch.pl errors, with no introduced warnings. Signed-off-by: John Daiker Signed-off-by: John W. Linville commit ddcb5c78e8dcb470caec2049c2f400651f1710e4 Author: Jason Andryuk Date: Mon Feb 23 21:45:34 2009 -0500 iwl3945: re-add iwl_poll_direct_bit return value check Re-add the iwl_poll_direct_bit return value assignment dropped in "iwl3945: add apm ops". Signed-off-by: Jason Andryuk Signed-off-by: John W. Linville commit c2436980d024c8c9c1ad51f53125ddfc467a6cf1 Author: Jason Andryuk Date: Mon Feb 23 21:43:30 2009 -0500 iwl3945: initialize is_valid_rtc_data_addr function pointer Initialize is_valid_rtc_data_addr function pointer for iwl3945 to prevent a NULL pointer dereference in iwl_dump_nic_error_log. Signed-off-by: Jason Andryuk Signed-off-by: John W. Linville commit 53b23b88e4fc70a36f4c9653883582a7c5eede38 Author: Michael Buesch Date: Mon Feb 23 22:52:26 2009 +0100 b43: Remove bogus integer truncation warnings "warning: large integer implicitly truncated to unsigned type" Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 4a332a385a86e31bfe181d969a8cb5579798fe03 Author: Alina Friedrichsen Date: Sun Feb 22 18:19:33 2009 +0100 mac80211: Give it some time to do the TSF sync Give slow hardware some time to do the TSF sync, to not run into an IBSS merging endless loop in some rarely situations. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit 34e8f08231388f9e16c6f1e2461f53afaf7f1e5e Author: Alina Friedrichsen Date: Sun Feb 22 00:07:28 2009 +0100 mac80211: Don't merge with the same BSSID It was not a good idea to do a TSF reset on strange IBSS merges to the same BSSID. For example it will break the TSF sync of ath9k completely and it is unnecessary as all hardware I have tested do a TSF sync to a higher value automatically and IBSS merges are only done to higher TSF values. It only need a TSF reset to accept a lower value, when the IBSS network is changed manually. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit 204b190cabf901b4bdece2006acc15a8978288db Author: Bob Copeland Date: Sat Feb 21 14:44:18 2009 -0500 ath9k: fix 802.11g conformance test limit typo 802.11g is in 2 ghz band, not 5 ghz. Signed-off-by: Bob Copeland Acked-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 3faa19cd9dfac30aa08bc311ddbd62ee5ccc0d85 Author: David Kilroy Date: Sat Feb 21 16:52:54 2009 +0000 orinoco: prevent accessing memory outside the firmware image Do this by indicating the end of the appropriate regions of memory. Note that MAX_PDA_SIZE should only apply to the PDA block read from flash/EEPROM, and has been erronously applied to the pdr elements. Remove the macro, and use the actual PDA size passed down by the caller. We also fix up some of the types used, marking as much as possible const, and using void* for the end pointers. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit 7e57811ac5b595bdb53f2aef3bcb2b3d72663fa4 Author: David Kilroy Date: Sat Feb 21 16:52:53 2009 +0000 orinoco: validate firmware header Check the Agere firmware headers for validity before attempting to download it. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit ba3907e508454520569bf1a3c1570f05ea578768 Author: Kalle Valo Date: Sat Feb 21 09:53:37 2009 +0200 at76c50x-usb: add link to the TODO list It's easier to have the TODO list in wiki, so add a link to the list. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 1cc198fee9eb60d9dddbdcb6f32a6e36e5136769 Author: Jason Andryuk Date: Sat Feb 21 09:53:29 2009 +0200 at76c50x-usb: additional disconnect fixes Additional attempts to fix Oops on disconnect, that appear to be successful. However, some may be extraneous. The cancel_delayed_work call is probably the most necessary. The device_unplugged check may not be necessary. del_timer_sync may not be necessary either, but the Oops I was receiving was related to timers. Hence the addition. Signed-off-by: Jason Andryuk Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 5a2137ddcc4b4d0d9227db433eabaefa3c3bd924 Author: Jason Andryuk Date: Sat Feb 21 09:53:22 2009 +0200 at76c50x-usb: clean up DMA on stack Cleanup dma on stack issues: - no DMA on stack - cleanup unclear endianness issue Corrected version of Oliver Neukum's original patch for at76_usb. Signed-off-by: Jason Andryuk Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit deda862e699f0aba6f0975e138a0258d1b29f2df Author: Jason Andryuk Date: Sat Feb 21 09:53:14 2009 +0200 at76c50x-usb: fix oops on disconnect flush_workqueue needs to be called instead of the generic one and the associated functions need to be modified to prevent re-adding themselves to the workqueue. The rx_tasklet is also killed in the small (?) chance it is scheduled. Signed-off-by: Jason Andryuk Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 2f92cd2e5f1751f7da5fa9b58e0ab22da6577cfd Author: Luis R. Rodriguez Date: Sat Feb 21 00:24:16 2009 -0500 cfg80211: pass the regulatory_request to ignore_request Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit d951c1ddeba3c84c464069c808efc494aa705304 Author: Luis R. Rodriguez Date: Sat Feb 21 00:24:15 2009 -0500 cfg80211: do not kzalloc() again for a new request on __regulatory_hint Since we already have a regulatory request from the workqueue use that and avoid a new kzalloc() Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 28da32d7cafdd181d6a59e8c0b74e9651a8f8be3 Author: Luis R. Rodriguez Date: Sat Feb 21 00:24:14 2009 -0500 cfg80211: pass the regulatory_request struct in __regulatory_hint() We were passing value by value, lets just pass the struct. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit d1c96a9a29a5f34fa50133889b6110dca6cc3d43 Author: Luis R. Rodriguez Date: Sat Feb 21 00:24:13 2009 -0500 cfg80211: make __regulatory_hint() static Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 84540869678649074ae040bc9b063ef38ec9c83a Author: Luis R. Rodriguez Date: Sat Feb 21 00:20:40 2009 -0500 ath9k: follow beacon hints on reg_notifier when world roaming If we are roaming we allow to follow beacon hints. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit e38f8a7a8bebbab9d97f204e2cf05ef58b048a1d Author: Luis R. Rodriguez Date: Sat Feb 21 00:20:39 2009 -0500 cfg80211: Add AP beacon regulatory hints When devices are world roaming they cannot beacon or do active scan on 5 GHz or on channels 12, 13 and 14 on the 2 GHz band. Although we have a good regulatory API some cards may _always_ world roam, this is also true when a system does not have CRDA present. Devices doing world roaming can still passive scan, if they find a beacon from an AP on one of the world roaming frequencies we make the assumption we can do the same and we also remove the passive scan requirement. This adds support for providing beacon regulatory hints based on scans. This works for devices that do either hardware or software scanning. If a channel has not yet been marked as having had a beacon present on it we queue the beacon hint processing into the workqueue. All wireless devices will benefit from beacon regulatory hints from any wireless device on a system including new devices connected to the system at a later time. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 3fc71f775af677f640f0f0780b16f1b0958f6d9d Author: Luis R. Rodriguez Date: Sat Feb 21 00:20:38 2009 -0500 cfg80211: enable 5 GHz world roaming channels The current static world regulatory domain is too restrictive, we can use some 5 GHz channels world wide so long as they do not touch frequencies which require DFS. The compromise is we must also enforce passive scanning and disallow usage of a mode of operation that beacons: (AP | IBSS | Mesh) Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 68798a62634e58e01d6f1de509b253dcb40625bd Author: Luis R. Rodriguez Date: Sat Feb 21 00:20:37 2009 -0500 cfg80211: enable active-scan / beaconing on Ch 1-11 for world regdom This enables active scan and beaconing on Channels 1 through 11 on the static world regulatory domain. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 69b1572bd82046cc8f730e05c797062ca8c2b535 Author: Luis R. Rodriguez Date: Sat Feb 21 00:04:33 2009 -0500 cfg80211: rename regdom_changed to regdom_changes() and use it Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit fff32c04f6074de0719cc46d8f488aaf746f151a Author: Luis R. Rodriguez Date: Sat Feb 21 00:04:32 2009 -0500 cfg80211: allow drivers that agree on regulatory to agree This allows drivers that agree on regulatory to share their regulatory domain. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit fb1fc7add5d205c1db2fa323af1367c3cd4dced2 Author: Luis R. Rodriguez Date: Sat Feb 21 00:04:31 2009 -0500 cfg80211: comments style cleanup Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit fe33eb390854886e1fd5d4835d833b80d145aafb Author: Luis R. Rodriguez Date: Sat Feb 21 00:04:30 2009 -0500 cfg80211: move all regulatory hints to workqueue All regulatory hints (core, driver, userspace and 11d) are now processed in a workqueue. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 0441d6ffc705de17d85923264a1b03b71ebfccb8 Author: Luis R. Rodriguez Date: Sat Feb 21 00:04:29 2009 -0500 cfg80211: free rd on unlikely event on 11d hint This was never happening but it was still wrong, so correct it. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 915278e099e532f3a874764e28c81958f788b9f1 Author: Luis R. Rodriguez Date: Sat Feb 21 00:04:28 2009 -0500 cfg80211: remove likely from an 11d hint case Truth of the matter this was confusing people so mark it as unlikely as that is the case now. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit d335fe6391c2d86582cf71ef5773a161ee604608 Author: Luis R. Rodriguez Date: Sat Feb 21 00:04:27 2009 -0500 cfg80211: protect first access of last_request on 11d hint under mutex We were not protecting last_request there is a small possible race between an 11d hint and another routine which calls reset_regdomains() which can prevent a valid country IE from being processed. This is not critical as it will still be procesed soon after but locking prior to it is correct. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 806a9e39670be4f1f861c346ec102a79e81b90c3 Author: Luis R. Rodriguez Date: Sat Feb 21 00:04:26 2009 -0500 cfg80211: make regulatory_request use wiphy_idx instead of wiphy We do this so later on we can move the pending requests onto a workqueue. By using the wiphy_idx instead of the wiphy we can later easily check if the wiphy has disappeared or not. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 761cf7ecffc4bc079679e65c3b1ab107c1c1fb56 Author: Luis R. Rodriguez Date: Sat Feb 21 00:04:25 2009 -0500 cfg80211: add assert_cfg80211_lock() to ensure proper protection Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit bcf4f99b7b1e0971b79e8df40331e77fc1744049 Author: Luis R. Rodriguez Date: Sat Feb 21 00:04:24 2009 -0500 cfg80211: propagate -ENOMEM during regulatory_init() Calling kobject_uevent_env() can fail mainly due to out of memory conditions. We do not want to continue during such conditions so propagate that as well instead of letting cfg80211 load as if everything is peachy. Additionally lets clarify that when CRDA is not called during cfg80211's initialization _and_ if the error is not an -ENOMEM its because kobject_uevent_env() failed to call CRDA, not because CRDA failed. For those who want to find out why we also let you do so by enabling the kernel config CONFIG_CFG80211_REG_DEBUG -- you'll get an actual stack trace. So for now we'll treat non -ENOMEM kobject_uevent_env() failures as non fatal during cfg80211's initialization. CC: Greg KH Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit ba25c1414264f1f5fc046cf34d20947e41713a0d Author: Luis R. Rodriguez Date: Sat Feb 21 00:04:23 2009 -0500 cfg80211: add regulatory_hint_core() to separate the core reg hint This makes the core hint path more readable and allows for us to later make it obvious under what circumstances we need locking or not. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 80778f18c09673df2712c7da28aa920469adcae2 Author: Luis R. Rodriguez Date: Sat Feb 21 00:04:22 2009 -0500 nl80211: disallow user requests prior to regulatory_init() If cfg80211 is built into the kernel there is perhaps a small time window betwen nl80211_init() and regulatory_init() where cfg80211_regdomain hasn't yet been initialized to let the wireless core do its work. During that rare case and time frame (if its even possible) we don't allow user regulatory changes as cfg80211 is working on enabling its first regulatory domain. To check for cfg80211_regdomain we now contend the entire operation using the cfg80211_mutex. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit a1794390f1afc3631ac056e0f1677b7ab6f7ee74 Author: Luis R. Rodriguez Date: Sat Feb 21 00:04:21 2009 -0500 cfg80211: rename cfg80211_drv_mutex to cfg80211_mutex cfg80211_drv_mutex is protecting more than the driver list, this renames it and documents what its currently supposed to protect. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 85fd129a721e6e892dbaaf05203baf819730f699 Author: Luis R. Rodriguez Date: Sat Feb 21 00:04:20 2009 -0500 cfg80211: add wiphy_idx_valid to check for wiphy_idx sanity This will later be used by others, for now make use of it in cfg80211_drv_by_wiphy_idx() to return early if an invalid wiphy_idx has been provided. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit b5850a7a4fd5bcab4f6a2c49e5b4ab9ebb1d5d44 Author: Luis R. Rodriguez Date: Sat Feb 21 00:04:19 2009 -0500 cfg80211: rename cfg80211_registered_device's idx to wiphy_idx Makes it clearer to read when comparing to ifidx Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 79f6440c527c61bcd84edfbdeb390841b9fe5095 Author: Alina Friedrichsen Date: Sat Feb 21 01:27:29 2009 +0100 mac80211: Introduce a generic commit() to apply changes This patch introduces a generic commit() function which initiate a new network joining process. It should be called after some interface config changes, so that the changes get applied more cleanly. Currently set_ssid() and set_bssid() call it. Others can be added in future patches. In version 1 the header files was forgotten, sorry. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit 5f9724dd94d63e26edb02d9f6a4ce1ce35737f14 Author: Michael Buesch Date: Fri Feb 20 19:31:21 2009 +0100 b43: Convert usage of b43_radio_maskset() This patch converts code to use the new b43_radio_maskset() API. The semantic patch that makes this change is as follows: // @@ expression dev, addr, mask, set; @@ -b43_radio_write16(dev, addr, (b43_radio_read16(dev, addr) & mask) | set); +b43_radio_maskset(dev, addr, mask, set); // Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 3718582a663e035af5d2634cd537a012e20cdb3f Author: Michael Buesch Date: Fri Feb 20 19:30:10 2009 +0100 b43: Convert usage of b43_radio_mask() This patch converts code to use the new b43_radio_mask() API. The semantic patch that makes this change is as follows: // @@ expression dev, addr, mask; @@ -b43_radio_write16(dev, addr, b43_radio_read16(dev, addr) & mask); +b43_radio_mask(dev, addr, mask); // Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 4cf507696ae41950cd430e7534180fddd624b3cd Author: Michael Buesch Date: Fri Feb 20 19:28:14 2009 +0100 b43: Convert usage of b43_radio_set() This patch converts code to use the new b43_radio_set() API. The semantic patch that makes this change is as follows: // @@ expression dev, addr, set; @@ -b43_radio_write16(dev, addr, b43_radio_read16(dev, addr) | set); +b43_radio_set(dev, addr, set); // Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 76e190cd4b3b9e79096df153edb04092433a797b Author: Michael Buesch Date: Fri Feb 20 19:26:27 2009 +0100 b43: Convert usage of b43_phy_maskset() This patch converts code to use the new b43_phy_maskset() API. The semantic patch that makes this change is as follows: // @@ expression dev, addr, mask, set; @@ -b43_phy_write(dev, addr, (b43_phy_read(dev, addr) & mask) | set); +b43_phy_maskset(dev, addr, mask, set); // Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit ac1ea3959f4c6694e92fe18a2ec72cfbed0c71fa Author: Michael Buesch Date: Fri Feb 20 19:25:05 2009 +0100 b43: Convert usage of b43_phy_mask() This patch converts code to use the new b43_phy_mask() API. The semantic patch that makes this change is as follows: // @@ expression dev, addr, mask; @@ -b43_phy_write(dev, addr, b43_phy_read(dev, addr) & mask); +b43_phy_mask(dev, addr, mask); // Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit e59be0b5299ce327d67cfca737b839ef98e0da0e Author: Michael Buesch Date: Fri Feb 20 19:22:36 2009 +0100 b43: Convert usage of b43_phy_set() This patch converts code to use the new b43_phy_set() API. The semantic patch that makes this change is as follows: // @@ expression dev, addr, set; @@ -b43_phy_write(dev, addr, b43_phy_read(dev, addr) | set); +b43_phy_set(dev, addr, set); // Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 9b02f419a7dbd956b2c293e5cb1790b6b687f367 Author: Dan Williams Date: Fri Feb 20 12:27:38 2009 -0500 libertas: use private SDIO workqueue to avoid scheduling latency The libertas SDIO interface scheduled the packet worker, resulting in unwanted latency for every data packet or command sent to the firmware. Fix a bug on the SDIO probe error path too. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 25d3ef59a2112d50e145500e1bc764f9e8fd4896 Author: Michael Buesch Date: Fri Feb 20 15:39:21 2009 +0100 b43: Implement sw scan callbacks This implements the new sw scan callbacks in b43. They are currently used to turn CFP update in the microcode off while scanning. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 80e775bf08f1915870fbb0c1c7a45a3fdc291721 Author: Michael Buesch Date: Fri Feb 20 15:37:03 2009 +0100 mac80211: Add software scan notifiers This adds optional notifier functions for software scan. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 8821905cfb65504f64e6beb014133bd2a998f5dc Author: Michael Buesch Date: Fri Feb 20 14:58:59 2009 +0100 b43: Enable PCI slow clock workaround, if needed. Enable the PCI slow clock workaround, if we're running a PCI core rev <= 10. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 1cc8f476f1260758a364b68d299796a9edb9ac41 Author: Michael Buesch Date: Fri Feb 20 14:47:56 2009 +0100 b43: Honor the no-slow-clock boardflag Do not turn off the crystal, if the boardflags tell us so. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 969d15cfab52c0af40c617fcbcc54cad6eaa4b32 Author: Michael Buesch Date: Fri Feb 20 14:27:15 2009 +0100 b43: Fix radio host flags This fixes initialization of some radio related hostflags. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 2d071ca50e9f20bf0203a7e8dbb1c784934e324d Author: Michael Buesch Date: Fri Feb 20 12:24:52 2009 +0100 b43: Add slot count compiletime assertion This adds a compiletime assertion for a recently introduced assumption on the slot counts. The tx header cache handling code assumes that the TX slot count can be divided evenly by the number of TX slots per frame. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 20977d3e685abb8b84c385426c39de1fca0a58ac Author: Sujith Date: Fri Feb 20 15:13:28 2009 +0530 ath9k: Add appropriate ANI values for AP mode The short calibration interval is different for AP mode, fix this. Also, the timer should be rearmed in the calibration routine during scanning. Signed-off-by: Sujith Signed-off-by: John W. Linville commit db0f41f556620ed73e8beaafb820baf53f863df9 Author: Sujith Date: Fri Feb 20 15:13:26 2009 +0530 ath9k: Fix PCI shutdown sequence pci_release_region() has to be called after the device has been disabled. Also remove a stray __init attribute. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 8147f5de7a7f241a729aaec912df7dd87a473cd0 Author: Sujith Date: Fri Feb 20 15:13:23 2009 +0530 ath9k: Fix bug in EEPROM chainmask retrieval Using wrong chainmasks would have an adverse impact on performance. This patch fixes chainmask retrieval for non-PCIE cards. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 9e7127908473bfb863c5064b0a61d0f0d6b1af46 Author: Sujith Date: Fri Feb 20 15:13:20 2009 +0530 ath9k: Add PER to RC debug statistics Signed-off-by: Sujith Signed-off-by: John W. Linville commit d9ae96d94a9117fa8d80dd4881f5835f9112c449 Author: Sujith Date: Fri Feb 20 15:13:13 2009 +0530 ath9k: Remove multiple macro occurrences OLC_FOR_AR9280_20_LATER is defined in multiple places, move it to a common location. Signed-off-by: Sujith Signed-off-by: John W. Linville commit f452a63d1ea7d2bae9b4a0cd0a865bcee7ce90c4 Author: Alina Friedrichsen Date: Thu Feb 19 23:46:31 2009 +0100 ath9k: Don't reset TSF after scanning automatically Reset automatically the TSF on re-enabling beaconing after scanning in IBSS mode causes several problems. For example a new created IBSS network can't age before an other node has joined, because scans are done automatically in that case. And several other strange bugs more... The TSF reset is done manually in the higher level mac80211 code in the cases were it's needed, so we don't need to do it here. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit bdceeb2dad5c8487ffeb4d0fa949686e4350ec7f Author: Michael Buesch Date: Thu Feb 19 23:45:43 2009 +0100 b43: Optimize DMA buffers In the old days we used one slot per frame. But when we changed that to 2, we didn't raise the overall slot count. Which resulted in an effective division of two to the number of slots. Double the number of TX slots, so we have an effective hardware queue of 128 frames per QoS queue. Also optimize the TX header cache handling. We don't need a cached TX header for slots that will never carry an actual header. So we reduce the memory consumption of the cache by 50%. So as a net result we end up with more or less the same memory usage before and after this patch (except a few tiny meta structures), but have twice the number of TX slots available. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 8eccb53f1b858c9bd0b745f839174725b76508ec Author: Michael Buesch Date: Thu Feb 19 23:39:26 2009 +0100 b43: Fix DMA buffer size handling This fixes hidden bugs in the size handling of the DMA buffers. This sets the RX buffer size to the theoretical max packet size and fixes passing of the size values to the device (must not subtract the header offset). These bugs are hidden and don't actually trigger due to the magic +100 offset for the buffer size. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit ca2d559e1a41d62a5b49fb9ab513025ea27f1e7c Author: Michael Buesch Date: Thu Feb 19 20:17:36 2009 +0100 b43: Move DMA stop sanity check Move the DMA stop sanity check up a few lines, so it's actually theoretically possible to trigger. (But it still shouldn't trigger, of course). Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit dbaaa147d6396c41d8f31156a777dfdaae2335a4 Author: Vasanthakumar Thiagarajan Date: Thu Feb 19 15:41:52 2009 +0530 ath9k: Filter out beacons from other BSS in STA mode Passing beacons received from other BSS to s/w in non-scanning state is unnecessary in STA mode. This patch filters them out in h/w. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 96891ceedaeaac95aa5b9dba5e68a8e77d541e78 Author: Fenghua Yu Date: Wed Feb 18 15:54:33 2009 -0800 iwlwifi: dma mapping read and write changes When iwlwifi runs on IOMMU, IOMMU generates a lot of PTE write faults because PTE write bit is not set on some of PTE's. This is because iwlwifi driver calls DMA mapping with PCI_DMA_TODEVICE which is read only in mapping PTE. But iwlwifi device actually writes to the mapped page to update its contents. This issue is not exposed in swiotlb. But VT-d hardware can capture this fault and stop the fault transaction. The iwl TX command contains a scratch field that is updated by uCode to indicate retry counts. For 5000 series the patch is required also for regular frames, but this patch does not differenciate. Signed-off-by: Fenghua Yu Acked-by: Tomas Winkler Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 7dc45f25d39ea959fdc1d5f636e9fc6cbe7ac7e0 Author: Abhijeet Kolekar Date: Wed Feb 18 15:54:32 2009 -0800 iwl3945: use SW rfkill from iwlwifi Patch unifies use of SW rfkill between 3945 and agn driver. Signed-off-by: Abhijeet Kolekar Acked-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit f17d08a657ee0713390ccf9a0b0ebf4f80495161 Author: Abhijeet Kolekar Date: Wed Feb 18 15:54:31 2009 -0800 iwl3945: use iwl_isr iwl3945 uses iwl_isr and deletes duplicated iwl3945_isr. Signed-off-by: Abhijeet Kolekar Acked-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit ed3b932e014eb54e8d9b0d7b9d8861f653185d04 Author: Abhijeet Kolekar Date: Wed Feb 18 15:54:30 2009 -0800 iwl3945: remove duplicate interrupt code Patch removes duplicate code to enable and disable interrupt. iwl3945 now uses iwlwifi's functions. Signed-off-by: Abhijeet Kolekar Acked-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 261b9c33987ca80bf6217848c3c113d2a4d313d0 Author: Abhijeet Kolekar Date: Wed Feb 18 15:54:29 2009 -0800 iwl3945: use iwl_rx_reply_error notification Patch removes duplicate code from iwl3945 and uses iwl_rx_reply_error and spectrum notifications from iwlwifi. Signed-off-by: Abhijeet Kolekar Acked-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 030f05eda6ee4d0ed63a93f4f9ebae42c46fb8b6 Author: Abhijeet Kolekar Date: Wed Feb 18 15:54:28 2009 -0800 iwl3945: use iwl rx handlers Patch removes duplicate rx handlers(pm_sleep and pm_debug) from 3945 and uses handlers from iwlwifi. Signed-off-by: Abhijeet Kolekar Acked-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit e9dde6f6edf9954e2c75d2d738cae0f00e9b0fbc Author: Abhijeet Kolekar Date: Wed Feb 18 15:54:27 2009 -0800 iwl3945: use iwl_mac_hw_scan callback 3945 can use iwl_mac_hw_scan callback instead of iwl3945_mac_hw_scan callback. Signed-off-by: Abhijeet Kolekar Acked-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit cade0eb2c7c7b8df60ac54409592c1a23e3220c8 Author: Abhijeet Kolekar Date: Wed Feb 18 15:54:26 2009 -0800 iwl3945: use iwl_rx_scan handlers Patch makes use of iwl_rx_scan handler for 3945. Signed-off-by: Abhijeet Kolekar Acked-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 2ce4f9d8618b84994b19e0a31a56562863666623 Author: Jason Andryuk Date: Wed Feb 18 22:41:04 2009 +0200 at76c50x-usb: convert at76_debug to an unsigned int at76_debug should be an unsigned int as it used as a bit field. In fact, modprobe fails when trying to set at76_debug's high bit. Signed-off-by: Jason Andryuk Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 19e8bc7fa7df2f208554d1d06b9af129cd7f452a Author: Jason Andryuk Date: Wed Feb 18 22:40:57 2009 +0200 at76c50x-usb: update to latest mac80211 hw scan api With the latest mac80211 stack, the driver needs to be updated for cfg80211 scanning. I based the changes off of modifications for at76_usb found here: http://johannes.sipsolutions.net/patches/old/all/2008-09-19-13:35/020-cfg80211-scan.patch The trick was that max_signal also needs to be set to avoid a divide by zero Oops. I just guessed and used the value 100 for now. kvalo: handpicked the change from two different patches Signed-off-by: Jason Andryuk Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 1264b951463a00efebe1bb596499aaad620ec8af Author: Kalle Valo Date: Sat Feb 7 09:27:10 2009 +0200 at76c50x-usb: add driver This is a driver for usb devices based on at76c50x chipset. This is a mac80211 port of the original at76_usb driver. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 41d2f291d78fb90ec26122c1c67d0c151965b378 Author: John W. Linville Date: Fri Feb 20 19:03:31 2009 -0500 iwlagn: default to MAX_UCODE_BEACON_INTERVAL in iwl_adjust_beacon_interval Default to MAX_UCODE_BEACON_INTERVAL if the output of iwl_adjust_beacon_interval would otherwise be zero. This prevents a division by zero on my iwl5300-equipped Lenovo T400 with kernels that include "mac80211: use cfg80211s BSS infrastructure". This patch is a bit of a hack -- I'm not sure why iwl_setup_rxon_timing is giving iwl_adjust_beacon_interval a zero input (which is the only way it would output zero). I would be happy to have a better fix. But for now, this makes my box boot... Signed-off-by: John W. Linville commit c493b017e0631ac023f904a732e8b615d4870426 Author: Roel Kluin Date: Sun Feb 15 18:02:39 2009 +0100 b43: Fix LO calibration txctl reg value This patch expands the parenthesis in the txctl reg write of the LO calibration to enforce precedence rules. Signed-off-by: Roel Kluin Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit e05eac37946a51efcedcc1b9cddb10af15628902 Author: Roel Kluin Date: Sun Feb 15 16:27:24 2009 +0100 p54: misplaced parentheses Only FIF_FCSFAIL is set due to parentheses Signed-off-by: Roel Kluin Signed-off-by: John W. Linville commit c3d72b968129ad4aec86c5fc8d2380f01ebebc53 Author: Dan Williams Date: Wed Feb 11 13:26:06 2009 -0500 ipw2x00: age scan results on resume Scanned BSS entries are timestamped with jiffies, which doesn't increment across suspend and hibernate. On resume, every BSS in the scan list looks like it was scanned within the last 10 seconds, irregardless of how long the machine was actually asleep. Age scan results on resume with the time spent during sleep so userspace has a clue how old they really are. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit bc8263f1d86946ffe97eb249fc1d6660da1e1055 Author: John W. Linville Date: Tue Feb 10 13:53:01 2009 -0500 airo: correct improper initialization of local variable Signed-off-by: John W. Linville commit 4aa188e1a868d25c5b93e48e5d29bbd0f9d3bc3a Author: Johannes Berg Date: Wed Feb 18 19:32:08 2009 +0100 mac80211/cfg80211: move iwrange handler to cfg80211 The previous patch made cfg80211 generally aware of the signal type a given hardware will give, so now it can implement SIOCGIWRANGE itself, removing more wext stuff from mac80211. Might need to be a little more parametrized once we have more hardware using cfg80211 and new hardware capabilities. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 77965c970d7da9c9b6349ff2b1d9adecf54c403b Author: Johannes Berg Date: Wed Feb 18 18:45:06 2009 +0100 cfg80211: clean up signal type It wasn't a good idea to make the signal type a per-BSS option, although then it is closer to the actual value. Move it to be a per-wiphy setting, update mac80211 to match. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 630e64c487c0a9550f05b465216a1cd9125b52f2 Author: Johannes Berg Date: Wed Feb 18 10:48:07 2009 +0100 nl80211: remove admin requirement from station get There's no particular reason to not let untrusted users see this information -- it's just the stations we're talking to, packet counters for them and possibly some mesh things. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 0a16ec5f5ed38076026960332a9ea4746dc1f3c6 Author: Johannes Berg Date: Wed Feb 18 09:56:47 2009 +0100 mac80211: add missing kernel-doc Document the new shutdown member. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit d5c232ff9bd5c0aa79b65a0d21cf9b944d7bf218 Author: Vasanthakumar Thiagarajan Date: Wed Feb 18 10:22:02 2009 +0530 ath9k: Fix PTK/GTK handshake timeout Some APs don't start BA negotiation with the client before it is done with the key handshake in WPA/RSN. With those APs, key handshake times out if EAPOL frames are sent after addba request. So defer the BA negotiation until we are done with tx/rx of all EAPOL frames. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit a77b855245541823b49999a27245ad7428879096 Author: Johannes Berg Date: Wed Feb 18 18:27:22 2009 +0100 cfg80211/mac80211: fill qual.qual value/adjust max_qual.qual Due to various bugs in the software stack we end up having to fill qual.qual; level should be used, but wpa_supplicant doesn't properly ignore qual.qual, NM should use qual.level regardless of that because qual.qual is 0 but doesn't handle IW_QUAL_DBM right now. So fill qual.qual with the qual.level value clamped to -110..-40 dBm or just the regular 'unspecified' signal level. This requires a mac80211 change to properly announce the max_qual.qual and avg_qual.qual values. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit cb3a8eec0e66edfe8db7d3b3bf19d25745bae3c3 Author: Dan Williams Date: Wed Feb 11 17:14:43 2009 -0500 cfg80211: age scan results on resume Scanned BSS entries are timestamped with jiffies, which doesn't increment across suspend and hibernate. On resume, every BSS in the scan list looks like it was scanned within the last 10 seconds, irregardless of how long the machine was actually asleep. Age scan results on resume with the time spent during sleep so userspace has a clue how old they really are. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit abd2fdb4c606f0e5cfec3647d57ebd20f03caafd Author: Ivo van Doorn Date: Tue Feb 17 14:04:29 2009 +0100 rt2x00: Fix RF offset The word_base is in bytes instead of word index number, this means that when using it, it should be transformed into a word index first. Otherwise RF register reading will fail through debugfs since we would start reading 4 words starting with word 4 (which is the last valid word for RF). Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 98c8a60a04316e94ccea8221cf16768ce91bd214 Author: Jouni Malinen Date: Tue Feb 17 13:24:57 2009 +0200 nl80211: Provide access to STA TX/RX packet counters The TX/RX packet counters are needed to fill in RADIUS Accounting attributes Acct-Output-Packets and Acct-Input-Packets. We already collect the needed information, but only the TX/RX bytes were previously exposed through nl80211. Allow applications to fetch the packet counters, too, to provide more complete support for accounting. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit fdbf7335ea1a4048ff4818bf15bdcab1925dc6df Author: Sujith Date: Tue Feb 17 15:36:35 2009 +0530 ath9k: Use beacon interval directly Setting up the CAB queue requires only the beacon interval, remove the function ath_get_beaconconfig() which is redundant. Signed-off-by: Sujith Signed-off-by: John W. Linville commit f7a99e46bef0f56549a041e867708b2f63d2e81c Author: Sujith Date: Tue Feb 17 15:36:33 2009 +0530 ath9k: Remove ath_txq_depth and get the queue depth directly Signed-off-by: Sujith Signed-off-by: John W. Linville commit f34639d323ded9d12692fb236e1774408f2a4a2b Author: Sujith Date: Tue Feb 17 15:36:31 2009 +0530 ath9k: Remove a few unused capability macros Signed-off-by: Sujith Signed-off-by: John W. Linville commit 171387ef0a374e04a8167a3a1292e19fd1335f20 Author: Sujith Date: Tue Feb 17 15:36:25 2009 +0530 ath9k: Initialize channel change time Set channel change time to 5ms, this will improve scan results. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 70692ad2923a379e0a10f9ec2ad93fbbe084cc46 Author: Jouni Malinen Date: Mon Feb 16 19:39:13 2009 +0200 nl80211: Optional IEs into scan request This extends the NL80211_CMD_TRIGGER_SCAN command to allow applications to specify a set of information element(s) to be added into Probe Request frames with NL80211_ATTR_IE. This provides support for the MLME-SCAN.request primitive parameter VendorSpecificInfo and can be used, e.g., to implement WPS scanning. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 83befbde839b1deb0cd752a834ffd9fde8571ae2 Author: Sujith Date: Mon Feb 16 13:23:21 2009 +0530 ath9k: Fix antenna assignment bug in TX status processing Signed-off-by: Sujith Signed-off-by: John W. Linville commit 0caa7b14f36e8c3c43dd9294a960ae55cafe07fb Author: Sujith Date: Mon Feb 16 13:23:20 2009 +0530 ath9k: Fix HW wait timeout RX and calibration have different timeout requirements. This patch fixes it by changing the HW wait routine to accept a timeout value. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 70768496db9ee27d53d3d03d50c93fbf4c0198a0 Author: Sujith Date: Mon Feb 16 13:23:12 2009 +0530 ath9k: Program the RTC registers correctly This patch programs the RTC registers of AR9100 chipsets correctly during chip reset. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 362695e11a09ff016ef00dc45b934b1daf862091 Author: Bob Copeland Date: Sun Feb 15 12:06:12 2009 -0500 ath5k: compute rts/cts duration after computing full pktlen RTS and CTS-to-self duration needs to go after ICV len is considered. Changes-licensed-under: 3-Clause-BSD Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit acf3c1a592a070edeede5dfa38c0ce3395357de0 Author: Bob Copeland Date: Sun Feb 15 12:06:11 2009 -0500 ath5k: move beacon processing to a tasklet We currently send beacons directly from the interrupt routine. This can hold up interrupt processing in beaconing modes and makes the ISR somewhat more complex. Move it to a tasklet like rx and tx. Changes-licensed-under: 3-Clause-BSD Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit b5f03956c56d72ad336e5c2c42a025f25d952c30 Author: Bob Copeland Date: Sun Feb 15 12:06:10 2009 -0500 ath5k: use spin_lock_irqsave for beacon lock ath5k_reset can be called from process context, which in turn can call ath5k_beacon_config which takes the sc->block spinlock. Since it can also be taken in hard irq context, use spin_lock_irqsave everywhere. This fixes a potential deadlock in adhoc mode. Changes-licensed-under: 3-Clause-BSD Cc: stable@kernel.org Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit 0b6f582bd38783e14f67d4466923f587728b2438 Author: Bob Copeland Date: Sun Feb 15 12:06:09 2009 -0500 ath5k: don't mask off interrupt bits Since interrupts are already masked by the hardware, there's no need to discard interrupt bits in the ISR itself. Also, in ath5k_beacon_config we mask off a couple of bits without locking, so doing this mask in software can lead to unhandled beacon timer and beacon miss interrupts. Changes-licensed-under: 3-Clause-BSD Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit 144d9ad98ef90072fd939e620f374d6918155a06 Author: Ivo van Doorn Date: Sun Feb 15 17:43:05 2009 +0100 rt2x00: Add various new USB IDs for rt73usb Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 53bc647a1a96189be53b68b9e8c40df0f42fc300 Author: Ivo van Doorn Date: Sun Feb 15 17:42:48 2009 +0100 rt2x00: Remove check for rf word 0 The only way rf_write() can be called with word 0 is when the user sends the wrong word index through debugfs. However the values which are send through debugfs are validated using the RF_BASE and RF_SIZE macro values, the most logical solution is to increase RF_BASE with 4 and decrease RF_SIZE with 4 (RF_SIZE has always been 1 word too big) Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 62750f421f6eebabedf545183ef8291cd3e63c78 Author: Ivo van Doorn Date: Sun Feb 15 17:42:30 2009 +0100 rt2x00: uncomment get_tsf The atomic requirement for get_tsf() has been removed by mac80211. This means the USB drivers can add support for the callback function again. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 13e967b2926a51e1913ea42711eaf4108372fd44 Author: Randy Dunlap Date: Fri Feb 13 16:39:35 2009 -0800 wireless: fix for CONFIG_NL80211=n Add empty function for case of CONFIG_NL80211=n: net/wireless/scan.c:35: error: implicit declaration of function 'nl80211_send_scan_aborted' Signed-off-by: Randy Dunlap Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 80bc53931bdf8284c5a95ba96d86ab6c2473a5f8 Author: Reinette Chatre Date: Fri Feb 13 11:51:19 2009 -0800 iwlwifi: Fix and rework Kconfig file Fixes: - iwlwifi is an optional driver and should thus not default to 'y'. - 3945 now depends on IWLCORE. Rework: - There is not a case when IWLCORE should not be selected. At the same time the driver does not use IWLWIFI or IWLCORE. We can just merge the usage of these two. With IWLWIFI being the driver name we proceed to use just it and replace instances of IWLCORE with it. The module name does not change and is still iwlcore. - Both IWLAGN and IWL3945 are selecting FW_LOADER, we can thus just move this up to one select when IWLWIFI is selected. - IWL5000 now supports Intel Wireless Wifi 100, 6000, and 6050 series. - Now that 3945 depends on IWLWIFI we can also indicate its dependency on MAC80211_LEDS and LEDS_CLASS at this level. - IWLAGN_LEDS is not used by driver - remove it. - IWLAGN_SPECTRUM_MEASUREMENT actually depends on IWLWIFI as it forms part of iwlcore module. Move this config up in Kconfig to reflect that and also change name to IWLWIFI_SPECTRUM_MEASUREMENT. - CONFIG_IWLWIFI_RFKILL is used by iwlagn as well as iwl3945, add text to description that indicates this. - CONFIG_IWL3945_RFKILL does not exist - remove usage from driver. - Add "iwlagn" to end of description of IWLAGN to help people understand what iwlagn means in rest of Kconfig text. - Add "iwl3945" to end of description of IWL3945 to help people understand what iwlagn means in rest of Kconfig text. - Change IWLWIFI_DEBUGFS description to indicate that only iwlagn supports it (for now). Signed-off-by: Reinette Chatre Reported-by: Randy Dunlap Signed-off-by: John W. Linville commit d21050c7bedaf4ee94c3b1b1ab7129a849bbf620 Author: Reinette Chatre Date: Fri Feb 13 11:51:18 2009 -0800 iwlwifi: use singlethread workqueue Use one workqueue instead of one per CPU. Signed-off-by: Reinette Chatre cc: Arjan van de Ven Signed-off-by: John W. Linville commit daf518dee66c3c6029d0b828e15c7adf5aea5493 Author: Wu, Fengguang Date: Fri Feb 13 11:51:17 2009 -0800 iwlwifi: report correct and detailed values about requested txpower Signed-off-by: Wu Fengguang Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 1788bcd155a2cbb7fad6bb30c2ae3786ceee8b4c Author: Jiri Slaby Date: Thu Feb 12 22:29:40 2009 +0100 ipw2200, fix ipw io functions - some of them are defined as follows: #define ipw_write32 expr1; expr2 and are called from loops or ifs without a compound statement, so they are broken. Fix it by putting them into do {} while (0) for writes and ({ }) for reads. - also unify and cleanup them while at it -- convert them from macros to inline functions, so that we get some basic typechecking Signed-off-by: Jiri Slaby Acked-by: Zhu Yi Cc: James Ketrenos Cc: Reinette Chatre Signed-off-by: John W. Linville commit 191a99b748a080d9ec896f35352da741b556119e Author: Bob Copeland Date: Thu Feb 12 13:38:58 2009 -0500 ath9k: move common regulatory code out of if() branches Both branches of the regulatory check in ath_attach() set up a custom regulatory domain and apply radar and world flags, so extract those into a single path. While at it, fix a couple of spelling errors and an unnecessary extra pointer traversal. Signed-off-by: Bob Copeland Acked-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 65fe4656b79d5f91e7c7416c9a2994301ccc15e7 Author: Bob Copeland Date: Thu Feb 12 13:38:57 2009 -0500 ath9k: remove prototype for ath9k_regd_get_current_country ath9k_regd_get_current_country() doesn't exist. Signed-off-by: Bob Copeland Acked-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 17580f6ab172089a31412bc895de5fcef9f8c073 Author: Bob Copeland Date: Thu Feb 12 13:38:56 2009 -0500 ath9k: remove ath9k_regd_get_rd() The function ath9k_regd_get_rd() is unused. Signed-off-by: Bob Copeland Acked-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit d0f48f9d1fa9ad01effdf280cda944c6eb518f59 Author: Bob Copeland Date: Thu Feb 12 13:38:55 2009 -0500 ath9k: convert isWwrSKU macro into C code Write isWwrSKU as an inline function and nix the camel-case to make the routine slightly clearer. Change its argument to take the regd value directly so it can eventually be used by ath5k as well. Signed-off-by: Bob Copeland Acked-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit e775aaf07a72eafdb352a984d820612dd76eab8c Author: Bob Copeland Date: Thu Feb 12 13:38:54 2009 -0500 ath9k: save a few calls to ath9k_regd_get_eepromRD Since we already have a stack variable to track the eeprom regd, we can grab it up front it and save three calls to fetch it again. Signed-off-by: Bob Copeland Acked-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 63a7c8e254651d1080809de22f0db3ac70fbf914 Author: Bob Copeland Date: Thu Feb 12 13:38:53 2009 -0500 ath9k: remove write-only current_rd_inuse The current_rd_inuse regulatory value is assigned but not used anywhere. Signed-off-by: Bob Copeland Acked-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 795cc0ad54128ada6f54d8b1eb051a907df6387e Author: Helmut Schaa Date: Thu Feb 12 18:51:03 2009 +0100 iwlagn: clean up error path in iwl_pci_probe This avoids triggering a BUG_ON in pci_disable_msi in the error path. Furthermore remove the first call to pci_disable_device as it is already called at out_pci_disable_device. Both issues were introduced in the patch "iwlagn: fix hw-rfkill while the interface is down". Signed-off-by: Helmut Schaa Acked-by: Reinette Chatre Signed-off-by: John W. Linville commit 8bd1d07f9345750bd4d767e6c1600919672f98ba Author: Senthil Balasubramanian Date: Thu Feb 12 13:57:03 2009 +0530 ath9k: Add open loop control support This patch adds Open Loop Control support for Atheros chipsets that supports open loop power control. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit 81cb7623ad3b408f871fa36b774fc20d8dfccac0 Author: Sujith Date: Thu Feb 12 11:38:37 2009 +0530 mac80211: Extend the rate control API with an update callback The AP can switch dynamically between 20/40 Mhz channel width, in which case we switch the local operating channel, but the rate control algorithm is not notified. This patch adds a new callback to indicate such changes to the RC algorithm. Currently, HT channel width change is notified, but this callback can be used to indicate any new requirements that might come up later on. Signed-off-by: Sujith Acked-by: Johannes Berg Signed-off-by: John W. Linville commit b06e786d4c850515e2efdf6dc37ba9e2ffc86bab Author: Sujith Date: Thu Feb 12 10:06:54 2009 +0530 ath9k: Decrease minimum NF threshold The existing value was too conservative, causing the history buffer not to be updated. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 668158af481a29aae82ded6593be0a21311f3243 Author: Sujith Date: Thu Feb 12 10:06:52 2009 +0530 ath9k: Fix incorrect noise floor reading for 4k EEPROM Signed-off-by: Sujith Signed-off-by: John W. Linville commit 0fd06c90c2a9e837da6f34383a9ca38cfa702e5b Author: Sujith Date: Thu Feb 12 10:06:51 2009 +0530 ath9k: Fix bug in disabling MIB counters This patch fixes a bug in ANI, where the MIB counters were being cleared before the stats were updated. Signed-off-by: Sujith Signed-off-by: John W. Linville commit edf7c060f094f33b68b34b9312688fb823ebc0ff Author: Sujith Date: Thu Feb 12 10:06:49 2009 +0530 ath9k: Initialize AGC calibration properly Signed-off-by: Sujith Signed-off-by: John W. Linville commit 4af9cf4fda28c5f794861c52e0db5a3de9ee574d Author: Sujith Date: Thu Feb 12 10:06:47 2009 +0530 ath9k: Enable TSF Out of Range Interrupt This patch lays the groundwork for handling TSF Out of Range interrupt, which will be used for power save later on. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 06d0f0663e11cab4ec5f2c143a118d71a12fbbe9 Author: Sujith Date: Thu Feb 12 10:06:45 2009 +0530 ath9k: Enable Fractional N mode This patch enables Fractional N mode for all channel if the EEPROM says so, and also fixes the INI only when the device is not a 2 GHz only capable device. Signed-off-by: Sujith Signed-off-by: John W. Linville commit fec0de1110e58ed39647e484bff8437e4185158d Author: Sujith Date: Thu Feb 12 10:06:43 2009 +0530 ath9k: Fix rd_ext EEPROM capability for AR9285 AR9285 chipsets have a different EEPROM layout, handle this appropriately when populating the rd_ext capability. Signed-off-by: Sujith Signed-off-by: John W. Linville commit e421c7b35c17752dbe6d26d910eb2d6814073355 Author: Sujith Date: Thu Feb 12 10:06:36 2009 +0530 ath9k: Store the correct max TX power level This patch fixes a bug where the max power level was being calculated incorrectly. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 469002983fc90c2ff0959e2b03335c0fe2e4d5a9 Author: Johannes Berg Date: Sun Feb 15 12:44:28 2009 +0100 mac80211: split IBSS/managed code This patch splits out the ibss code and data from managed (station) mode. The reason to do this is to better separate the state machines, and have the code be contained better so it gets easier to determine what exactly a given change will affect, that in turn makes it easier to understand. This is quite some churn, especially because I split sdata->u.sta into sdata->u.mgd and sdata->u.ibss, but I think it's easier to maintain that way. I've also shuffled around some code -- null function sending is only applicable to managed interfaces so put that into that file, some other functions are needed from various places so put them into util, and also rearranged the prototypes in ieee80211_i.h accordingly. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 96f5e66e8a79810e2982cdcfa28e554f3d97da21 Author: Johannes Berg Date: Thu Feb 12 00:51:53 2009 +0100 mac80211: fix aggregation for hardware with ampdu queues Hardware with AMPDU queues currently has broken aggregation. This patch fixes it by making all A-MPDUs go over the regular AC queues, but keeping track of the hardware queues in mac80211. As a first rough version, it actually stops the AC queue for extended periods of time, which can be removed by adding buffering internal to mac80211, but is currently not a huge problem because people rarely use multiple TIDs that are in the same AC (and iwlwifi currently doesn't operate as AP). This is a short-term fix, my current medium-term plan, which I hope to execute soon as well, but am not sure can finish before .30, looks like this: 1) rework the internal queuing layer in mac80211 that we use for fragments if the driver stopped queue in the middle of a fragmented frame to be able to queue more frames at once (rather than just a single frame with its fragments) 2) instead of stopping the entire AC queue, queue up the frames in a per-station/per-TID queue during aggregation session initiation, when the session has come up take all those frames and put them onto the queue from 1) 3) push the ampdu queue layer abstraction this patch introduces in mac80211 into the driver, and remove the virtual queue stuff from mac80211 again This plan will probably also affect ath9k in that mac80211 queues the frames instead of passing them down, even when there are no ampdu queues. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit f3734ee6df3ac57151e02d091f47d5e52e646539 Author: Dan Williams Date: Thu Feb 12 12:32:55 2009 -0500 make net/ieee80211.h private to ipw2x00 Only ipw2x00 now uses it. Reduce confusion. Profit! Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 1ea893fde29d8cf1639da8989f4b843dc3283ca8 Author: Dan Williams Date: Wed Feb 11 17:17:10 2009 -0500 hostap: convert usage of net/ieee80211.h to linux/ieee80211.h So that net/ieee80211.h can be made private to ipw2x00 in a follow-up. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 4d8faf6937fd7ada1f523b1cf565ffd2a0623e8c Author: Roel Kluin Date: Wed Feb 11 21:51:31 2009 +0100 wavelan: Test arraysize before an element of the array. Test arraysize before an element of the array. Signed-off-by: Roel Kluin Signed-off-by: John W. Linville commit 076ae609d20901b5fd9bc19fc4c245624c423970 Author: Johannes Berg Date: Wed Feb 11 20:27:30 2009 +0100 mac80211: disallow moving netns mac80211 currently assumes init_net for all interfaces, so really will not cope well with network namespaces, at least at this time. To change this, we would have keep track of the netns in addition to the ifindex, which is not something I want to think about right now. Signed-off-by: Johannes Berg Cc: Eric W. Biederman Signed-off-by: John W. Linville commit 53d6f81c7814690ba096584c733e5deaa34fdd8a Author: Vasanthakumar Thiagarajan Date: Wed Feb 11 22:18:49 2009 +0530 mac80211: Make sure non-HT connection when IEEE80211_STA_TKIP_WEP_USED is set It is possible that some broken AP might send HT IEs in it's assoc response even though the STA has not sent them in assoc req when WEP/TKIP is used as pairwise cipher suite. Also it is important to check this bit before enabling ht mode in beacon receive path. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit f5ac2b9eb58f5efad83f2d0e7fa464e8980ecfc9 Author: Bing Zhao Date: Wed Feb 4 22:22:39 2009 -0800 libertas: fix power save issue in libertas_sdio module The problem: "iwconfig ethX power on" returns error The cause: "ps_supported" flag was never set for SD8385/8686 The fix: check firmware capabilities returned by GET_HW_SPEC command. Set "ps_supported" to 1 if FW_CAPINFO_PS bit is on. This fix applies to SDIO interface only. Signed-off-by: Bing Zhao Acked-by: Dan Williams Signed-off-by: John W. Linville commit 1d9bc6d648ece77ffb41c5a577eab81fac5ad4de Author: Ralph Campbell Date: Fri Feb 27 10:34:30 2009 -0800 IB/mad: Fix null pointer dereference in local_completions() handle_outgoing_dr_smp() can queue a struct ib_mad_local_private *local on the mad_agent_priv->local_work work queue with local->mad_priv == NULL if device->process_mad() returns IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_REPLY and (!ib_response_mad(&mad_priv->mad.mad) || !mad_agent_priv->agent.recv_handler). In this case, local_completions() will be called with local->mad_priv == NULL. The code does check for this case and skips calling recv_mad_agent->agent.recv_handler() but recv == 0 so kmem_cache_free() is called with a NULL pointer. Also, since recv isn't reinitialized each time through the loop, it can cause a memory leak if recv should have been zero. Signed-off-by: Ralph Campbell commit 7020cb0fe216fdcec246cdc2412614a3190fbb2f Author: Ramachandra K Date: Fri Feb 27 10:33:12 2009 -0800 IB/mad: Fix RMPP header RRespTime manipulation Fix ib_set_rmpp_flags() to use the correct bit mask for RRespTime. In the 8-bit field of the RMPP header, the first 5 bits are RRespTime and next 3 bits are RMPPFlags. Hence to retain the first 5 bits, the mask should be 0xF8 instead of 0xF1. ack_recv()-->format_ack() calls ib_set_rmpp_flags() and due to the incorrect ANDing with 0xF1, RRespTime got changed incorrectly and RMPP Acks sent back always had a RRespTime of 0x1E (30) which caused the other end to consider the time outs to be approximately 4297 seconds (i.e. in the order of 4*2^30) instead of the usual ~4 seconds (order of 4*2^20). Signed-off-by: Ramachandra K Acked-by: Sean Hefty Signed-off-by: Roland Dreier commit 1aedb7721f05461f777fdee25b50d8a168c425ed Author: Or Gerlitz Date: Fri Feb 27 10:30:46 2009 -0800 IB/iser: Remove hard setting of path MTU Remove hard setting of the IB MTU used by iSER's RC queue-pair to 1K, as this was done due to inter-op issues with an old iser target which is not used any more. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 085343b47592b33276abf58a71c52ea29f0a338b Author: Jack Morgenstein Date: Fri Feb 27 10:29:13 2009 -0800 mlx4_core: Add device IDs for MT25458 10GigE devices Add device IDs for Mellanox MT25458 ConnectX+10GBaseT 10GigE adapters. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit c82c8abdeef53eb0bb0504becb4e91bbccceaee8 Author: Takashi Iwai Date: Fri Feb 27 17:52:22 2009 +0100 ALSA: hda - Fix an "unused variable" compile warning Forgot to remove an unused variable. sound/pci/hda/patch_realtek.c: In function ‘alc882_auto_init_analog_input’: sound/pci/hda/patch_realtek.c:7018: warning: unused variable ‘vref’ Signed-off-by: Takashi Iwai commit 53eff7e1e0de1cde8e8cbe619f401d2578dde946 Author: Takashi Iwai Date: Fri Feb 27 17:49:44 2009 +0100 ALSA: hda - Match all 103c:17xx devices for HP BPC model Use SND_PCI_QUIRK_MASK() to match all devices with 103c:17xx for HP BPC model. Signed-off-by: Takashi Iwai commit f897497673ffd2895778d85df38a5071434309b4 Merge: bedfceb... bb543c9... Author: Takashi Iwai Date: Fri Feb 27 17:47:31 2009 +0100 Merge branch 'fix/hda' into topic/hda Conflicts: sound/pci/hda/patch_realtek.c commit 82af308f658cf2193e5058bbbfd37c3437cfb4e7 Author: Clemens Ladisch Date: Fri Feb 27 09:27:44 2009 +0100 sound: oxygen: zero-initialize model data Model drivers assume that model_data is zeroed, so we better use kzalloc() (like we did before when it was allocated together with the card structure). Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit bedfcebb4fb33fc9ebd395462e72afa103db0bec Author: peerchen Date: Fri Feb 27 17:03:19 2009 +0800 ALSA: hda - Add the Device IDs for MCP89 and remove IDs of MCP7B Added the Device IDs for MCP89 HD audio controller. Removed the IDs of MCP7B cause this chipset had been cancelled. Signed-off-by: Peer Chen Signed-off-by: Takashi Iwai commit 5d242f1cee2c85721bbe9d8205e98c1c01f5d805 Author: Dhananjay Phadke Date: Wed Feb 25 15:57:56 2009 +0000 netxen: update copyright Extend copyright into 2009 and update address. Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit 465e985087e9a15ddbe8ad62d9a983ae434d84c6 Author: Hannes Eder Date: Wed Feb 25 13:11:37 2009 +0000 drivers/isdn/hardware/eicon: fix sparse warnings: Should it be static? Impact: Make symbols static. Fix this sparse warnings: drivers/isdn/hardware/eicon/message.c:1197:6: warning: symbol 'connect_req' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:1414:6: warning: symbol 'connect_res' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:1570:6: warning: symbol 'connect_a_res' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:1576:6: warning: symbol 'disconnect_req' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:1631:6: warning: symbol 'disconnect_res' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:1658:6: warning: symbol 'listen_req' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:1707:6: warning: symbol 'info_req' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:1816:6: warning: symbol 'info_res' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:1822:6: warning: symbol 'alert_req' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:1852:6: warning: symbol 'facility_req' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:2602:6: warning: symbol 'facility_res' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:2608:6: warning: symbol 'connect_b3_req' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:2842:6: warning: symbol 'connect_b3_res' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:2957:6: warning: symbol 'connect_b3_a_res' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:2977:6: warning: symbol 'disconnect_b3_req' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:3033:6: warning: symbol 'disconnect_b3_res' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:3089:6: warning: symbol 'data_b3_req' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:3166:6: warning: symbol 'data_b3_res' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:3199:6: warning: symbol 'reset_b3_req' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:3240:6: warning: symbol 'reset_b3_res' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:3264:6: warning: symbol 'connect_b3_t90_a_res' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:3298:6: warning: symbol 'select_b_req' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:8692:6: warning: symbol 'sig_req' was not declared. Should it be static? drivers/isdn/hardware/eicon/message.c:8792:6: warning: symbol 'send_data' was not declared. Should it be static? Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 215a9c78ae92c0e33261f7973d52d70d9eeb367c Author: Hannes Eder Date: Wed Feb 25 13:11:23 2009 +0000 drivers/isdn/hardware/icon: fix sparse warning: cast truncates bits Fix this sparse warning: drivers/isdn/hardware/eicon/debug.c:1201:32: warning: cast truncates bits from constant value (1000 becomes 0) Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit e86a6a1b7849217bb3b1ef725c7fee86ed6dae33 Author: Hannes Eder Date: Wed Feb 25 13:11:03 2009 +0000 drivers/isdn/hisax: fix sparse warning: Should it be static? Impact: Move declarations to a header file. Fix this sparse warning: drivers/isdn/hisax/callc.c:24:12: warning: symbol 'lli_revision' was not declared. Should it be static? drivers/isdn/hisax/config.c:84:12: warning: symbol 'CardType' was not declared. Should it be static? drivers/isdn/hisax/config.c:362:5: warning: symbol 'nrcards' was not declared. Should it be static? drivers/isdn/hisax/isdnl1.c:21:12: warning: symbol 'l1_revision' was not declared. Should it be static? drivers/isdn/hisax/isdnl2.c:22:12: warning: symbol 'l2_revision' was not declared. Should it be static? drivers/isdn/hisax/isdnl3.c:22:12: warning: symbol 'l3_revision' was not declared. Should it be static? drivers/isdn/hisax/tei.c:23:12: warning: symbol 'tei_revision' was not declared. Should it be static? Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit cf80063a7d8b1b477236e5491730c1ff71fc5577 Author: Hannes Eder Date: Wed Feb 25 13:09:52 2009 +0000 drivers/isdn/act2000: fix sparse warning: symbol shadows an earlier one Impact: Rename local variable 'c' to 't'. Fix this sparse warning: drivers/isdn/act2000/act2000_isa.c:260:70: warning: symbol 'c' shadows an earlier one Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit dfe925e8e9058c8af0d203ae7262437235623a68 Author: Hannes Eder Date: Wed Feb 25 13:08:40 2009 +0000 drivers/isdn/capi: fix sparse warning: context imbalance Impact: Attribute functions with __acquires(...) resp. __releases(...). Fix this sparse warnings: drivers/isdn/capi/kcapi_proc.c:241:13: warning: context imbalance in 'capi_driver_start' - wrong count at exit drivers/isdn/capi/kcapi_proc.c:252:13: warning: context imbalance in 'capi_driver_stop' - unexpected unlock Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 0d5e19ab07cf61cb0794cfac4df0a1bd5d1e19d7 Author: Paul Mundt Date: Fri Feb 27 17:02:28 2009 +0900 sh: Fix up SH-X3 general exception handler build. With the recent entry.S refactoring, the SH-X3 path had a mov.l for a register to register copy, resulting in: AS arch/sh/kernel/cpu/sh4/../sh3/entry.o arch/sh/kernel/cpu/sh4/../sh3/entry.S: Assembler messages: arch/sh/kernel/cpu/sh4/../sh3/entry.S:366: Error: invalid operands for opcode make[3]: *** [arch/sh/kernel/cpu/sh4/../sh3/entry.o] Error 1 Switch it over to a mov to fix it up. Signed-off-by: Paul Mundt commit 57e41c86e21c03941d17df29e0793fd04585d9ee Author: Magnus Damm Date: Tue Feb 24 22:59:19 2009 +0900 sh: multiple vectors per irq - sh7785 Update intc tables and platform data to use one linux irq per maskable interrupt source instead of keeping the one-to-one mapping between vectors and linux irqs. This fixes potential irq masking issues for sh7785 hardware blocks such as SCIF/DMAC/PCIC5/MMCIF/GDTA/FLCTL/GPIO Signed-off-by: Magnus Damm Tested-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit a842fb2d11ee478dc2fd09b736b1bc62c386f18a Author: Magnus Damm Date: Tue Feb 24 22:59:12 2009 +0900 sh: multiple vectors per irq - sh7780 Update intc tables and platform data to use one linux irq per maskable interrupt source instead of keeping the one-to-one mapping between vectors and linux irqs. This fixes potential irq masking issues for sh7780 hardware blocks such as SCIF/RTC/DMAC/PCIC5/MMCIF/FLCTL/GPIO Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 69977e7e25a291fd71c6dcaf2c5ea9e776afede5 Author: Magnus Damm Date: Tue Feb 24 22:59:04 2009 +0900 sh: multiple vectors per irq - sh7750 Update intc tables and platform data to use one linux irq per maskable interrupt source instead of keeping the one-to-one mapping between vectors and linux irqs. This fixes potential irq masking issues for sh775x hardware blocks such as SCI/SCIF/RTC/DMAC/TMU2/REF. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit bdaa6e8062d7f8085d8ed94ff88c99406ad53d79 Author: Magnus Damm Date: Tue Feb 24 22:58:57 2009 +0900 sh: multiple vectors per irq - base Instead of keeping the single vector -> single linux irq mapping we extend the intc code to support merging of vectors to a single linux irq. This helps processors such as sh7750, sh7780 and sh7785 which have more vectors than masking ability. With this patch in place we can modify the intc tables to use one irq per maskable irq source. Please note the following: - If multiple vectors share the same enum then only the first vector will be available as a linux irq. - Drivers may need to be rewritten to get pending irq source from the hardware block instead of irq number. This patch together with the sh7785 specific intc tables solves DMA controller irq issues related to buggy interrupt masking. Reported-by: Yoshihiro Shimoda Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 3e91faec47e9e12b965c952d698b0bb64847af06 Author: Magnus Damm Date: Tue Feb 24 22:23:51 2009 +0900 sh: fix P4 iounmap() pass-through Fix iounmap() of pass-through P4 addresses. Without this patch iounmap() on the sh7780 rtc area results in a warning message. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 5e084a1586a864d4e9b3f2edbb1bd3429909d652 Author: Magnus Damm Date: Tue Feb 24 22:11:03 2009 +0900 rtc: sh-rtc: Add Single IRQ Support Add support for single IRQ hardware to the sh-rtc driver. This is useful for processors with limited interrupt masking support such as sh7750 and sh7780. With this patch in place we can add logic to the intc code that merges all RTC vectors into a single linux interrupt with proper masking/unmasking support. Specify a single IRQ in the platform data to use this new shared IRQ feature. Separate Periodic/Carry/Alarm IRQs are still supported. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 973e5d525d39be6f9f6c38d37aacf03efda02e60 Author: Magnus Damm Date: Tue Feb 24 15:57:12 2009 +0900 serial: sh-sci: console drainage Modify the serial console code to wait for the transmit FIFO, make sure all bits have been put on the wire before returning. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit fe17f84f5f2a7d6c1a31c04c06a016d4ad5f7dec Author: Andy Grover Date: Tue Feb 24 15:30:39 2009 +0000 RDS: Kconfig and Makefile Add RDS Kconfig and Makefile, and modify net/'s to add us to the build. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit a09ed661f756d3209a19271192abe9b892b59c7d Author: Andy Grover Date: Tue Feb 24 15:30:41 2009 +0000 RDS: Add MAINTAINERS entry Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit cbd151bfc7b619b59c44c3697e901cb7152f418e Author: Andy Grover Date: Thu Feb 26 23:43:19 2009 -0800 RDS: Add RDS to AF key strings Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit db49b9d26c1966c683efced9e1c37f391d8f8182 Author: Andy Grover Date: Tue Feb 24 15:30:42 2009 +0000 RDS: Add userspace header Applications include this header in order to use RDS sockets. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit a73090ffaf0f6853880d9ac3fff7e5d88215131a Author: Paul Mundt Date: Fri Feb 27 16:42:05 2009 +0900 sh: Disable unsupportable prefetching on SH-3. The SH-3 does not support 'pref'-based prefetching, only SH-2A and SH-4A parts do. Remove SH-3 from the list. Signed-off-by: Paul Mundt commit 8a7c4c77267b1c77296cd03e6704813cb70706d1 Author: Andy Grover Date: Thu Feb 26 23:41:38 2009 -0800 RDS: Add AF and PF #defines for RDS sockets RDS is a reliable datagram protocol used for IPC on Oracle database clusters. This adds address and protocol family numbers for it. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 0197f21ca5c5ed0df2a14a60ef073e8163e6533b Author: Magnus Damm Date: Fri Feb 27 16:41:17 2009 +0900 sh: prefetch early exception data on sh4/sh4a. Prefetch early exception data. There is unused space in our exception handler cache line anyway, so this is almost free. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 0c5f9b8830aa0ff8f97e4efdfe1e1c4fe08ec71c Author: Andy Grover Date: Tue Feb 24 15:30:38 2009 +0000 RDS: Documentation This file documents the specifics of the RDS sockets API, as well as covering some of the details of its internal implementation. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 55b7ed0b582f9ff4bf3b9b44969cddda8c6763ea Author: Andy Grover Date: Tue Feb 24 15:30:37 2009 +0000 RDS: Common RDMA transport code Although most of IB and iWARP are separated from each other, there is some common code required to handle their shared CM listen port. This code listens for CM events and then dispatches the event to the appropriate transport, either IB or iWARP. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit fcd8b7c0ecf792dd824b2edcd63cb2c08563c340 Author: Andy Grover Date: Tue Feb 24 15:30:36 2009 +0000 RDS: Add iWARP support Support for iWARP NICs is implemented as a separate RDS transport from IB. The code, however, is very similar to IB (it was forked, basically.) so let's keep it in one changeset. The reason for this duplicationis that despite its similarity to IB, there are a number of places where it has different semantics. iwarp zcopy support is still under development, and giving it its own sandbox ensures that IB code isn't disrupted while iwarp changes. Over time these transports will re-converge. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit e6babe4cc4ce48577d743cc0de19a214f2527956 Author: Andy Grover Date: Tue Feb 24 15:30:35 2009 +0000 RDS/IB: Stats and sysctls IB-specific stats and sysctls. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 1e23b3ee0e943060a2e677cd20ed666b6060e12d Author: Andy Grover Date: Tue Feb 24 15:30:34 2009 +0000 RDS/IB: Receive datagrams via IB Header parsing, ring refill. It puts the incoming data into an rds_incoming struct, which is passed up to rds-core. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 6a0979df32296c3ba75a346db47a18292a231c6e Author: Andy Grover Date: Tue Feb 24 15:30:33 2009 +0000 RDS/IB: Implement IB-specific datagram send. Specific to IB is a credits-based flow control mechanism, in addition to the expected usage of the IB API to package outgoing data into work requests. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 08b48a1ed84b19b602cbe979184ad06e7e1c025e Author: Andy Grover Date: Tue Feb 24 15:30:32 2009 +0000 RDS/IB: Implement RDMA ops using FMRs Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit f528efe276ec16603b78f95fb63ca26b5b4c87dc Author: Andy Grover Date: Tue Feb 24 15:30:31 2009 +0000 RDS/IB: Ring-handling code. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit ec16227e14141e4fd7ae76354c09dadfe2449d9e Author: Andy Grover Date: Tue Feb 24 15:30:30 2009 +0000 RDS/IB: Infiniband transport Registers as an RDS transport and an IB client, and uses IB CM API to allocate ids, queue pairs, and the rest of that fun stuff. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit eff5f53bef75c0864a5da06bb688939092b848dc Author: Andy Grover Date: Tue Feb 24 15:30:29 2009 +0000 RDS: RDMA support Some transports may support RDMA features. This handles the non-transport-specific parts, like pinning user pages and tracking mapped regions. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit bdbe6fbc6a2f2ccfb384b141b257677d2a8d36fb Author: Andy Grover Date: Tue Feb 24 15:30:28 2009 +0000 RDS: recv.c Upon receiving a datagram from the transport, RDS parses the headers and potentially queues an ACK. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 5c11559046c4b3498d1977a029de8a312eacce35 Author: Andy Grover Date: Tue Feb 24 15:30:27 2009 +0000 RDS: send.c This is the code to send an RDS datagram. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 7875e18e09961d29f30424c5e2e48e704dc3789b Author: Andy Grover Date: Tue Feb 24 15:30:26 2009 +0000 RDS: Message parsing Parsing of newly-received RDS message headers (including ext. headers) and copy-to/from-user routines. page.c implements a per-cpu page remainder cache, to reduce the number of allocations needed for small datagrams. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 3e5048495c8569bfdd552750e0315973c61e7c93 Author: Andy Grover Date: Tue Feb 24 15:30:25 2009 +0000 RDS: sysctls RDS exposes a few tunable parameters via sysctls. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 13796bf9edc9d2008cfaa3ebea89312ced0d44a9 Author: Andy Grover Date: Tue Feb 24 15:30:24 2009 +0000 RDS: loopback A simple rds transport to handle loopback connections. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 00e0f34c616603ba6500f41943cbf89eb4a8a5be Author: Andy Grover Date: Tue Feb 24 15:30:23 2009 +0000 RDS: Connection handling While arguably the fact that the underlying transport needs a connection to convey RDS's datagrame reliably is not important to rds proper, the transports implemented so far (IB and TCP) have both been connection-oriented, and so the connection state machine-related code is in the common rds code. This patch also includes several work items, to handle connecting, sending, receiving, and shutdown. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit a8c879a7ee988eb67a5e85e87fa2cc953e0ca749 Author: Andy Grover Date: Tue Feb 24 15:30:22 2009 +0000 RDS: Info and stats RDS currently generates a lot of stats that are accessible via the rds-info utility. This code implements the support for this. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 0fbc78cbf51f3edee17c2ede42c7b3c13736158a Author: Andy Grover Date: Tue Feb 24 15:30:21 2009 +0000 RDS: Transport code RDS supports multiple transports. While this initial submission only supports Infiniband transport, this abstraction allows others to be added. We're working on an iWARP transport, and also see UDP over DCB as another possibility. This code handles transport registration. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 922cb17a5c812fcc9ebee249f4109db099896941 Author: Andy Grover Date: Tue Feb 24 15:30:20 2009 +0000 RDS: Congestion-handling code RDS handles per-socket congestion by updating peers with a complete congestion map (8KB). This code keeps track of these maps for itself and ones received from peers. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 39de8281791c4a01abcb0d32879530ffa5863c01 Author: Andy Grover Date: Tue Feb 24 15:30:19 2009 +0000 RDS: Main header file RDS's main data structure definitions and exported functions. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 639b321b4d8f4e412bfbb2a4a19bfebc1e68ace4 Author: Andy Grover Date: Tue Feb 24 15:30:18 2009 +0000 RDS: Socket interface Implement the RDS (Reliable Datagram Sockets) interface. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 4f099ebb27211d378304ddcfa507097f5128f5b9 Author: Magnus Damm Date: Mon Feb 23 07:16:34 2009 +0000 sh: remove EXPEVT vector from stack on sh3/sh4/sh4a Remove EXPEVT vector from the stack, lookup_exception_vector() for sh3/sh4/sh4a is already using k2 to get the vector. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 1dd22722f6bf9be9821657a2d59fae4d4365fb32 Author: Magnus Damm Date: Mon Feb 23 07:15:07 2009 +0000 sh: rework register restore code for sh3/sh4/sh4a This patch reworks the sh3/sh4/sh4a register restore code in the following ways: - break out restore_regs() from restore_all() - the register saving order is unchanged - use restore_regs() in sh_bios_handler and restore_all - document the function Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 1d015cf02a1fd46385c03cf3ce8958dbea705dd3 Author: Magnus Damm Date: Mon Feb 23 07:14:02 2009 +0000 sh: shared register saving code for sh3/sh4/sh4a This patch reworks the sh3/sh4/sh4a register saving code in the following ways: - break out prepare_stack_save_dsp() from handle_exception() - break out save_regs() from handle_exception() - the register saving order is unchanged - align new functions to fit in cache lines - separate exception code from interrupt code - keep main code flow in a single cache line per exception vector - use bsr/rts for regular functions (save pr first) - keep data in one shared cache line (exception_data) - document the functions - tie in the hp6xx code Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit b775a750c3afacbfac884537d466d34d50b1023b Author: Ben Hutchings Date: Thu Feb 26 23:21:23 2009 -0800 typhoon: Use request_firmware() Based on a patch by Jaswinder Singh . Compile-tested only. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 06e1f9ffa023c030bc87491e75f625f5da4e7d97 Author: Ben Hutchings Date: Thu Feb 26 23:20:56 2009 -0800 tehuti: Use request_firmware() Firmware blob is little endian. Compile-tested only. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 1318136fcda34d27ca8c322b6a0550200c3a8cec Author: Matt Carlson Date: Wed Feb 25 14:41:06 2009 +0000 Update TG3 MAINTAINERS entry This patch injects myself into the TG3 MAINTAINERS entry. Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 0d2a5068aaa238eba971784585e44130db6d4759 Author: Matt Carlson Date: Wed Feb 25 14:40:42 2009 +0000 tg3: Update copyright and version This patch updates the copyright to 2009 and updates the version number to 3.98. Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit a6f6cb1cf8ba54efdbbbf61b5b4345b0246da42f Author: Matt Carlson Date: Wed Feb 25 14:27:43 2009 +0000 tg3: Add version reporting for hardware selfboot This patch adds version reporting for hardware selfboot. Signed-off-by: Matt Carlson Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 7fd764455a13f4d9b37c9b908f07d0758f11d3c5 Author: Matt Carlson Date: Wed Feb 25 14:27:20 2009 +0000 tg3: Add DASH firmware version reporting This patch adds code to report the DASH firmware version. Signed-off-by: Matt Carlson Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit ff3a7cb25217bddcefd20e72af08a65481db4096 Author: Matt Carlson Date: Wed Feb 25 14:26:58 2009 +0000 tg3: Add legacy bootcode version decoding This patch adds code to obtain the bootcode version for versions of bootcode that do not use the new method. Signed-off-by: Matt Carlson Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit acd9c119cc663860fff4f1445ed0f87d82378d99 Author: Matt Carlson Date: Wed Feb 25 14:26:33 2009 +0000 tg3: Refactor firmware version routines This patch reorganizes the firmware version routines in preparation for the following patches. Signed-off-by: Matt Carlson Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 6d348f2c1e0bb1cf7a494b51fc921095ead3f6ae Author: Matt Carlson Date: Wed Feb 25 14:25:52 2009 +0000 tg3: Eliminate tg3_nvram_read_swab() The remaining uses of tg3_nvram_read_swab() either intended to read the data from NVRAM exactly as tg3_nvram_read_be32() did or hide deeper interpretations of the data. For the former case, a direct replacement of tg3_nvram_read_swab() with tg3_nvram_read_be32() is in order. For the latter case, we remove tg3_nvram_read_swab() and document what the code is really doing. Signed-off-by: Matt Carlson Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit a9dc529dcd5c541c51cb2ba09bff99580361c576 Author: Matt Carlson Date: Wed Feb 25 14:25:30 2009 +0000 tg3: Correct NVRAM stream endian notations Any software requesting NVRAM data as it exists on NVRAM is necessarily requesting that the results be returned as a bytestream. A bytestream data read in from the device can also be thought to be in big endian format. Therefore, all the LE notations in the driver are mislabeled. This patch converts all LE notations to BE notations, carefully evaluating the surrounding code in the process. Signed-off-by: Matt Carlson Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit e4f341103e4a2b35f56a0f89802f1b1448e8d04b Author: Matt Carlson Date: Wed Feb 25 14:25:00 2009 +0000 tg3: Invert nvram_read() and nvram_read_swab() This patch removes the blind byteswap of NVRAM data as it is read in. To preserve the logic at the call sites, this patch also inverts every call to tg3_nvram_read() and tg3_nvram_read_swab(). The call swap gets confusing within tg3_nvram_read_le() (LE is a misnomer), but the reader should be able to convince himself / herself that the resulting behavior is still unchanged. Signed-off-by: Matt Carlson Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit ffbcfed441b9ba74ce77f215eed6925f6a0b82a3 Author: Matt Carlson Date: Wed Feb 25 14:24:28 2009 +0000 tg3: Eliminate nvram routine forward declarations This patch moves all NVRAM routines earlier in the source file to eliminate forward declarations. Signed-off-by: Matt Carlson Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 844b3eed8a9efffa4225c811b989c8ff41691a78 Author: Matt Carlson Date: Wed Feb 25 14:23:56 2009 +0000 tg3: Refine tg3_vlan_rx_register() tg3_vlan_rx_register() touches the hardware if netif_running() returns false. This patch fixes the problem. Signed-off-by: Matt Carlson Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 7e5856bd9644e2299adbf5d0a8916f9cc56f1f36 Author: Matt Carlson Date: Wed Feb 25 14:23:01 2009 +0000 tg3: Update ethtool set_settings error checks The ethtool interface has acquired some new enumerations since the tg3 driver's tg3_set_settings() error checking code was written. The error checking code is no longer complete. This patch rewrites the error checking so that it is future-proofed. Signed-off-by: Matt Carlson Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit f7b493e02101bb5a0a69a91a8b4b7b002cd60eaf Author: Matt Carlson Date: Wed Feb 25 14:21:52 2009 +0000 tg3: Drop non-VLAN rx pkts larger than the MTU The hardware's MTU is configured so that it will accept packets whose VLAN tag is left inline. This means that the hardware will also accept other packets larger than the desired MTU size. This patch checks for and discards packets that are larger than the requested MTU but are not VLAN tagged frames. Signed-off-by: Matt Carlson Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit a6435f3a53746a0eb687a9f636cf1941f35f935e Author: Matt Carlson Date: Wed Feb 25 14:21:20 2009 +0000 tg3: Fix 5906 link problems Commit 6833c043f9fc03696fde623914c4a0277df2a0bc introduced the phy auto-powerdown capability. While the APD feature only works for 5761 and 5784 asic revisions, the (harmless portion of the) code was applied to all 5705 and newer devices. However, the 5906 phy departs from the usual design. This commit was interfering with the 5906's ability to negotiate link against some switches. This patch corrects the problem. Signed-off-by: Matt Carlson Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 9ee62630fddda0142cebc45e3bbea20a8009be97 Author: Hannes Eder Date: Wed Feb 25 10:33:06 2009 +0000 wanrouter: fix sparse warnings: context imbalance Impact: Attribute functions with __acquires(...) resp. __releases(...). Fix this sparse warnings: net/wanrouter/wanproc.c:82:13: warning: context imbalance in 'r_start' - wrong count at exit net/wanrouter/wanproc.c:103:13: warning: context imbalance in 'r_stop' - unexpected unlock net/wanrouter/wanmain.c:765:13: warning: context imbalance in 'lock_adapter_irq' - wrong count at exit net/wanrouter/wanmain.c:771:13: warning: context imbalance in 'unlock_adapter_irq' - unexpected unlock Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 56bca31ff1989aa8b60f717e984b0e624f06324e Author: Hannes Eder Date: Wed Feb 25 10:32:52 2009 +0000 inet fragments: fix sparse warning: context imbalance Impact: Attribute function with __releases(...) Fix this sparse warning: net/ipv4/inet_fragment.c:276:35: warning: context imbalance in 'inet_frag_find' - unexpected unlock Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit e57c624be8f99e56560fd2f4f485fe29f28dd74f Author: Hannes Eder Date: Wed Feb 25 10:32:39 2009 +0000 decnet: fix sparse warnings: symbol shadows an earlier one Impact: Remove redundant variable declarations, resp. rename inner scope variable. Fix this sparse warnings: net/decnet/af_decnet.c:1252:40: warning: symbol 'skb' shadows an earlier one net/decnet/af_decnet.c:1223:24: originally declared here net/decnet/af_decnet.c:1582:29: warning: symbol 'val' shadows an earlier one net/decnet/af_decnet.c:1527:22: originally declared here net/decnet/dn_dev.c:687:21: warning: symbol 'err' shadows an earlier one net/decnet/dn_dev.c:670:13: originally declared here net/decnet/sysctl_net_decnet.c:182:21: warning: symbol 'len' shadows an earlier one net/decnet/sysctl_net_decnet.c:173:16: originally declared here Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 8521c27ee79533db444dcac291992b6bf8d61fc8 Author: Hannes Eder Date: Wed Feb 25 10:32:25 2009 +0000 decnet: fix sparse warnings: context imbalance Impact: Attribute functions with __acquires(...) resp. __releases(...). Fix this sparse warnings: net/decnet/dn_dev.c:1324:13: warning: context imbalance in 'dn_dev_seq_start' - wrong count at exit net/decnet/dn_dev.c:1366:13: warning: context imbalance in 'dn_dev_seq_stop' - unexpected unlock Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 63d819caebcc3ca260ca0214d29044293969aa2f Author: Hannes Eder Date: Wed Feb 25 10:32:14 2009 +0000 sysctl: fix sparse warning: Should it be static? Impact: Include header file. Fix this sparse warning: net/core/sysctl_net_core.c:123:32: warning: symbol 'net_core_path' was not declared. Should it be static? Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 2db096086e8ff6c2a42881966e441157c686603b Author: Hannes Eder Date: Wed Feb 25 10:31:59 2009 +0000 appletalk: fix warning: format not a string literal and no ... Impact: Use 'static const char[]' instead of 'static char[]', and since the data is const now it can be placed in __initconst. Fix this warning: net/appletalk/ddp.c: In function 'atalk_init': net/appletalk/ddp.c:1894: warning: format not a string literal and no format arguments Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit e3db6cb42123f6dbde36122a4c81a06282370e1e Author: Hannes Eder Date: Wed Feb 25 10:31:37 2009 +0000 9p: fix sparse warning: cast adds address space Impact: Trust in the comment and add '__force' to the cast. Fix this sparse warning: net/9p/trans_fd.c:420:34: warning: cast adds address space to expression () Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 81c553299ffc4ce3512a6ea3eaf5070c2238c960 Author: Hannes Eder Date: Wed Feb 25 10:31:24 2009 +0000 net/802: fix sparse warnings: context imbalance Impact: Attribute function with __acquires(...) resp. __releases(...). Fix this sparse warnings: net/802/tr.c:492:21: warning: context imbalance in 'rif_seq_start' - wrong count at exit net/802/tr.c:519:13: warning: context imbalance in 'rif_seq_stop' - unexpected unlock Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 893d7de7c319b31626816e2095492003cc2df2a6 Author: Wei Yongjun Date: Wed Feb 25 00:47:26 2009 +0000 ns83820: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit f4fe5a9c6d49d760569feed12d54743e0c4fe6e8 Author: Wei Yongjun Date: Wed Feb 25 00:45:09 2009 +0000 chelsio: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit c3431ea71ee2ec9d892b5d7a83eb0afcf8c79263 Author: Wei Yongjun Date: Wed Feb 25 00:42:22 2009 +0000 llc: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit 47a30b26e58ab7e56e5654766fd678a4b90010e3 Author: Wei Yongjun Date: Wed Feb 25 00:41:03 2009 +0000 iucv: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit db849df63cdc95e0345b1f4bcf8bbfa19ef592b6 Author: Wei Yongjun Date: Wed Feb 25 00:39:01 2009 +0000 decnet: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit f3fbbe0f6f6cbac4c2aa3d71d95e49cf148286d6 Author: Wei Yongjun Date: Wed Feb 25 00:37:32 2009 +0000 core: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit acb5d75b9bcff73d32d3471a9b3e9a4189223e48 Author: Wei Yongjun Date: Wed Feb 25 00:36:42 2009 +0000 packet: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit ce030edfb4ba6734248b8d9f98d0a6f1dcd142e7 Author: Wei Yongjun Date: Wed Feb 25 00:35:44 2009 +0000 can: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit 91744f6559393697e13bf0f9f3f35f884e2520f9 Author: Wei Yongjun Date: Wed Feb 25 00:34:41 2009 +0000 netlink: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit 40d44446cf10d9d118e8f0132c94e1f25ea3be97 Author: Wei Yongjun Date: Wed Feb 25 00:32:45 2009 +0000 unix: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit 86dc1ad2be17a7436ee8c6799f6b55e5a5b930f4 Author: Wei Yongjun Date: Wed Feb 25 00:31:54 2009 +0000 pktgen: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit b233b28eac0cc37d07c2d007ea08c86c778c5af4 Author: Adrian McMenamin Date: Fri Feb 27 16:07:32 2009 +0900 sh: maple: Support block reads and writes. This patch updates the maple bus to support asynchronous block reads and writes as well as generally improving the quality of the code and supporting concurrency (all needed to support the Dreamcast visual memory unit - a driver will also be posted for that). Changes in the bus driver necessitate some changes in the two maple bus input drivers that are currently in mainline. As well as supporting block reads and writes this code clean up removes some poor handling of locks, uses an atomic status variable to serialise access to devices and more robusly handles the general performance problems of the bus. Signed-off-by: Adrian McMenamin Signed-off-by: Paul Mundt commit 6f961068671698c242f1828960485fef1392916f Author: Wei Yongjun Date: Wed Feb 25 00:31:04 2009 +0000 af_key: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit fbbfb986a8a3dfb42cd4cae7b1c7f822792823af Author: Wei Yongjun Date: Wed Feb 25 00:22:41 2009 +0000 wan: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Acked-by: Jan "Yenya" Kasprzak Signed-off-by: David S. Miller commit c71a2699c511623e0520c754cfc109c191bf64e2 Author: Wei Yongjun Date: Wed Feb 25 00:20:29 2009 +0000 i2400m: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit aaff1e1904f787579778a1818f0891c91ae22ec0 Author: Wei Yongjun Date: Wed Feb 25 00:18:12 2009 +0000 drivers/net/rionet.c: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit 1d2f8c950745f47f2937742eb886cffee439b754 Author: Wei Yongjun Date: Wed Feb 25 00:16:08 2009 +0000 ppp: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit 875b48297b8ab2f402680821da47d23bd6bddc55 Author: Wei Yongjun Date: Wed Feb 25 00:14:27 2009 +0000 irda: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit d46604e178f01305e63564864517926bb752d4a3 Author: Wei Yongjun Date: Wed Feb 25 00:12:09 2009 +0000 isdn: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit e44578ea7c4f87462e05e0d0a2dd43b6beecd5f6 Author: Paulius Zaleckas Date: Mon Feb 23 05:58:27 2009 +0000 hso: remove hso_free_device() There is really no need for function just doing simple kfree() Signed-off-by: Paulius Zaleckas Cc: Denis Joseph Barrow Signed-off-by: David S. Miller commit a6f26e4b0e1d63f466df7ae0fa35398316cf2dfc Author: Paulius Zaleckas Date: Mon Feb 23 05:39:34 2009 +0000 hso: remove claiming and releasing of USB interface No need to reclaim the same USB interface beeing probed. Releasing interface does nothing also. This is already in for a long time in off-kernel hso driver and no regresions were noticed for this change. Signed-off-by: Paulius Zaleckas Cc: Denis Joseph Barrow Signed-off-by: David S. Miller commit 6ceffd477808b806d0510747a77fca0a1a60a5b2 Author: Paulius Zaleckas Date: Mon Feb 23 04:59:43 2009 +0000 ppp_generic: Simplify tx_dropped stats Local variable dev = ppp->dev Signed-off-by: Paulius Zaleckas Signed-off-by: David S. Miller commit 63748aa8cd20a6bfb4a8ef3be9b51bec5e38ab72 Merge: 43be636... b1fb068... Author: David S. Miller Date: Thu Feb 26 22:46:54 2009 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6 commit 43be63662db56de3f87cb4a86bfe062a9797be65 Author: Greg Ungerer Date: Thu Feb 26 22:42:51 2009 -0800 m68knommu: remove ColdFire specific setup code from FEC driver Remove the ColdFire CPU specific setup from here. The ColdFire CPU platform code now sets up all this. Signed-off-by: Greg Ungerer Signed-off-by: David S. Miller commit ffba3f48bcd2d8af0570e7d4ce9b86fc4de9b10d Author: Greg Ungerer Date: Thu Feb 26 22:40:38 2009 -0800 fec: add FEC platform support to ColdFire CPU's setup code m68knommu: add FEC platform support to ColdFire CPU's setup code Move the per-CPU FEC driver setup code into the actual platform setup code for each ColdFire CPU varient. Signed-off-by: Greg Ungerer Signed-off-by: David S. Miller commit 211174ea8dca4502e20008de7ff2ad389db023a5 Author: Eric Sesterhenn Date: Thu Feb 26 22:38:15 2009 -0800 MISDN: list usage cleanup Trivial cleanup, list_del(); list_add_tail() is equivalent to list_move_tail(). Semantic patch for coccinelle can be found at www.cccmz.de/~snakebyte/list_move_tail.spatch Signed-off-by: Eric Sesterhenn Acked-by: Karsten Keil Signed-off-by: David S. Miller commit 4974097a97c6c11c22c2242f70821e2af65ef8e7 Author: Ron Mercer Date: Thu Feb 26 10:08:36 2009 +0000 qlge: Reduce debug print output. Get rid of some noise that is for debug only. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit b0c2aadfa4d2194615ba8f5630be7ae686b9ed01 Author: Ron Mercer Date: Thu Feb 26 10:08:35 2009 +0000 qlge: Prepare to add new device. This organizes a few calls into a function table to enable adding new devices. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 125844eaff0e9600c92a753995564fd93c807f3c Author: Ron Mercer Date: Thu Feb 26 10:08:34 2009 +0000 qlge: Move firmware event handler. This is not a logical change but rather a move of the inbound firmware event handler into it's own function as it will later be called by the outbound path. The addition of the mutex is to create exclusive access to the mailbox commands between inbound and outbound handling. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit a2e809bb1b2174af66bf9798444f7e90892f45a9 Author: Ron Mercer Date: Thu Feb 26 10:08:33 2009 +0000 qlge: Clean up firmware reset path. Add function for performing the reset rather than in-line. This function may later be called by a core dump process. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit b82808b759ffb8f4db2a1f8989195d95c8625cfe Author: Ron Mercer Date: Thu Feb 26 10:08:32 2009 +0000 qlge: Add defines for firmware support. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 036b66879addb28ad7104ca975317528bfc79e47 Author: Stephen Hemminger Date: Thu Feb 26 10:19:36 2009 +0000 mdio: fix non-constant printk warnings Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 6a64cd64c056d46b419bb07b02153b00df97a2c5 Author: Stephen Hemminger Date: Thu Feb 26 10:19:35 2009 +0000 forcedeth: fix non-constant printk warnings Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 98683956acea08858a3326eb4d61e5cf40c67fe2 Author: Stephen Hemminger Date: Thu Feb 26 10:19:34 2009 +0000 hamachi: fix non-constant printk warnings Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 3af0fe39751d69d6dc8008712ee4cee53705f7f9 Author: Stephen Hemminger Date: Thu Feb 26 10:19:33 2009 +0000 sundance: fix non-constant printk warnings Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b5defaa5d610666ef4d83fef70f0625a202314ea Author: Stephen Hemminger Date: Thu Feb 26 10:19:32 2009 +0000 starfire: fix non-constant printk warnings Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c8de1fce1a3a6590854e4e7b5aff83ced2b77060 Author: Stephen Hemminger Date: Thu Feb 26 10:19:31 2009 +0000 via-rhine: fix non-constant printk warnings Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 6f101d19f13b4f6edb9da5ce2744b1b3f44529c3 Author: Stephen Hemminger Date: Thu Feb 26 10:19:30 2009 +0000 fealnx: fix non-constant printk warnings Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 23410495d7f2026b3003642a1931b8366d423ce0 Author: Stephen Hemminger Date: Thu Feb 26 10:19:29 2009 +0000 natsemi: fix non-constant printk warnings Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit da38075cd1c7fc89b8730e907d63b9bf718586bb Author: Stephen Hemminger Date: Thu Feb 26 10:19:28 2009 +0000 acenic: fix non-constant printk warnings Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 7285484afd489417ec55fea16295dff7f3cabb5e Author: Stephen Hemminger Date: Thu Feb 26 10:19:27 2009 +0000 yellowfin: fix non-constant printk warnings Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 9a3c3de71d585088048c8f0d3a0d12af1426d187 Author: Stephen Hemminger Date: Thu Feb 26 10:19:26 2009 +0000 sis900: fix non-constant printk warnings Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 8937bb7b44b991c2535ad917e925c2daa2cd6096 Author: Stephen Hemminger Date: Thu Feb 26 10:19:25 2009 +0000 ne2k-pci: fix non-constant printk warnings Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 86de79b6d058df87fdf025c6c484b37340fb0205 Author: Stephen Hemminger Date: Thu Feb 26 10:19:24 2009 +0000 3c59x: get rid of non-const printk warnings Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 81b700b1ed496cf21e7ed5991c80dfe5e6723266 Author: Stephen Hemminger Date: Thu Feb 26 10:19:23 2009 +0000 lapb: get rid of non-const printk warning Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 03f54b3dec072d92393c1fb7eaab62e615161833 Author: Stephen Hemminger Date: Thu Feb 26 10:19:22 2009 +0000 tulip: get rid of warning for non-const string literal Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b1fb06830dc870d862f7f80e276130c0ab84d59f Author: Wei Yongjun Date: Wed Feb 25 18:09:33 2009 +0800 Bluetooth: Remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: Marcel Holtmann commit 7585b97a48180f754ebdade1be94092e36bef365 Author: Wei Yongjun Date: Wed Feb 25 18:29:52 2009 +0800 Bluetooth: Remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: Marcel Holtmann commit 2ae9a6be5f476f3512839a4d11a8f432bfd2914c Author: Dave Young Date: Sat Feb 21 16:13:34 2009 +0800 Bluetooth: Move hci_conn_del_sysfs() back to avoid device destruct too early The following commit introduce a regression: commit 7d0db0a373195385a2e0b19d1f5e4b186fdcffac Author: Marcel Holtmann Date: Mon Jul 14 20:13:51 2008 +0200 [Bluetooth] Use a more unique bus name for connections I get panic as following (by netconsole): [ 2709.344034] usb 5-1: new full speed USB device using uhci_hcd and address 4 [ 2709.505776] usb 5-1: configuration #1 chosen from 1 choice [ 2709.569207] Bluetooth: Generic Bluetooth USB driver ver 0.4 [ 2709.570169] usbcore: registered new interface driver btusb [ 2845.742781] BUG: unable to handle kernel paging request at 6b6b6c2f [ 2845.742958] IP: [] __lock_acquire+0x6c/0xa80 [ 2845.743087] *pde = 00000000 [ 2845.743206] Oops: 0002 [#1] SMP [ 2845.743377] last sysfs file: /sys/class/bluetooth/hci0/hci0:6/type [ 2845.743742] Modules linked in: btusb netconsole snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss rfcomm l2cap bluetooth vfat fuse snd_hda_codec_idt snd_hda_intel snd_hda_codec snd_hwdep snd_pcm pl2303 snd_timer psmouse usbserial snd 3c59x e100 serio_raw soundcore i2c_i801 intel_agp mii agpgart snd_page_alloc rtc_cmos rtc_core thermal processor rtc_lib button thermal_sys sg evdev [ 2845.743742] [ 2845.743742] Pid: 0, comm: swapper Not tainted (2.6.29-rc5-smp #54) Dell DM051 [ 2845.743742] EIP: 0060:[] EFLAGS: 00010002 CPU: 0 [ 2845.743742] EIP is at __lock_acquire+0x6c/0xa80 [ 2845.743742] EAX: 00000046 EBX: 00000046 ECX: 6b6b6b6b EDX: 00000002 [ 2845.743742] ESI: 6b6b6b6b EDI: 00000000 EBP: c064fd14 ESP: c064fcc8 [ 2845.743742] DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068 [ 2845.743742] Process swapper (pid: 0, ti=c064e000 task=c05d1400 task.ti=c064e000) [ 2845.743742] Stack: [ 2845.743742] c05d1400 00000002 c05d1400 00000001 00000002 00000000 f65388dc c05d1400 [ 2845.743742] 6b6b6b6b 00000292 c064fd0c c0153732 00000000 00000000 00000001 f700fa50 [ 2845.743742] 00000046 00000000 00000000 c064fd40 c0155be6 00000000 00000002 00000001 [ 2845.743742] Call Trace: [ 2845.743742] [] ? trace_hardirqs_on_caller+0x72/0x1c0 [ 2845.743742] [] ? lock_acquire+0x76/0xa0 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] ? _spin_lock_irqsave+0x45/0x80 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] ? skb_queue_purge+0x14/0x20 [ 2845.743742] [] ? hci_conn_del+0x10a/0x1c0 [bluetooth] [ 2845.743742] [] ? l2cap_disconn_ind+0x59/0xb0 [l2cap] [ 2845.743742] [] ? hci_conn_del_sysfs+0x8e/0xd0 [bluetooth] [ 2845.743742] [] ? hci_event_packet+0x5f8/0x31c0 [bluetooth] [ 2845.743742] [] ? sock_def_readable+0x59/0x80 [ 2845.743742] [] ? _read_unlock+0x1d/0x20 [ 2845.743742] [] ? hci_send_to_sock+0xe9/0x1d0 [bluetooth] [ 2845.743742] [] ? trace_hardirqs_on+0xb/0x10 [ 2845.743742] [] ? hci_rx_task+0x2ba/0x490 [bluetooth] [ 2845.743742] [] ? tasklet_action+0x31/0xc0 [ 2845.743742] [] ? tasklet_action+0x4c/0xc0 [ 2845.743742] [] ? __do_softirq+0xa7/0x170 [ 2845.743742] [] ? ack_apic_level+0x5c/0x1c0 [ 2845.743742] [] ? do_softirq+0x57/0x60 [ 2845.743742] [] ? irq_exit+0x7c/0x90 [ 2845.743742] [] ? do_IRQ+0x4b/0x90 [ 2845.743742] [] ? irq_exit+0x75/0x90 [ 2845.743742] [] ? common_interrupt+0x2c/0x34 [ 2845.743742] [] ? mwait_idle+0x4f/0x70 [ 2845.743742] [] ? cpu_idle+0x65/0xb0 [ 2845.743742] [] ? rest_init+0x4e/0x60 [ 2845.743742] Code: 0f 84 69 02 00 00 83 ff 07 0f 87 1e 06 00 00 85 ff 0f 85 08 05 00 00 8b 4d cc 8b 49 04 85 c9 89 4d d4 0f 84 f7 04 00 00 8b 75 d4 ff 86 c4 00 00 00 89 f0 e8 56 a9 ff ff 85 c0 0f 85 6e 03 00 [ 2845.743742] EIP: [] __lock_acquire+0x6c/0xa80 SS:ESP 0068:c064fcc8 [ 2845.743742] ---[ end trace 4c985b38f022279f ]--- [ 2845.743742] Kernel panic - not syncing: Fatal exception in interrupt [ 2845.743742] ------------[ cut here ]------------ [ 2845.743742] WARNING: at kernel/smp.c:329 smp_call_function_many+0x151/0x200() [ 2845.743742] Hardware name: Dell DM051 [ 2845.743742] Modules linked in: btusb netconsole snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss rfcomm l2cap bluetooth vfat fuse snd_hda_codec_idt snd_hda_intel snd_hda_codec snd_hwdep snd_pcm pl2303 snd_timer psmouse usbserial snd 3c59x e100 serio_raw soundcore i2c_i801 intel_agp mii agpgart snd_page_alloc rtc_cmos rtc_core thermal processor rtc_lib button thermal_sys sg evdev [ 2845.743742] Pid: 0, comm: swapper Tainted: G D 2.6.29-rc5-smp #54 [ 2845.743742] Call Trace: [ 2845.743742] [] warn_slowpath+0x86/0xa0 [ 2845.743742] [] ? trace_hardirqs_off+0xb/0x10 [ 2845.743742] [] ? up+0x14/0x40 [ 2845.743742] [] ? release_console_sem+0x31/0x1e0 [ 2845.743742] [] ? _spin_lock_irqsave+0x6b/0x80 [ 2845.743742] [] ? trace_hardirqs_off+0xb/0x10 [ 2845.743742] [] ? _read_lock_irqsave+0x40/0x80 [ 2845.743742] [] ? release_console_sem+0x1c2/0x1e0 [ 2845.743742] [] ? up+0x14/0x40 [ 2845.743742] [] ? trace_hardirqs_off+0xb/0x10 [ 2845.743742] [] ? __mutex_unlock_slowpath+0x97/0x160 [ 2845.743742] [] ? mutex_trylock+0xb3/0x180 [ 2845.743742] [] ? mutex_unlock+0x8/0x10 [ 2845.743742] [] smp_call_function_many+0x151/0x200 [ 2845.743742] [] ? stop_this_cpu+0x0/0x40 [ 2845.743742] [] smp_call_function+0x21/0x30 [ 2845.743742] [] native_smp_send_stop+0x1e/0x50 [ 2845.743742] [] panic+0x55/0x110 [ 2845.743742] [] oops_end+0xb8/0xc0 [ 2845.743742] [] die+0x4f/0x70 [ 2845.743742] [] do_page_fault+0x269/0x610 [ 2845.743742] [] ? do_page_fault+0x0/0x610 [ 2845.743742] [] error_code+0x77/0x7c [ 2845.743742] [] ? __lock_acquire+0x6c/0xa80 [ 2845.743742] [] ? trace_hardirqs_on_caller+0x72/0x1c0 [ 2845.743742] [] lock_acquire+0x76/0xa0 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] _spin_lock_irqsave+0x45/0x80 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] skb_dequeue+0x1d/0x70 [ 2845.743742] [] skb_queue_purge+0x14/0x20 [ 2845.743742] [] hci_conn_del+0x10a/0x1c0 [bluetooth] [ 2845.743742] [] ? l2cap_disconn_ind+0x59/0xb0 [l2cap] [ 2845.743742] [] ? hci_conn_del_sysfs+0x8e/0xd0 [bluetooth] [ 2845.743742] [] hci_event_packet+0x5f8/0x31c0 [bluetooth] [ 2845.743742] [] ? sock_def_readable+0x59/0x80 [ 2845.743742] [] ? _read_unlock+0x1d/0x20 [ 2845.743742] [] ? hci_send_to_sock+0xe9/0x1d0 [bluetooth] [ 2845.743742] [] ? trace_hardirqs_on+0xb/0x10 [ 2845.743742] [] hci_rx_task+0x2ba/0x490 [bluetooth] [ 2845.743742] [] ? tasklet_action+0x31/0xc0 [ 2845.743742] [] tasklet_action+0x4c/0xc0 [ 2845.743742] [] __do_softirq+0xa7/0x170 [ 2845.743742] [] ? ack_apic_level+0x5c/0x1c0 [ 2845.743742] [] do_softirq+0x57/0x60 [ 2845.743742] [] irq_exit+0x7c/0x90 [ 2845.743742] [] do_IRQ+0x4b/0x90 [ 2845.743742] [] ? irq_exit+0x75/0x90 [ 2845.743742] [] common_interrupt+0x2c/0x34 [ 2845.743742] [] ? mwait_idle+0x4f/0x70 [ 2845.743742] [] cpu_idle+0x65/0xb0 [ 2845.743742] [] rest_init+0x4e/0x60 [ 2845.743742] ---[ end trace 4c985b38f02227a0 ]--- [ 2845.743742] ------------[ cut here ]------------ [ 2845.743742] WARNING: at kernel/smp.c:226 smp_call_function_single+0x8e/0x110() [ 2845.743742] Hardware name: Dell DM051 [ 2845.743742] Modules linked in: btusb netconsole snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss rfcomm l2cap bluetooth vfat fuse snd_hda_codec_idt snd_hda_intel snd_hda_codec snd_hwdep snd_pcm pl2303 snd_timer psmouse usbserial snd 3c59x e100 serio_raw soundcore i2c_i801 intel_agp mii agpgart snd_page_alloc rtc_cmos rtc_core thermal processor rtc_lib button thermal_sys sg evdev [ 2845.743742] Pid: 0, comm: swapper Tainted: G D W 2.6.29-rc5-smp #54 [ 2845.743742] Call Trace: [ 2845.743742] [] warn_slowpath+0x86/0xa0 [ 2845.743742] [] ? warn_slowpath+0x10/0xa0 [ 2845.743742] [] ? trace_hardirqs_off+0xb/0x10 [ 2845.743742] [] ? up+0x14/0x40 [ 2845.743742] [] ? release_console_sem+0x31/0x1e0 [ 2845.743742] [] ? _spin_lock_irqsave+0x6b/0x80 [ 2845.743742] [] ? trace_hardirqs_off+0xb/0x10 [ 2845.743742] [] ? _read_lock_irqsave+0x40/0x80 [ 2845.743742] [] ? release_console_sem+0x1c2/0x1e0 [ 2845.743742] [] ? up+0x14/0x40 [ 2845.743742] [] smp_call_function_single+0x8e/0x110 [ 2845.743742] [] ? stop_this_cpu+0x0/0x40 [ 2845.743742] [] ? cpumask_next_and+0x1f/0x40 [ 2845.743742] [] smp_call_function_many+0x11a/0x200 [ 2845.743742] [] ? stop_this_cpu+0x0/0x40 [ 2845.743742] [] smp_call_function+0x21/0x30 [ 2845.743742] [] native_smp_send_stop+0x1e/0x50 [ 2845.743742] [] panic+0x55/0x110 [ 2845.743742] [] oops_end+0xb8/0xc0 [ 2845.743742] [] die+0x4f/0x70 [ 2845.743742] [] do_page_fault+0x269/0x610 [ 2845.743742] [] ? do_page_fault+0x0/0x610 [ 2845.743742] [] error_code+0x77/0x7c [ 2845.743742] [] ? __lock_acquire+0x6c/0xa80 [ 2845.743742] [] ? trace_hardirqs_on_caller+0x72/0x1c0 [ 2845.743742] [] lock_acquire+0x76/0xa0 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] _spin_lock_irqsave+0x45/0x80 [ 2845.743742] [] ? skb_dequeue+0x1d/0x70 [ 2845.743742] [] skb_dequeue+0x1d/0x70 [ 2845.743742] [] skb_queue_purge+0x14/0x20 [ 2845.743742] [] hci_conn_del+0x10a/0x1c0 [bluetooth] [ 2845.743742] [] ? l2cap_disconn_ind+0x59/0xb0 [l2cap] [ 2845.743742] [] ? hci_conn_del_sysfs+0x8e/0xd0 [bluetooth] [ 2845.743742] [] hci_event_packet+0x5f8/0x31c0 [bluetooth] [ 2845.743742] [] ? sock_def_readable+0x59/0x80 [ 2845.743742] [] ? _read_unlock+0x1d/0x20 [ 2845.743742] [] ? hci_send_to_sock+0xe9/0x1d0 [bluetooth] [ 2845.743742] [] ? trace_hardirqs_on+0xb/0x10 [ 2845.743742] [] hci_rx_task+0x2ba/0x490 [bluetooth] [ 2845.743742] [] ? tasklet_action+0x31/0xc0 [ 2845.743742] [] tasklet_action+0x4c/0xc0 [ 2845.743742] [] __do_softirq+0xa7/0x170 [ 2845.743742] [] ? ack_apic_level+0x5c/0x1c0 [ 2845.743742] [] do_softirq+0x57/0x60 [ 2845.743742] [] irq_exit+0x7c/0x90 [ 2845.743742] [] do_IRQ+0x4b/0x90 [ 2845.743742] [] ? irq_exit+0x75/0x90 [ 2845.743742] [] common_interrupt+0x2c/0x34 [ 2845.743742] [] ? mwait_idle+0x4f/0x70 [ 2845.743742] [] cpu_idle+0x65/0xb0 [ 2845.743742] [] rest_init+0x4e/0x60 [ 2845.743742] ---[ end trace 4c985b38f02227a1 ]--- [ 2845.743742] Rebooting in 3 seconds.. My logitec bluetooth mouse trying connect to pc, but pc side reject the connection again and again. then panic happens. The reason is due to hci_conn_del_sysfs now called in hci_event_packet, the del work is done in a workqueue, so it's possible done before skb_queue_purge called. I move the hci_conn_del_sysfs after skb_queue_purge just as that before marcel's commit. Remove the hci_conn_del_sysfs in hci_conn_hash_flush as well due to hci_conn_del will deal with the work. Signed-off-by: Dave Young Signed-off-by: Marcel Holtmann commit 2526d3d8b2f671a7d36cc486af984052cd5a690f Author: Marcel Holtmann Date: Fri Feb 20 20:54:06 2009 +0100 Bluetooth: Permit BT_SECURITY also for L2CAP raw sockets Userspace pairing code can be simplified if it doesn't have to fall back to using L2CAP_LM in the case of L2CAP raw sockets. This patch allows the BT_SECURITY socket option to be used for these sockets. Signed-off-by: Johan Hedberg Signed-off-by: Marcel Holtmann commit 37e62f5516cfb210e64fe53457932df4341b0ad1 Author: Marcel Holtmann Date: Tue Feb 17 21:49:33 2009 +0100 Bluetooth: Fix RFCOMM usage of in-kernel L2CAP sockets The CID value of L2CAP sockets need to be set to zero. All userspace applications do this via memset() on the sockaddr_l2 structure. The RFCOMM implementation uses in-kernel L2CAP sockets and so it has to make sure that l2_cid is set to zero. Signed-off-by: Marcel Holtmann commit 2a517ca687232adc8f14893730644da712010ffc Author: Marcel Holtmann Date: Mon Feb 16 03:20:31 2009 +0100 Bluetooth: Disallow usage of L2CAP CID setting for now In the future the L2CAP layer will have full support for fixed channels and right now it already can export the channel assignment, but for the functions bind() and connect() the usage of only CID 0 is allowed. This allows an easy detection if the kernel supports fixed channels or not, because otherwise it would impossible for application to tell. Signed-off-by: Marcel Holtmann commit 8bf4794174659b06d43cc5e290cd384757374613 Author: Marcel Holtmann Date: Mon Feb 16 02:59:49 2009 +0100 Bluetooth: Change RFCOMM to use BT_CONNECT2 for BT_DEFER_SETUP When BT_DEFER_SETUP is enabled on a RFCOMM socket, then switch its current state from BT_OPEN to BT_CONNECT2. This gives the Bluetooth core a unified way to handle L2CAP and RFCOMM sockets. The BT_CONNECT2 state is designated for incoming connections. Signed-off-by: Marcel Holtmann commit d5f2d2be68876f65dd051b978a7b66265fde9ffd Author: Marcel Holtmann Date: Mon Feb 16 02:57:30 2009 +0100 Bluetooth: Fix poll() misbehavior when using BT_DEFER_SETUP When BT_DEFER_SETUP has been enabled on a Bluetooth socket it keeps signaling POLLIN all the time. This is a wrong behavior. The POLLIN should only be signaled if the client socket is in BT_CONNECT2 state and the parent has been BT_DEFER_SETUP enabled. Signed-off-by: Marcel Holtmann commit 96a3183322cba1a2846771b067c99b9d6f481263 Author: Marcel Holtmann Date: Thu Feb 12 16:23:03 2009 +0100 Bluetooth: Set authentication requirement before requesting it The authentication requirement got only updated when the security level increased. This is a wrong behavior. The authentication requirement is read by the Bluetooth daemon to make proper decisions when handling the IO capabilities exchange. So set the value that is currently expected by the higher layers like L2CAP and RFCOMM. Signed-off-by: Marcel Holtmann commit 00ae4af91d8c5b6814e2bb3bfaaf743845f989eb Author: Marcel Holtmann Date: Thu Feb 12 16:19:45 2009 +0100 Bluetooth: Fix authentication requirements for L2CAP security check The L2CAP layer can trigger the authentication via an ACL connection or later on to increase the security level. When increasing the security level it didn't use the same authentication requirements when triggering a new ACL connection. Make sure that exactly the same authentication requirements are used. The only exception here are the L2CAP raw sockets which are only used for dedicated bonding. Signed-off-by: Marcel Holtmann commit 2950f21acb0f6b8fcd964485c2ebf1e06545ac20 Author: Marcel Holtmann Date: Thu Feb 12 14:02:50 2009 +0100 Bluetooth: Ask upper layers for HCI disconnect reason Some of the qualification tests demand that in case of failures in L2CAP the HCI disconnect should indicate a reason why L2CAP fails. This is a bluntly layer violation since multiple L2CAP connections could be using the same ACL and thus forcing a disconnect reason is not a good idea. To comply with the Bluetooth test specification, the disconnect reason is now stored in the L2CAP connection structure and every time a new L2CAP channel is added it will set back to its default. So only in the case where the L2CAP channel with the disconnect reason is really the last one, it will propagated to the HCI layer. The HCI layer has been extended with a disconnect indication that allows it to ask upper layers for a disconnect reason. The upper layer must not support this callback and in that case it will nicely default to the existing behavior. If an upper layer like L2CAP can provide a disconnect reason that one will be used to disconnect the ACL or SCO link. No modification to the ACL disconnect timeout have been made. So in case of Linux to Linux connection the initiator will disconnect the ACL link before the acceptor side can signal the specific disconnect reason. That is perfectly fine since Linux doesn't make use of this value anyway. The L2CAP layer has a perfect valid error code for rejecting connection due to a security violation. It is unclear why the Bluetooth specification insists on having specific HCI disconnect reason. Signed-off-by: Marcel Holtmann commit f29972de8e7476706ab3c01304a505e7c95d9040 Author: Marcel Holtmann Date: Thu Feb 12 05:07:45 2009 +0100 Bluetooth: Add CID field to L2CAP socket address structure In preparation for L2CAP fixed channel support, the CID value of a L2CAP connection needs to be accessible via the socket interface. The CID is the connection identifier and exists as source and destination value. So extend the L2CAP socket address structure with this field and change getsockname() and getpeername() to fill it in. The bind() and connect() functions have been modified to handle L2CAP socket address structures of variable sizes. This makes them future proof if additional fields need to be added. Signed-off-by: Marcel Holtmann commit e1027a7c69700301d14db03d2e049ee60c4f92df Author: Marcel Holtmann Date: Mon Feb 9 09:18:02 2009 +0100 Bluetooth: Request L2CAP fixed channel list if available If the extended features mask indicates support for fixed channels, request the list of available fixed channels. This also enables the fixed channel features bit so remote implementations can request information about it. Currently only the signal channel will be listed. Signed-off-by: Marcel Holtmann commit 435fef20acfc48f46476abad55b0cd3aa47b8365 Author: Marcel Holtmann Date: Mon Feb 9 03:55:28 2009 +0100 Bluetooth: Don't enforce authentication for L2CAP PSM 1 and 3 The recommendation for the L2CAP PSM 1 (SDP) is to not use any kind of authentication or encryption. So don't trigger authentication for incoming and outgoing SDP connections. For L2CAP PSM 3 (RFCOMM) there is no clear requirement, but with Bluetooth 2.1 the initiator is required to enable authentication and encryption first and this gets enforced. So there is no need to trigger an additional authentication step. The RFCOMM service security will make sure that a secure enough link key is present. When the encryption gets enabled after the SDP connection setup, then switch the security level from SDP to low security. Signed-off-by: Marcel Holtmann commit 6a8d3010b313d99adbb28f1826fac0234395bb26 Author: Marcel Holtmann Date: Fri Feb 6 23:56:36 2009 +0100 Bluetooth: Fix double L2CAP connection request If the remote L2CAP server uses authentication pending stage and encryption is enabled it can happen that a L2CAP connection request is sent twice due to a race condition in the connection state machine. When the remote side indicates any kind of connection pending, then track this state and skip sending of L2CAP commands for this period. Signed-off-by: Marcel Holtmann commit 984947dc64f82bc6cafa4d84ba1a139718f634a8 Author: Marcel Holtmann Date: Fri Feb 6 23:35:19 2009 +0100 Bluetooth: Fix race condition with L2CAP information request When two L2CAP connections are requested quickly after the ACL link has been established there exists a window for a race condition where a connection request is sent before the information response has been received. Any connection request should only be sent after an exchange of the extended features mask has been finished. Signed-off-by: Marcel Holtmann commit 657e17b03c80bec817975984d221bef716f83558 Author: Marcel Holtmann Date: Fri Feb 6 19:45:36 2009 +0100 Bluetooth: Set authentication requirements if not available When no authentication requirements are selected, but an outgoing or incoming connection has requested any kind of security enforcement, then set these authentication requirements. This ensures that the userspace always gets informed about the authentication requirements (if available). Only when no security enforcement has happened, the kernel will signal invalid requirements. Signed-off-by: Marcel Holtmann commit 0684e5f9fb9e3f7e168ab831dfca693bcb44805b Author: Marcel Holtmann Date: Mon Feb 9 02:48:38 2009 +0100 Bluetooth: Use general bonding whenever possible When receiving incoming connection to specific services, always use general bonding. This ensures that the link key gets stored and can be used for further authentications. Signed-off-by: Marcel Holtmann commit efc7688b557dd1be10eead7399b315efcb1dbc74 Author: Marcel Holtmann Date: Fri Feb 6 09:13:37 2009 +0100 Bluetooth: Add SCO fallback for eSCO connection attempts When attempting to setup eSCO connections it can happen that some link manager implementations fail to properly negotiate the eSCO parameters and thus fail the eSCO setup. Normally the link manager is responsible for the negotiation of the parameters and actually fallback to SCO if no agreement can be reached. In cases where the link manager is just too stupid, then at least try to establish a SCO link if eSCO fails. For the Bluetooth devices with EDR support this includes handling packet types of EDR basebands. This is particular tricky since for the EDR the logic of enabling/disabling one specific packet type is turned around. This fix contains an extra bitmask to disable eSCO EDR packet when trying to fallback to a SCO connection. Signed-off-by: Marcel Holtmann commit 255c76014af74165428e7aa16414b857e2bdccf2 Author: Marcel Holtmann Date: Wed Feb 4 21:07:19 2009 +0100 Bluetooth: Don't check encryption for L2CAP raw sockets For L2CAP sockets with medium and high security requirement a missing encryption will enforce the closing of the link. For the L2CAP raw sockets this is not needed, so skip that check. This fixes a crash when pairing Bluetooth 2.0 (and earlier) devices since the L2CAP state machine got confused and then locked up the whole system. Signed-off-by: Marcel Holtmann commit 43c2e57f94c15744495fee564610aa24602b3824 Author: Marcel Holtmann Date: Wed Feb 4 17:41:38 2009 +0100 Bluetooth: Submit bulk URBs along with interrupt URBs Submitting the bulk URBs for ACL data transfers only on demand has no real benefit compared to just submit them when a Bluetooth device gets opened. So when submitting the interrupt URBs for HCI events, just submit the bulk URBs, too. This solves a problem with some Bluetooth USB dongles that has been reported over the last few month. These devices require that the bulk URBs are actually present. These devices are really broken, but there is nothing we can do about it. Signed-off-by: Marcel Holtmann commit 6e1031a40029492c10509e8c3dcac9b611438ccb Author: Jaikumar Ganesh Date: Mon Feb 2 18:03:57 2009 -0800 Bluetooth: When encryption is dropped, do not send RFCOMM packets During a role change with pre-Bluetooth 2.1 devices, the remote side drops the encryption of the RFCOMM connection. We allow a grace period for the encryption to be re-established, before dropping the connection. During this grace period, the RFCOMM_SEC_PENDING flag is set. Check this flag before sending RFCOMM packets. Signed-off-by: Jaikumar Ganesh Signed-off-by: Marcel Holtmann commit 34a55eda483e8177c9044f93fd2c9107f02bf1c7 Author: Andre Haupt Date: Mon Feb 2 14:45:11 2009 -0800 Bluetooth: Eliminate a sparse warning in bt3c driver This eliminates a sparse warning that symbol 'stat' shadows an earlier one. Signed-off-by: Andre Haupt Signed-off-by: Marcel Holtmann commit dd2efd03b49d56ae795c71335bc7358022514c32 Author: Dave Young Date: Sat Jan 31 13:51:15 2009 +0800 Bluetooth: Remove CONFIG_DEBUG_LOCK_ALLOC ifdefs Due to lockdep changes, the CONFIG_DEBUG_LOCK_ALLOC ifdef is not needed now. So just remove it here. The following commit fixed the !lockdep build warnings: commit e8f6fbf62de37cbc2e179176ac7010d5f4396b67 Author: Ingo Molnar Date: Wed Nov 12 01:38:36 2008 +0000 lockdep: include/linux/lockdep.h - fix warning in net/bluetooth/af_bluetooth.c Signed-off-by: Dave Young Signed-off-by: Marcel Holtmann commit 5f9018af004fa8635bbbe3ab2dc61e8a686edfaa Author: Marcel Holtmann Date: Fri Jan 16 10:09:50 2009 +0100 Bluetooth: Update version numbers With the support for the enhanced security model and the support for deferring connection setup, it is a good idea to increase various version numbers. This is purely cosmetic and has no effect on the behavior, but can be really helpful when debugging problems in different kernel versions. Signed-off-by: Marcel Holtmann commit 0588d94fd7e414367a7ae517569d2222441c255f Author: Marcel Holtmann Date: Fri Jan 16 10:06:13 2009 +0100 Bluetooth: Restrict application of socket options The new socket options should only be evaluated for SOL_BLUETOOTH level and not for every other level. Previously this causes some minor issues when detecting if a kernel with certain features is available. Also restrict BT_SECURITY to SOCK_SEQPACKET for L2CAP and SOCK_STREAM for the RFCOMM protocol. Signed-off-by: Marcel Holtmann commit f62e4323ab43c59e7cd7f72c1eb392d7c767ce5a Author: Marcel Holtmann Date: Thu Jan 15 21:58:44 2009 +0100 Bluetooth: Disconnect L2CAP connections without encryption For L2CAP connections with high security setting, the link will be immediately dropped when the encryption gets disabled. For L2CAP connections with medium security there will be grace period where the remote device has the chance to re-enable encryption. If it doesn't happen then the link will also be disconnected. The requirement for the grace period with medium security comes from Bluetooth 2.0 and earlier devices that require role switching. Signed-off-by: Marcel Holtmann commit 8c84b83076b5062f59b6167cdda90d9e5124aa71 Author: Marcel Holtmann Date: Fri Jan 16 08:17:51 2009 +0100 Bluetooth: Pause RFCOMM TX when encryption drops A role switch with devices following the Bluetooth pre-2.1 standards or without Encryption Pause and Resume support is not possible if encryption is enabled. Most newer headsets require the role switch, but also require that the connection is encrypted. For connections with a high security mode setting, the link will be immediately dropped. When the connection uses medium security mode setting, then a grace period is introduced where the TX is halted and the remote device gets a change to re-enable encryption after the role switch. If not re-enabled the link will be dropped. Based on initial work by Ville Tervo Signed-off-by: Marcel Holtmann commit 9f2c8a03fbb3048cf38b158f87aa0c3c09bca084 Author: Marcel Holtmann Date: Thu Jan 15 21:58:40 2009 +0100 Bluetooth: Replace RFCOMM link mode with security level Change the RFCOMM internals to use the new security levels and remove the link mode details. Signed-off-by: Marcel Holtmann commit 2af6b9d518ddfbc4d6990d5f9c9b1a05341c1cef Author: Marcel Holtmann Date: Thu Jan 15 21:58:38 2009 +0100 Bluetooth: Replace L2CAP link mode with security level Change the L2CAP internals to use the new security levels and remove the link mode details. Signed-off-by: Marcel Holtmann commit 8c1b235594fbab9a13240a1dac12ea9fd99b6440 Author: Marcel Holtmann Date: Thu Jan 15 21:58:04 2009 +0100 Bluetooth: Add enhanced security model for Simple Pairing The current security model is based around the flags AUTH, ENCRYPT and SECURE. Starting with support for the Bluetooth 2.1 specification this is no longer sufficient. The different security levels are now defined as SDP, LOW, MEDIUM and SECURE. Previously it was possible to set each security independently, but this actually doesn't make a lot of sense. For Bluetooth the encryption depends on a previous successful authentication. Also you can only update your existing link key if you successfully created at least one before. And of course the update of link keys without having proper encryption in place is a security issue. The new security levels from the Bluetooth 2.1 specification are now used internally. All old settings are mapped to the new values and this way it ensures that old applications still work. The only limitation is that it is no longer possible to set authentication without also enabling encryption. No application should have done this anyway since this is actually a security issue. Without encryption the integrity of the authentication can't be guaranteed. As default for a new L2CAP or RFCOMM connection, the LOW security level is used. The only exception here are the service discovery sessions on PSM 1 where SDP level is used. To have similar security strength as with a Bluetooth 2.0 and before combination key, the MEDIUM level should be used. This is according to the Bluetooth specification. The MEDIUM level will not require any kind of man-in-the-middle (MITM) protection. Only the HIGH security level will require this. Signed-off-by: Marcel Holtmann commit c89b6e6bda4c8021195778f47567d0cc9dbfe7ec Author: Marcel Holtmann Date: Thu Jan 15 21:57:03 2009 +0100 Bluetooth: Fix SCO state handling for incoming connections When the remote device supports only SCO connections, on receipt of the HCI_EV_CONN_COMPLETE event packet, the connect state is changed to BT_CONNECTED, but the socket state is not updated. Hence, the connect() call times out even though the SCO connection has been successfully established. Based on a report by Jaikumar Ganesh Signed-off-by: Marcel Holtmann commit 71aeeaa1fd88fe7446391e0553336f0e0c2cfe6a Author: Marcel Holtmann Date: Thu Jan 15 21:57:02 2009 +0100 Bluetooth: Reject incoming SCO connections without listeners All SCO and eSCO connection are auto-accepted no matter if there is a corresponding listening socket for them. This patch changes this and connection requests for SCO and eSCO without any socket are rejected. Signed-off-by: Marcel Holtmann commit f66dc81f44d918ee1aa1a9d821bb2f25c7592bc0 Author: Marcel Holtmann Date: Thu Jan 15 21:57:00 2009 +0100 Bluetooth: Add support for deferring L2CAP connection setup In order to decide if listening L2CAP sockets should be accept()ed the BD_ADDR of the remote device needs to be known. This patch adds a socket option which defines a timeout for deferring the actual connection setup. Signed-off-by: Marcel Holtmann commit bb23c0ab824653be4aa7dfca15b07b3059717004 Author: Marcel Holtmann Date: Thu Jan 15 21:56:48 2009 +0100 Bluetooth: Add support for deferring RFCOMM connection setup In order to decide if listening RFCOMM sockets should be accept()ed the BD_ADDR of the remote device needs to be known. This patch adds a socket option which defines a timeout for deferring the actual connection setup. The connection setup is done after reading from the socket for the first time. Until then writing to the socket returns ENOTCONN. Signed-off-by: Marcel Holtmann commit c4f912e155504e94dd4f3d63c378dab0ff03dbda Author: Marcel Holtmann Date: Thu Jan 15 21:52:16 2009 +0100 Bluetooth: Add global deferred socket parameter The L2CAP and RFCOMM applications require support for authorization and the ability of rejecting incoming connection requests. The socket interface is not really able to support this. This patch does the ground work for a socket option to defer connection setup. Setting this option allows calling of accept() and then the first read() will trigger the final connection setup. Calling close() would reject the connection. Signed-off-by: Marcel Holtmann commit d58daf42d29a3a4a4d4be46cf47ceee096789680 Author: Marcel Holtmann Date: Thu Jan 15 21:52:14 2009 +0100 Bluetooth: Preparation for usage of SOL_BLUETOOTH The socket option levels SOL_L2CAP, SOL_RFOMM and SOL_SCO are currently in use by various Bluetooth applications. Going forward the common option level SOL_BLUETOOTH should be used. This patch prepares the clean split of the old and new option levels while keeping everything backward compatibility. Signed-off-by: Marcel Holtmann commit 91aa35a5aa3540223066bf6b51c935418c63a35d Author: Victor Shcherbatyuk Date: Thu Jan 15 21:52:12 2009 +0100 Bluetooth: Fix issue with return value of rfcomm_sock_sendmsg() In case of connection failures the rfcomm_sock_sendmsg() should return an error and not a 0 value. Signed-off-by: Victor Shcherbatyuk Signed-off-by: Marcel Holtmann commit 454804ab0302b354e35d992d08e53fe03313baaf Author: Serge E. Hallyn Date: Thu Feb 26 18:28:04 2009 -0600 keys: make procfiles per-user-namespace Restrict the /proc/keys and /proc/key-users output to keys belonging to the same user namespace as the reading task. We may want to make this more complicated - so that any keys in a user-namespace which is belongs to the reading task are also shown. But let's see if anyone wants that first. Signed-off-by: Serge E. Hallyn Acked-by: David Howells Signed-off-by: James Morris commit 2ea190d0a006ce5218baa6e798512652446a605a Author: Serge E. Hallyn Date: Thu Feb 26 18:27:55 2009 -0600 keys: skip keys from another user namespace When listing keys, do not return keys belonging to the same uid in another user namespace. Otherwise uid 500 in another user namespace will return keyrings called uid.500 for another user namespace. Signed-off-by: Serge E. Hallyn Acked-by: David Howells Signed-off-by: James Morris commit 8ff3bc3138a400294ee9e126ac75fc9a9fae4e0b Author: Serge E. Hallyn Date: Thu Feb 26 18:27:47 2009 -0600 keys: consider user namespace in key_permission If a key is owned by another user namespace, then treat the key as though it is owned by both another uid and gid. Signed-off-by: Serge E. Hallyn Acked-by: David Howells Signed-off-by: James Morris commit 1d1e97562e5e2ac60fb7b25437ba619f95f67fab Author: Serge E. Hallyn Date: Thu Feb 26 18:27:38 2009 -0600 keys: distinguish per-uid keys in different namespaces per-uid keys were looked by uid only. Use the user namespace to distinguish the same uid in different namespaces. This does not address key_permission. So a task can for instance try to join a keyring owned by the same uid in another namespace. That will be handled by a separate patch. Signed-off-by: Serge E. Hallyn Acked-by: David Howells Signed-off-by: James Morris commit 8325d9c09dedf45476f4d6261d1b6a72e4a7453f Author: Peter Zijlstra Date: Thu Feb 26 21:40:16 2009 +0100 sched_clock: cleanups - remove superfluous checks in __update_sched_clock() - skip sched_clock_tick() for sched_clock_stable - reinstate the simple !HAVE_UNSTABLE_SCHED_CLOCK code to please the bloatwatch Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 83ce400928680a6c8123d492684b27857f5a2d95 Author: Ingo Molnar Date: Thu Feb 26 20:16:58 2009 +0100 x86: set X86_FEATURE_TSC_RELIABLE If the TSC is constant and non-stop, also set it reliable. (We will turn this off in DMI quirks for multi-chassis systems) The performance number on a 16-way Nehalem system running 32 tasks that context-switch between each other is significant: sched_clock_stable=0 sched_clock_stable=1 .................... .................... 22.456925 million/sec 24.306972 million/sec [+8.2%] lmbench's "lat_ctx -s 0 2" goes from 0.63 microseconds to 0.59 microseconds - a 6.7% increase in context-switching performance. Perfstat of 1 million pipe context switches between two tasks: Performance counter stats for './pipe-test-1m': [before] [after] ............ ............ 37621.421089 36436.848378 task clock ticks (msecs) 0 0 CPU migrations (events) 2000274 2000189 context switches (events) 194 193 pagefaults (events) 8433799643 8171016416 CPU cycles (events) -3.21% 8370133368 8180999694 instructions (events) -2.31% 4158565 3895941 cache references (events) -6.74% 44312 46264 cache misses (events) 2349.287976 2279.362465 wall-time (msecs) -3.06% The speedup comes straight from the reduction in the instruction count. sched_clock_cpu() got simpler and the whole workload thus executes faster. Signed-off-by: Ingo Molnar commit b342501cd31e5546d0c9ca8ceff5ded1832f9e5b Author: Ingo Molnar Date: Thu Feb 26 20:20:29 2009 +0100 sched: allow architectures to specify sched_clock_stable Allow CONFIG_HAVE_UNSTABLE_SCHED_CLOCK architectures to still specify that their sched_clock() implementation is reliable. This will be used by x86 to switch on a faster sched_clock_cpu() implementation on certain CPU types. Signed-off-by: Ingo Molnar commit a2a5ac8650b570bea3cb3614f77739dcd07d6632 Author: John Stultz Date: Thu Feb 26 09:46:14 2009 -0800 time: ntp: fix bug in ntp_update_offset() & do_adjtimex(), fix The time_status conditional was accidentally placed right after we clear the checked time_status bits, which causes us to take the conditional every time through. This fixes it by moving the conditional to before we clear the time_status bits. Signed-off-by: John Stultz Cc: Clark Williams Signed-off-by: Ingo Molnar commit 1607b8ea0a4cc20752978fadb027daafc8a2d93c Author: Takashi Iwai Date: Thu Feb 26 16:50:43 2009 +0100 ALSA: hda - Add model=auto for STAC/IDT codecs Added the model=auto to STAC/IDT codecs to use the BIOS default setup explicitly. It can be used to disable the device-specific model quirk in the driver. Signed-off-by: Takashi Iwai commit c40c6f85a7594ad842233885386a0ca4cd40eafe Author: Li Zefan Date: Thu Feb 26 15:40:15 2009 +0800 cpuacct: add a branch prediction cpuacct_charge() is in fast-path, and checking of !cpuacct_susys.active always returns false after cpuacct has been initialized at system boot. Signed-off-by: Li Zefan Cc: Peter Zijlstra Cc: Paul Menage Cc: Balbir Singh Signed-off-by: Ingo Molnar commit 4434e5156409eb3ec98f5ad7f0a0c07ebafe970d Merge: 2b8f836... 694593e... Author: Ingo Molnar Date: Thu Feb 26 13:22:13 2009 +0100 Merge branches 'sched/cleanups', 'sched/urgent' and 'linus' into sched/core commit 23f0c048ba59ad5c2f3fd85ed98360b631dbf6f8 Author: Takashi Iwai Date: Thu Feb 26 13:03:58 2009 +0100 ALSA: hda - Clean up the input pin setup in automatic mode Clean up the input-pin setup in automatic mode in patch_realtek.c. Signed-off-by: Takashi Iwai commit 6d5643455ced9ee45a4aa7403fe8056d826bde85 Author: Takashi Iwai Date: Thu Feb 26 11:29:58 2009 +0100 ASoC: wm8753 - Fix build error sound/soc/codecs/wm8753.c: In function 'wm8753_probe': sound/soc/codecs/wm8753.c:1577: error: implicit declaration of function 'wm8753_add_controls' Acked-by: Mark Brown Signed-off-by: Takashi Iwai commit 5d9b6c07831456b7a7d90eac31c853d60eaf8ab6 Author: Hannes Eder Date: Wed Feb 25 22:28:45 2009 +0100 ALSA: sound/pci/hda: fix sparse warning: different signedness Fix this sparse warning: sound/pci/hda/hda_codec.c:1544:19: warning: incorrect type in assignment (different signedness) sound/pci/hda/hda_codec.c:1544:19: expected unsigned long *vals sound/pci/hda/hda_codec.c:1544:19: got long * Signed-off-by: Hannes Eder Signed-off-by: Takashi Iwai commit 730d45f9130f81fd49009301e9dfbd19fe2b3e1f Author: Hannes Eder Date: Wed Feb 25 22:28:59 2009 +0100 ALSA: sound/pci/emu10k1: fix sparse warning: different signedness Fix this sparse warnings: sound/pci/emu10k1/emu10k1_main.c:723:66: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:724:68: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:748:74: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:751:66: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:759:73: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:760:73: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:837:50: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:845:50: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:881:50: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:889:57: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:890:57: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:895:60: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:897:60: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:899:60: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:910:56: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:914:57: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:918:56: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:922:57: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:924:58: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:936:60: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:1073:60: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:1088:60: warning: incorrect type in argument 3 (different signedness) sound/pci/emu10k1/emu10k1_main.c:1093:58: warning: incorrect type in argument 3 (different signedness) Signed-off-by: Hannes Eder Signed-off-by: Takashi Iwai commit d73d341d3995ae3c63a4b4543b7c308ebd1e58ea Author: Hannes Eder Date: Wed Feb 25 22:29:15 2009 +0100 ALSA: sound/drivers/vx: fix sparse warning: different signedness Fix this sparse warning: sound/drivers/vx/vx_uer.c:301:42: warning: incorrect type in argument 2 (different signedness) Signed-off-by: Hannes Eder Signed-off-by: Takashi Iwai commit 3a755ec2e8af0024a06a5adbcc81c012eae61782 Author: Hannes Eder Date: Wed Feb 25 22:28:26 2009 +0100 ALSA: sound/usb/usx2y: fix sparse warning: do-while statement is not a compound ... Fix this sparse warning: sound/usb/usx2y/usbusx2y.c:231:33: warning: do-while statement is not a compound statement Signed-off-by: Hannes Eder Signed-off-by: Takashi Iwai commit 619389882ba37121d0f2f7b08e4944e47b379118 Author: Hannes Eder Date: Wed Feb 25 22:26:48 2009 +0100 ALSA: sound/usb/usx2y: fix sparse warning: Should it be static? Impact: Move declaration to header file. Fix this sparse warning: sound/usb/usx2y/usx2yhwdeppcm.c:739:5: warning: symbol 'usX2Y_hwdep_pcm_new' was not declared. Should it be static? Signed-off-by: Hannes Eder Signed-off-by: Takashi Iwai commit e5bf48437370f3fc603e2dce12e8d3fb1a6a2457 Author: Hannes Eder Date: Wed Feb 25 22:29:47 2009 +0100 sound/oss: fix sparse warning: symbol shadows an earlier one Impact: Move variable to a more inner scope. Fix this sparse warning: sound/oss/sequencer.c:235:29: warning: symbol 'err' shadows an earlier one sound/oss/sequencer.c:215:13: originally declared here Signed-off-by: Hannes Eder Signed-off-by: Takashi Iwai commit 5d44aa4c7322e0cda6d71cc3f0dffaceea0daae5 Author: Hannes Eder Date: Wed Feb 25 22:29:29 2009 +0100 sound/oss: fix sparse warnings: different signedness Impact: Change signature of 'set_volume_stereo' and 'set_volume_mono'. Fix this sparse warnings: sound/oss/pss.c:545:42: warning: incorrect type in argument 2 (different signedness) sound/oss/pss.c:546:42: warning: incorrect type in argument 3 (different signedness) sound/oss/pss.c:554:59: warning: incorrect type in argument 2 (different signedness) sound/oss/pss.c:560:59: warning: incorrect type in argument 2 (different signedness) sound/oss/pss.c:566:59: warning: incorrect type in argument 2 (different signedness) Signed-off-by: Hannes Eder Signed-off-by: Takashi Iwai commit 930738de602d2ceb0d1c1b368fe2a8d2a974ab72 Author: Clemens Ladisch Date: Thu Feb 26 09:27:20 2009 +0100 sound: virtuoso: add Xonar Essence STX support Add support for the Asus Xonar Essence STX sound card. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit f872a9194cb006994d47a58efc875218594e6072 Author: Takashi Iwai Date: Thu Feb 26 00:57:01 2009 +0100 ALSA: hda - Clean up / fix quirk for Sony laptops with ALC262 Clean up / fix quirk entries for Sony laptops with ALC262 codec using NSD_PCI_QUIRK_MASK(). This also fixes the kernel bug #12780 http://bugme.linux-foundation.org/show_bug.cgi?id=12780 Signed-off-by: Takashi Iwai commit 9206dff15705267c19f8fed391c4fb95975540a3 Author: Roland Dreier Date: Wed Feb 25 13:27:46 2009 -0800 IB: Remove sysfs files before unregistering device Move the ib_device_unregister_sysfs() call from ib_dealloc_device() to ib_unregister_device(). The old code allows device unregister to proceed even if some sysfs files are open, which leaves a window where userspace can open a file before a device is removed but then end up reading the file after the device is removed, which leads to various kernel crashes either because the device data structure is freed or because the low-level driver code is gone after module removal. By not returning from ib_unregister_device() until after all sysfs entries are removed, we make sure that data structures and/or module code is not freed until after all sysfs access is done. Reported-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 39854fe8c165872d743f6a0c4860ca2de8e45ac9 Author: Ingo Molnar Date: Sun Feb 22 16:06:58 2009 +0100 time: ntp: clean up second_overflow() Impact: cleanup, no functionality changed The 'time_adj' local variable is named in a very confusing way because it almost shadows the 'time_adjust' global variable - which is used in this same function. Rename it to 'delta' - to make them stand apart more clearly. kernel/time/ntp.o: text data bss dec hex filename 2545 114 144 2803 af3 ntp.o.before 2545 114 144 2803 af3 ntp.o.after md5: 1bf0b3be564512279ba7cee299d1d2be ntp.o.before.asm 1bf0b3be564512279ba7cee299d1d2be ntp.o.after.asm Signed-off-by: Ingo Molnar commit 069569e025706f27f939785f86a94d5d8ce55dce Author: Ingo Molnar Date: Sun Feb 22 16:03:37 2009 +0100 time: ntp: simplify ntp_tick_adj calculations Impact: micro-optimization Convert the (internal) ntp_tick_adj value we store from unscaled units to scaled units. This is a constant that we never modify, so scaling it up once during bootup is enough - we dont have to do it for every adjustment step. Signed-off-by: Ingo Molnar commit 2b9d1496e7835a603c340e8f0dd81f4b74d5f248 Author: Ingo Molnar Date: Sun Feb 22 15:48:43 2009 +0100 time: ntp: make 64-bit constants more robust Impact: cleanup, no functionality changed - make PPM_SCALE an explicit s64 constant, to remove (s64) casts from usage sites. kernel/time/ntp.o: text data bss dec hex filename 2536 114 136 2786 ae2 ntp.o.before 2536 114 136 2786 ae2 ntp.o.after md5: 40a7728d1188aa18e83e21a81fa7b150 ntp.o.before.asm 40a7728d1188aa18e83e21a81fa7b150 ntp.o.after.asm Signed-off-by: Ingo Molnar commit e96291653b2e4df02f160b574070f6e632868e5e Author: Ingo Molnar Date: Sun Feb 22 15:35:18 2009 +0100 time: ntp: refactor do_adjtimex() some more Impact: cleanup, no functionality changed Further simplify do_adjtimex(): - introduce the ntp_start_leap_timer() helper function - eliminate the goto adj_done complication Signed-off-by: Ingo Molnar commit 80f2257116474ceed5fccab510b4f7245c0f49d7 Author: Ingo Molnar Date: Sun Feb 22 15:15:32 2009 +0100 time: ntp: refactor do_adjtimex() Impact: cleanup, no functionality changed do_adjtimex() is currently a monster function with a maze of branches. Refactor the txc->modes setting aspects of it into two new helper functions: process_adj_status() process_adjtimex_modes() kernel/time/ntp.o: text data bss dec hex filename 2512 114 136 2762 aca ntp.o.before 2512 114 136 2762 aca ntp.o.after Signed-off-by: Ingo Molnar commit 10dd31a7a17254d6ba793305fc590455393e610e Author: Ingo Molnar Date: Sun Feb 22 13:38:40 2009 +0100 time: ntp: fix bug in ntp_update_offset() & do_adjtimex() Impact: change (fix) the way the NTP PLL seconds offset is initialized/tracked Fix a bug and do a micro-optimization: When PLL is enabled we do not reset time_reftime. If the PLL was off for a long time (for example after bootup), this is arguably the wrong thing to do. We already had a hack for the common boot-time case in ntp_update_offset(), in form of: if (unlikely(time_status & STA_FREQHOLD || time_reftime == 0)) secs = 0; But the update delta should be reset later on too - not just when the PLL is enabled for the first time after bootup. So do it on !STA_PLL -> STA_PLL transitions. This changes behavior, as previously if ntpd was disabled for a long time and we restarted it, we'd run from that last update, with a very large delta. Signed-off-by: Ingo Molnar commit c7986acba211e8285e14c9603fb89e6f4ea0b9f8 Author: Ingo Molnar Date: Sun Feb 22 13:29:09 2009 +0100 time: ntp: micro-optimize ntp_update_offset() Impact: cleanup, no functionality changed The time_reftime update in ntp_update_offset() to xtime.tv_sec is a convoluted way of saying that we want to freeze the frequency and want the 'secs' delta to be 0. Also make this branch unlikely. This shaves off 8 bytes from the code size: text data bss dec hex filename 2504 114 136 2754 ac2 ntp.o.before 2496 114 136 2746 aba ntp.o.after Signed-off-by: Ingo Molnar commit 478b7aab1682246a3d1e76e27a0aecb2f0013379 Author: Ingo Molnar Date: Sun Feb 22 13:22:23 2009 +0100 time: ntp: simplify ntp_update_offset_fll() Impact: cleanup, no functionality changed Change ntp_update_offset_fll() to delta logic instead of absolute value logic. This eliminates 'freq_adj' from the function. Signed-off-by: Ingo Molnar commit f939890b6687e05c42361655fb6610fa08f5a601 Author: Ingo Molnar Date: Sun Feb 22 12:57:49 2009 +0100 time: ntp: refactor and clean up ntp_update_offset() Impact: cleanup, no functionality changed - introduce the ntp_update_offset_fll() helper - clean up the flow and variable naming kernel/time/ntp.o: text data bss dec hex filename 2504 114 136 2754 ac2 ntp.o.before 2504 114 136 2754 ac2 ntp.o.after md5: 01f7b8e1a5472a3056f9e4ae84d46315 ntp.o.before.asm 01f7b8e1a5472a3056f9e4ae84d46315 ntp.o.after.asm Signed-off-by: Ingo Molnar commit bc26c31d446bc9c24cd6f7003777a05fe268ae48 Author: Ingo Molnar Date: Sun Feb 22 12:17:36 2009 +0100 time: ntp: refactor up ntp_update_frequency() Impact: cleanup, no functionality changed Change ntp_update_frequency() from a hard to follow code flow that uses global variables as temporaries, to a clean input+output flow. Signed-off-by: Ingo Molnar commit 9ce616aaefcb9309cb9c49a36310ebda6061b98b Author: Ingo Molnar Date: Sun Feb 22 12:42:59 2009 +0100 time: ntp: clean up ntp_update_frequency() Impact: cleanup, no functionality changed Prepare a refactoring of ntp_update_frequency(). kernel/time/ntp.o: text data bss dec hex filename 2504 114 136 2754 ac2 ntp.o.before 2504 114 136 2754 ac2 ntp.o.after md5: 41f3009debc9b397d7394dd77d912f0a ntp.o.before.asm 41f3009debc9b397d7394dd77d912f0a ntp.o.after.asm Signed-off-by: Ingo Molnar commit bbd1267690bb6940d0722dd33e929442c0409c01 Author: Ingo Molnar Date: Sun Feb 22 12:11:11 2009 +0100 time: ntp: simplify the MAX_TICKADJ_SCALED definition Impact: cleanup, no functionality changed There's an ugly u64 typecase in the MAX_TICKADJ_SCALED definition, this can be eliminated by making the MAX_TICKADJ constant's type 64-bit (signed). kernel/time/ntp.o: text data bss dec hex filename 2504 114 136 2754 ac2 ntp.o.before 2504 114 136 2754 ac2 ntp.o.after md5: 41f3009debc9b397d7394dd77d912f0a ntp.o.before.asm 41f3009debc9b397d7394dd77d912f0a ntp.o.after.asm Signed-off-by: Ingo Molnar commit 3c972c2444dcb7088999c32b8c5a7ab3b8a6c0b6 Author: Ingo Molnar Date: Sun Feb 22 12:06:57 2009 +0100 time: ntp: simplify the second_overflow() code flow Impact: cleanup, no functionality changed Instead of a hierarchy of conditions, transform them to clean gradual conditions and return's. This makes the flow easier to read and makes the purpose of the function easier to understand. kernel/time/ntp.o: text data bss dec hex filename 2552 170 168 2890 b4a ntp.o.before 2552 170 168 2890 b4a ntp.o.after md5: eae1275df0b7d6290c13f6f6f8f05c8c ntp.o.before.asm eae1275df0b7d6290c13f6f6f8f05c8c ntp.o.after.asm Signed-off-by: Ingo Molnar commit 53bbfa9e9437e70b322368e82c723112d690e304 Author: Ingo Molnar Date: Wed Feb 20 07:58:42 2008 +0100 time: ntp: clean up kernel/time/ntp.c Impact: cleanup, no functionality changed Make this file a bit more readable by applying a consistent coding style. No code changed: kernel/time/ntp.o: text data bss dec hex filename 2552 170 168 2890 b4a ntp.o.before 2552 170 168 2890 b4a ntp.o.after md5: eae1275df0b7d6290c13f6f6f8f05c8c ntp.o.before.asm eae1275df0b7d6290c13f6f6f8f05c8c ntp.o.after.asm Signed-off-by: Ingo Molnar commit 873dc78a8676b7ba6260b1d74c50d8ea5025ecbe Author: Takashi Iwai Date: Wed Feb 25 18:12:13 2009 +0100 ALSA: hda - Clean up / fix quirks for HP laptops with AD1984A Use SND_PCI_QUIRK_MASK() to clean up / support better HP laptops with AD1984A codec. Signed-off-by: Takashi Iwai commit f11c179eea77b8afc2fb7cb4b9a8815b85e3c16f Merge: 4545a3f... 0c9a3aa... Author: David S. Miller Date: Wed Feb 25 00:02:05 2009 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/wireless/orinoco/orinoco.c commit 4545a3f2765bb7d2d93468a8ffa578ac87a2c5c7 Author: Ron Mercer Date: Mon Feb 23 10:42:17 2009 +0000 qlge: Use one path to (re)fill rx buffers. Currently there are two paths for filling rx buffer queues. One is used during initialization and the other during runtime. This patch removes ql_alloc_sbq_buffers() and ql_alloc_lbq_buffers() and replaces them with a call to the runtime functions ql_update_lbq() and ql_update_sbq(). Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 49f2186d36a88ae6f7dd8261aff2cf80409af28d Author: Ron Mercer Date: Mon Feb 23 10:42:16 2009 +0000 qlge: Optimize rx buffer refill process. RX Buffers are refilled in chunks of 16 at a time before notifying the hardware with a register write. This can cause several writes to take place in a given napi poll call. This change causes the write to take place only once at the end of the call. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 8587ea35ca6b4add4353b8a18b67d358aed0389e Author: Ron Mercer Date: Mon Feb 23 10:42:15 2009 +0000 qlge: Change frame route hw semaphore granularity. Instead of taking/giving the hw semaphore repeatedly when iterating over several frame to queue route settings, we have the caller hold it until all are done. This reduces PCI bus chatter and possible waits. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit cc288f54bbace136c08742da84712add54e4acfa Author: Ron Mercer Date: Mon Feb 23 10:42:14 2009 +0000 qlge: Increase MAC addr hw sem granularity. Instead of taking/giving the semaphore repeatedly when iterating over several adderesses, we have the caller hold it until all are done. This reduces PCI bus chatter and possible waits. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit bb58b5b67c08b5fde08090917a040a07ac9d43de Author: Ron Mercer Date: Mon Feb 23 10:42:13 2009 +0000 qlge: Clean up mac address and frame route settings. Setting MAC addresses and routing frames to various queues will need to be done in response to firmware events as well as during initialization. This change encapsulates the facilities into a single call that can later me made from other places. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit bb80087a9440178bcd8363dc27a486f34786fec3 Author: Wei Yongjun Date: Tue Feb 24 23:37:19 2009 -0800 sit: used time_before for comparing jiffies The functions time_before is more robust for comparing jiffies against other values. Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit 26d94b46d09c97adb3c78c744c195e74ede699b2 Author: Wei Yongjun Date: Tue Feb 24 23:36:47 2009 -0800 ipip: used time_before for comparing jiffies The functions time_before is more robust for comparing jiffies against other values. Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit da6185d8743704bf7647c0aedaf8c7879d8f3cab Author: Wei Yongjun Date: Tue Feb 24 23:34:48 2009 -0800 gre: used time_before for comparing jiffies The functions time_before is more robust for comparing jiffies against other values. Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit 800d55f146098c5ffd1914d7eef2fd4a6d558b1d Author: Wei Yongjun Date: Mon Feb 23 21:45:33 2009 +0000 ipv6: Remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). The semantic match that finds the problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // @@ expression E; @@ - if (E) - kfree_skb(E); + kfree_skb(E); // Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit 1ce85fe402137824246bad03ff85f3913d565c17 Author: Pablo Neira Ayuso Date: Tue Feb 24 23:18:28 2009 -0800 netlink: change nlmsg_notify() return value logic This patch changes the return value of nlmsg_notify() as follows: If NETLINK_BROADCAST_ERROR is set by any of the listeners and an error in the delivery happened, return the broadcast error; else if there are no listeners apart from the socket that requested a change with the echo flag, return the result of the unicast notification. Thus, with this patch, the unicast notification is handled in the same way of a broadcast listener that has set the NETLINK_BROADCAST_ERROR socket flag. This patch is useful in case that the caller of nlmsg_notify() wants to know the result of the delivery of a netlink notification (including the broadcast delivery) and take any action in case that the delivery failed. For example, ctnetlink can drop packets if the event delivery failed to provide reliable logging and state-synchronization at the cost of dropping packets. This patch also modifies the rtnetlink code to ignore the return value of rtnl_notify() in all callers. The function rtnl_notify() (before this patch) returned the error of the unicast notification which makes rtnl_set_sk_err() reports errors to all listeners. This is not of any help since the origin of the change (the socket that requested the echoing) notices the ENOBUFS error if the notification fails and should resync itself. Signed-off-by: Pablo Neira Ayuso Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 4fb0a54a55d34c28dc53c39567ce171166572699 Author: Lennert Buytenhek Date: Tue Feb 24 15:42:05 2009 +0000 mv643xx_eth: set sane default receive coalescing timeout A receive coalescing timeout of 250 usec appears to strike a good balance between allowing enough received frames to be aggregated for LRO to do its job and not allowing the connection to stall due to delaying ACKs to the remote end for too long. Signed-off-by: Lennert Buytenhek Signed-off-by: David S. Miller commit a5fe36165339c57b341250e8252d833e91317c70 Author: Lennert Buytenhek Date: Tue Feb 24 15:41:47 2009 +0000 mv643xx_eth: move a couple of init actions from ->open() to port probe Move the netif_carrier_off() call in ->open() to port probe, so that ethtool doesn't report the link as being up before we have up'd the interface. Move initialisation of the rx/tx coalescing timers from ->open() to port probe, so that we don't reset the coalescing timers every time the interface is up'd. Signed-off-by: Lennert Buytenhek Signed-off-by: David S. Miller commit ea8a8642636b905c79aed104a0755b3fa2e65e8e Author: Lennert Buytenhek Date: Tue Feb 24 15:41:40 2009 +0000 mv643xx_eth: convert to net_device_ops Signed-off-by: Lennert Buytenhek Signed-off-by: David S. Miller commit ab307a3983a7fa28f260f3123293c7b91d5d629e Author: Lennert Buytenhek Date: Tue Feb 24 15:41:32 2009 +0000 mv643xx_eth: make LRO unconditional Signed-off-by: Lennert Buytenhek Signed-off-by: David S. Miller commit c0bdb232b23b51c23e551041510ad6bea5ce5a92 Author: David Rientjes Date: Wed Feb 25 09:16:35 2009 +0200 slub: rename calculate_min_partial() to set_min_partial() As suggested by Christoph Lameter, rename calculate_min_partial() to set_min_partial() as the function doesn't really do any calculations. Cc: Christoph Lameter Signed-off-by: David Rientjes Signed-off-by: Pekka Enberg commit eb3092cee79e4efa5d3e9c81c7e6ca90318cebb8 Author: Matthew Garrett Date: Sat Feb 21 01:58:47 2009 +0000 [CPUFREQ] Make cpufreq-nforce2 less obnoxious Not owning an nforce2 is a sign of good taste, not an error. Signed-off-by: Matthew Garrett Signed-off-by: Dave Jones commit 199785eac892a1fa1b71cc22bec58e8b156d9311 Author: Matthias-Christian Ott Date: Fri Feb 20 20:52:17 2009 -0500 [CPUFREQ] p4-clockmod reports wrong frequency. http://bugzilla.kernel.org/show_bug.cgi?id=10968 [ Updated for current tree, and fixed compile failure when p4-clockmod was built modular -- davej] From: Matthias-Christian Ott Signed-off-by: Dominik Brodowski Signed-off-by: Dave Jones commit 0cb8bc256093e716d2a0a4a721f36c625a3f7634 Author: Dave Jones Date: Wed Feb 18 14:11:00 2009 -0500 [CPUFREQ] powernow-k8: Use a common exit path. a0abd520fd69295f4a3735e29a9448a32e101d47 introduced a slew of extra kfree/return -ENODEV pairs. This replaces them all with gotos. Signed-off-by: Dave Jones commit de3ed81d746d7cfc22a0c645244ed9fa71e4a833 Author: Matthew Garrett Date: Wed Feb 18 18:28:22 2009 +0000 [CPUFREQ] Change link order of x86 cpufreq modules Change the link order of the cpufreq modules to ensure that they're probed in the preferred order when statically linked in. Signed-off-by: Matthew Garrett Signed-off-by: Dave Jones commit a75603a084f1dd9a9558c8af95fc2acfc54f1021 Author: Alexander Clouter Date: Fri Feb 13 19:03:26 2009 +0000 [CPUFREQ] conservative: remove 10x from def_sampling_rate AMD users get particular hit by this issue (bug 8081) as it caps at typically 90 seconds as the minimum period for a frequency change. Harsh eh? Years ago I borked this buy puting the 10x in the wrong place...I fix that by removing it altogether. Signed-off-by: Alexander Clouter Signed-off-by: Dave Jones commit 8e677ce83bf41ba9c74e5b6d9ee60b07d4e5ed93 Author: Alexander Clouter Date: Fri Feb 13 19:02:34 2009 +0000 [CPUFREQ] conservative: fixup governor to function more like ondemand logic As conservative is based off ondemand the codebases occasionally need to be resync'd. This patch, although ugly, does this. Signed-off-by: Alexander Clouter Signed-off-by: Dave Jones commit f407a08bb7eff5ddbe0d9173d8717794a910771f Author: Alexander Clouter Date: Fri Feb 13 19:01:51 2009 +0000 [CPUFREQ] conservative: fix dbs_cpufreq_notifier so freq is not locked When someone added the dbs_cpufreq_notifier section to the governor the code ended up causing the frequency to only fall. This is because requested_freq is tinkered with and that should only modified if it has an invlaid value due to changes in the available frequency ranges This should fix #10055. Signed-off-by: Alexander Clouter Signed-off-by: Dave Jones commit 11a80a9c7668c40c40a03ae15bd2c6b215058b2e Author: Alexander Clouter Date: Fri Feb 13 19:01:01 2009 +0000 [CPUFREQ] conservative: amend author's email address Amend author's email address. Signed-off-by: Alexander Clouter Signed-off-by: Dave Jones commit 91420220d278584693d11a800b78fdc20e8fe10e Author: Dave Jones Date: Wed Feb 4 15:28:54 2009 -0500 [CPUFREQ] Use swap() in longhaul.c Remove hand-coded implementation of swap() Signed-off-by: Dave Jones commit 3a58df35a64a1e0ac32c30ea629a513dec2fe711 Author: Dave Jones Date: Sat Jan 17 22:36:14 2009 -0500 [CPUFREQ] checkpatch cleanups for acpi-cpufreq Signed-off-by: Dave Jones commit 79cc56af9fdbeaa91f50289b932d0959b41f9467 Author: Thomas Renninger Date: Wed Feb 4 11:56:11 2009 +0100 [CPUFREQ] powernow-k8: Only print error message once, not per core. This is the typical message you get if you plug in a CPU which is newer than your BIOS. It's annoying seeing this message for each core. Signed-off-by: Thomas Renninger Signed-off-by: Dave Jones commit 112124ab0a9f507a0d7fdbb1e1ed2b9a24f8c4ea Author: Thomas Renninger Date: Wed Feb 4 11:55:12 2009 +0100 [CPUFREQ] ondemand/conservative: sanitize sampling_rate restrictions Limit sampling rate to transition_latency * 100 or kernel limits. If sampling_rate is tried to be set too low, set the lowest allowed value. Signed-off-by: Thomas Renninger Signed-off-by: Dave Jones commit 9411b4ef7fcb534fe1582fe02738254e398dd931 Author: Thomas Renninger Date: Wed Feb 4 11:54:04 2009 +0100 [CPUFREQ] ondemand/conservative: deprecate sampling_rate{min,max} The same info can be obtained via the transition_latency sysfs file Signed-off-by: Thomas Renninger Signed-off-by: Dave Jones commit 57f4fa699195b761cbea90db5e38b4bc15610c7c Author: Thomas Renninger Date: Wed Feb 4 01:17:45 2009 +0100 [CPUFREQ] powernow-k8: Always compile powernow-k8 driver with ACPI support powernow-k8 driver should always try to get cpufreq info from ACPI. Otherwise it will not be able to detect the transition latency correctly which results in ondemand governor taking a wrong sampling rate which will then result in sever performance loss. Let the user not shoot himself in the foot and always compile in ACPI support for powernow-k8. This also fixes a wrong message if ACPI_PROCESSOR is compiled as a module and #ifndef CONFIG_ACPI_PROCESSOR path is chosen. Signed-off-by: Thomas Renninger Signed-off-by: Dave Jones commit ed12978453a3845c947695e7ad32bb3ede444813 Author: Thomas Renninger Date: Wed Feb 4 01:17:41 2009 +0100 [CPUFREQ] Introduce /sys/devices/system/cpu/cpu*/cpufreq/cpuinfo_transition_latency It's not only useful for the ondemand and conservative governors, but also for userspace daemons to know about the HW transition latency of the CPU. It is especially useful for userspace to know about this value when the ondemand or conservative governors are run. The sampling rate control value depends on it and for userspace being able to set sane tuning values there it has to know about the transition latency. Signed-off-by: Thomas Renninger Signed-off-by: Dave Jones commit 0e64a0c982c06a6b8f5e2a7f29eb108fdf257b2f Author: Dave Jones Date: Wed Feb 4 14:37:50 2009 -0500 [CPUFREQ] checkpatch cleanups for powernow-k8 This driver has so many long function names, and deep nested if's The remaining warnings will need some code restructuring to clean up. Signed-off-by: Dave Jones commit 2b03f891ad3804dd3fa4dadfd33e5dcb200389c5 Author: Dave Jones Date: Sun Jan 18 01:43:44 2009 -0500 [CPUFREQ] checkpatch cleanups for ondemand governor. Signed-off-by: Dave Jones commit b9e7638a301b1245d4675087a05fa90fb4fa1845 Author: Dave Jones Date: Sun Jan 18 00:32:26 2009 -0500 [CPUFREQ] checkpatch cleanups for powernow-k7 The asm/timer.h warning can be ignored, it's needed for recalibrate_cpu_khz() Signed-off-by: Dave Jones commit bbfebd66554b934b270c4c49442f4fe5e62df0e5 Author: Dave Jones Date: Sat Jan 17 23:55:22 2009 -0500 [CPUFREQ] checkpatch cleanups for speedstep related drivers. Signed-off-by: Dave Jones commit 97acec55de8b168548665f267c9dd45ed863b179 Author: Dave Jones Date: Sun Jan 18 01:56:41 2009 -0500 [CPUFREQ] checkpatch cleanups for freq_table Signed-off-by: Dave Jones commit 1bceb8d13907d681b7eac9ae0ae14f2eecae9801 Author: Dave Jones Date: Sun Jan 18 01:51:46 2009 -0500 [CPUFREQ] checkpatch cleanups for userspace governor Signed-off-by: Dave Jones commit 0a829c5afde8e9e9c33a3a5c231b04dcf253337d Author: Dave Jones Date: Sun Jan 18 01:49:04 2009 -0500 [CPUFREQ] checkpatch cleanups for cpufreq_stats Signed-off-by: Dave Jones commit 9acef4875695a7717734f2578666a64822ea6495 Author: Dave Jones Date: Sun Jan 18 01:39:51 2009 -0500 [CPUFREQ] checkpatch cleanups for conservative governor Signed-off-by: Dave Jones commit 29464f281389fd7e9adf969de7bbeb20b8596f82 Author: Dave Jones Date: Sun Jan 18 01:37:11 2009 -0500 [CPUFREQ] checkpatch cleanups for cpufreq core Signed-off-by: Dave Jones commit 6072ace436800a011c3cb9a75ee49276bd90445a Author: Dave Jones Date: Sun Jan 18 01:27:35 2009 -0500 [CPUFREQ] checkpatch cleanups for sc520 Signed-off-by: Dave Jones commit 14a6650f13b958aabc30ddd575b0902384b22457 Author: Dave Jones Date: Sun Jan 18 00:00:04 2009 -0500 [CPUFREQ] checkpatch cleanups for powernow-k6 Signed-off-by: Dave Jones commit 48ee923a666d4cc54e48d55fc573c57492501122 Author: Dave Jones Date: Sat Jan 17 23:32:50 2009 -0500 [CPUFREQ] checkpatch cleanups for longrun Signed-off-by: Dave Jones commit ac617bd0f7b959dc6708ad2f0d6b9dcf4382f1ed Author: Dave Jones Date: Sat Jan 17 23:29:53 2009 -0500 [CPUFREQ] checkpatch cleanups for longhaul Signed-off-by: Dave Jones commit 00f6a235bf241e62dfadf32b4322309e65c7b177 Author: Dave Jones Date: Sat Jan 17 23:06:57 2009 -0500 [CPUFREQ] checkpatch cleanups for gx-suspmod Signed-off-by: Dave Jones commit c9b8c871525aeda153494996d84a832270205d81 Author: Dave Jones Date: Sat Jan 17 22:54:47 2009 -0500 [CPUFREQ] checkpatch cleanups for e_powersaver Signed-off-by: Dave Jones commit 04cd1a99dc22bcaa1eccbe8f8386df8c1295e979 Author: Dave Jones Date: Sat Jan 17 22:50:33 2009 -0500 [CPUFREQ] checkpatch cleanups for elanfreq The remaining warning about the simple_strtoul conversion to strict_strtoul seems kind of pointless to me. Signed-off-by: Dave Jones commit 20174b65d9fdc8dddef3d2ab9647e01fdab13064 Author: Dave Jones Date: Sat Jan 17 22:42:19 2009 -0500 [CPUFREQ] nforce2: Use driver prefix, not cpufreq prefix. Signed-off-by: Dave Jones commit b5c916666240032b29f73a1ca52c3e0fac37335c Author: Dave Jones Date: Sat Jan 17 22:39:47 2009 -0500 [CPUFREQ] checkpatch cleanups for cpufreq-nforce2 Signed-off-by: Dave Jones commit fff78ad5cee1d6f695103ec590cbd2a9f3c39e8c Author: Dave Jones Date: Sat Jan 17 22:28:42 2009 -0500 [CPUFREQ] Stupidly trivial CodingStyle fix GNU indent complains about this being ambiguous, because it's dumb. One of my automated tests relies on the output of indent, so this shuts it up. Signed-off-by: Dave Jones commit 97daee83b0fd2361cc70be6f3d6ecda69def2103 Author: Dhananjay Phadke Date: Tue Feb 24 16:39:21 2009 -0800 netxen: refactor pci probe Split pci probe function into smaller logical blocks. Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit dbf64b10fa5b339d8b6e949f97c0d00750b08ca8 Author: Dhananjay Phadke Date: Tue Feb 24 16:39:03 2009 -0800 netxen: cleanup unused code Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit 4da129421f898147235a3e6b40234d789df208b7 Author: Dhananjay Phadke Date: Tue Feb 24 16:38:44 2009 -0800 netxen: advertise wake-on-lan support Add ethtool wake on lan support. Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit ba599d4f0d2071abc049cb6345eab510a8a3643e Author: Dhananjay Phadke Date: Tue Feb 24 16:38:22 2009 -0800 netxen: firmware download support Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit 32344a394029baeca5bcc9fa839694b23a82cc64 Author: Jesse Brandeburg Date: Tue Feb 24 16:37:31 2009 -0800 ixbge: fix bug when using large pages and jumbo frames it was pointed out on the list that ixgbe was failing when using 64kB pages and large 16kB MTU. since with a 64kB PAGE_SIZE MAX_SKB_FRAGS = 3, the way the driver was configuring page usage was assuming 2kB is half a page, and was only ever dmaing that much data to a half page. (16kB - header size) / 2048 = 7 or 8 pages, which would far exceed 3 adjust the driver to account for these large pages, the hardware can support DMA to up to 16kB for each descriptor. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit c7e4358ae8e49f85a4d528366046da26b36a712f Author: Shannon Nelson Date: Tue Feb 24 16:36:38 2009 -0800 ixgbe: Move ring features into an enum, allowing easier future maintenance From: Shannon Nelson The ring_feature member of ixgbe_adapter is statically allocated based on the supported features of the device. When a new feature is added, we need to manually update the static allocation. This patch makes the feature list an enum, eliminating the need for multiple updates to the code when adding a new feature. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e611bd82441130991d7f4600dfd4632cebd417c5 Author: Mark Brown Date: Sun Feb 22 20:04:41 2009 +0000 ASoC: Only write back non-default registers when resuming WM8753 This will reduce the number of writes done on resume, allowing that to complete faster (especially on systems with very slow I2C like the current Samsung driver). Signed-off-by: Mark Brown commit c2bac1606a937d4700f8fdd8e051a4c49593c41b Author: Mark Brown Date: Tue Feb 24 23:33:12 2009 +0000 ASoC: Convert WM8753 to register via normal device probe The base support for the only in-tree user, the GTA01, is out of tree and will be updated separately. Signed-off-by: Mark Brown commit 69e169da5a69cc991d54bb4d54f236523145756c Author: Mark Brown Date: Sun Feb 22 14:39:03 2009 +0000 ASoC: Shuffle WM8753 device registration code This patch should be pure code motion, separating that out from the functional changes to move to new style device registration. Signed-off-by: Mark Brown commit d3b894218441ecb1c83e47c682e2d6589ee37a8d Author: Mark Brown Date: Mon Feb 23 18:45:19 2009 +0000 ASoC: Fix Zylonite voice interface stereo configurations We always run in the first timeslot of one. Signed-off-by: Mark Brown commit 8056d9bbb57207854462b6b0a3a75d172300cce5 Author: Mark Brown Date: Fri Jan 23 14:44:54 2009 +0000 ASoC: Improve WM9713 voice DAC shutdown procedure Signed-off-by: Mark Brown commit 28337ff5438a640afa713d874d076e3a8a9150da Author: Eric Dumazet Date: Tue Feb 24 15:30:29 2009 +0100 netfilter: xt_hashlimit fix Commit 784544739a25c30637397ace5489eeb6e15d7d49 (netfilter: iptables: lock free counters) broke xt_hashlimit netfilter module : This module was storing a pointer inside its xt_hashlimit_info, and this pointer is not relocated when we temporarly switch tables (iptables -L). This hack is not not needed at all (probably a leftover from ancient time), as each cpu should and can access to its own copy. Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit d060ffc1840e37100628f520e66600c5ae483b44 Author: Jan Engelhardt Date: Tue Feb 24 15:23:58 2009 +0100 netfilter: install missing headers iptables imports headers from (the unifdefed headers of a) kernel tree, but some headers happened to not be installed. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit 7d1e04598e5e92527840b6889fb75b4b30fdd33b Author: Pablo Neira Ayuso Date: Tue Feb 24 14:48:01 2009 +0100 netfilter: nf_conntrack: account packets drop by tcp_packet() Since tcp_packet() may return -NF_DROP in two situations, the packet-drop stats must be increased. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy commit 5325a7bf92d5bcac39dbefdfcc214379d17f3d3a Merge: e70049b... 028e141... Author: David S. Miller Date: Tue Feb 24 03:51:03 2009 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit e70049b9e74267dd47e1ffa62302073487afcb48 Merge: d18921a... f7e603a... Author: David S. Miller Date: Tue Feb 24 03:50:29 2009 -0800 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ commit d18921a0e319ab512f8186b1b1142c7b8634c779 Author: Jesper Dangaard Brouer Date: Mon Feb 23 04:40:43 2009 +0000 Doc: Refer to ip-sysctl.txt for strict vs. loose rp_filter mode The IP_ADVANCED_ROUTER Kconfig describes the rp_filter proc option. Recent changes added a loose mode. Instead of documenting this change too places, refer to the document describing it: Documentation/networking/ip-sysctl.txt I'm considering moving the rp_filter description away from the Kconfig file into ip-sysctl.txt. Signed-off-by: Jesper Dangaard Brouer Signed-off-by: David S. Miller commit e18f5feb0c851a0e77e315b3d9ef1c432b1a50ec Author: Jesper Dangaard Brouer Date: Mon Feb 23 04:39:04 2009 +0000 Doc: Cleanup whitespaces in ip-sysctl.txt Fix up whitespaces while going though ip-sysctl.txt anyway. Signed-off-by: Jesper Dangaard Brouer Signed-off-by: David S. Miller commit bf869c30628cc02295fb919f0d0074f296d5f129 Author: Jesper Dangaard Brouer Date: Mon Feb 23 04:37:55 2009 +0000 Doc: Fix typos in ip-sysctl.txt about rp_filter. First fix a typo in Stephens patch ;-) Signed-off-by: Jesper Dangaard Brouer Signed-off-by: David S. Miller commit a65d629ceb4cff5e7d5edadfd6bf1f64c370a517 Author: Takashi Iwai Date: Mon Feb 23 16:57:04 2009 +0100 ALSA: hda - Add pseudo device-locking for clear/reconfig Added the pseudo device-locking using card->shutdown flag to avoid the crash via clear/reconfig during operations. Signed-off-by: Takashi Iwai commit 209b14033652f0509912da97fb4a5c8001e64ec0 Merge: 13c989b... 39c2871... Author: Takashi Iwai Date: Mon Feb 23 14:15:47 2009 +0100 Merge branch 'test/hda-pincfg' into topic/hda commit 39c2871eeaeeddcbecee29ec905ec528a057ca52 Author: Takashi Iwai Date: Mon Feb 23 14:14:51 2009 +0100 ALSA: hda - Add an example about pin reconfiguration Signed-off-by: Takashi Iwai commit 13c989beba166b470b1e6b0fa117148bcbfa3dd1 Author: Takashi Iwai Date: Mon Feb 23 11:33:34 2009 +0100 ALSA: hda - Don't give over 0dB volume for AD1984A HP laptops Set the upper limit 0dB to the volume of mixer amp 0x20 for AD1984A HP laptops. The overloaded volume may damage the internal speaker. Signed-off-by: Takashi Iwai commit 73d342b169db700b5a6ad626fe4b86911efec8db Author: David Rientjes Date: Sun Feb 22 17:40:09 2009 -0800 slub: add min_partial sysfs tunable Now that a cache's min_partial has been moved to struct kmem_cache, it's possible to easily tune it from userspace by adding a sysfs attribute. It may not be desirable to keep a large number of partial slabs around if a cache is used infrequently and memory, especially when constrained by a cgroup, is scarce. It's better to allow userspace to set the minimum policy per cache instead of relying explicitly on kmem_cache_shrink(). The memory savings from simply moving min_partial from struct kmem_cache_node to struct kmem_cache is obviously not significant (unless maybe you're from SGI or something), at the largest it's # allocated caches * (MAX_NUMNODES - 1) * sizeof(unsigned long) The true savings occurs when userspace reduces the number of partial slabs that would otherwise be wasted, especially on machines with a large number of nodes (ia64 with CONFIG_NODES_SHIFT at 10 for default?). As well as the kernel estimates ideal values for n->min_partial and ensures it's within a sane range, userspace has no other input other than writing to /sys/kernel/slab/cache/shrink. There simply isn't any better heuristic to add when calculating the partial values for a better estimate that works for all possible caches. And since it's currently a static value, the user really has no way of reclaiming that wasted space, which can be significant when constrained by a cgroup (either cpusets or, later, memory controller slab limits) without shrinking it entirely. This also allows the user to specify that increased fragmentation and more partial slabs are actually desired to avoid the cost of allocating new slabs at runtime for specific caches. There's also no reason why this should be a per-struct kmem_cache_node value in the first place. You could argue that a machine would have such node size asymmetries that it should be specified on a per-node basis, but we know nobody is doing that right now since it's a purely static value at the moment and there's no convenient way to tune that via slub's sysfs interface. Cc: Christoph Lameter Signed-off-by: David Rientjes Signed-off-by: Pekka Enberg commit 3b89d7d881a1dbb4da158f7eb5d6b3ceefc72810 Author: David Rientjes Date: Sun Feb 22 17:40:07 2009 -0800 slub: move min_partial to struct kmem_cache Although it allows for better cacheline use, it is unnecessary to save a copy of the cache's min_partial value in each kmem_cache_node. Cc: Christoph Lameter Signed-off-by: David Rientjes Signed-off-by: Pekka Enberg commit 5e7b8e0d87091ae21b291588817b5359a5e00795 Author: Takashi Iwai Date: Mon Feb 23 09:45:59 2009 +0100 ALSA: hda - Make user_pin overriding the driver setup Make user_pin overriding even the driver pincfg, e.g. the static / fixed pin config table in patch_sigmatel.c. Signed-off-by: Takashi Iwai commit 346ff70fdbe9093947b9494fe714c89cafcceade Author: Takashi Iwai Date: Mon Feb 23 09:42:57 2009 +0100 ALSA: hda - Rename {override,cur}_pin with {user,driver}_pin Rename from override_pin and cur_pin with user_pin and driver_pin, respectively, to be a bit more intuitive. Signed-off-by: Takashi Iwai commit c17a1abae2f29047a0f57324240b01609489261b Author: Takashi Iwai Date: Mon Feb 23 09:28:12 2009 +0100 ALSA: hda - Use snd_hda_codec_get_pincfg() in the rest places Replace with snd_hda_codec_get_pincfg() in the places where available. Signed-off-by: Takashi Iwai commit f9ffc5d6f0161b66202f2df9ecc42d1be241020d Author: Tim Blechmann Date: Fri Feb 20 19:38:16 2009 +0100 ALSA: hdsp - whitespace cleanup Impact: remove trailing spaces Signed-off-by: Tim Blechmann Signed-off-by: Takashi Iwai commit e588ed8304f76cbb396ee85e657a58990298a675 Author: Tim Blechmann Date: Fri Feb 20 19:30:35 2009 +0100 ALSA: hdsp - poll for iobox sleeping for 2 seconds before checking for the iobox is not enough on some systems. this patch increases the timeout, but polls the card during that time. it thus speeds up the module loading when the card has already been initialized, while being more robust on systems, which require a higher timeout than the predefined 2 seconds. Signed-off-by: Tim Blechmann Signed-off-by: Takashi Iwai commit 66a101dda6b26ee566aa9cadcbea904a41d2b268 Merge: b1a0aac... 28b7e34... Author: Takashi Iwai Date: Mon Feb 23 08:17:28 2009 +0100 Merge branch 'topic/hwdep-cleanup' into topic/hdsp commit 1618a3281b90c43ccc85b58699508b9864defc8c Merge: cc95948... cc374c4... Author: Takashi Iwai Date: Mon Feb 23 08:14:41 2009 +0100 Merge branch 'fix/hda' into topic/hda Conflicts: sound/pci/hda/patch_realtek.c commit ce71bfd1aa6d6a4069929eeceed254e13400ddf4 Author: Andreas Mohr Date: Sun Feb 22 20:33:41 2009 +0100 ALSA: ALS4000, slight mixer improvements - add 8kHz / 20 kHz low-pass filter switch control - add ALS4000 Mono capture route control - add annotations to specs pages - improve ALS4000 PM saved regs selection (remove SB dummy register, add missing ones) - add some missing ALS4000 register defines - constify two variables Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai commit cc95948972576c3efa43c9ed05b4a265805a4c54 Author: Michael Schwingen Date: Sun Feb 22 18:58:45 2009 +0100 ALSA: hda - add support for "Maxdata Favorit 100XS" (Intel HDA/ALC260) Signed-off-by: Michael Schwingen Signed-off-by: Takashi Iwai commit e538052746d570c874650a24eed89fca6e4c93dc Author: Roland Dreier Date: Sun Feb 22 20:14:37 2009 -0800 IB/ipath: Really run work in ipath_release_user_pages_on_close() ipath_release_user_pages_on_close() just allocated a structure to schedule work with but just returned (leaking the structure) rather than actually doing schedule_work(). Fix the logic to what was intended. This was spotted by the Coverity checker (CID 2700). Signed-off-by: Roland Dreier commit 71c4512201575c7cc008b364e2e2c75cc7085c26 Author: Roland Dreier Date: Sun Feb 22 20:04:34 2009 -0800 IB/ipath: Fix memory leak in init_shadow_tids() error path If the second vmalloc() fails, the wrong pointer is pased to vfree(), so the first vmalloc() ends up getting leaked. This was spotted by the Coverity checker (CID 2709). Signed-off-by: Roland Dreier commit ce16c5337ab0d165f95c88aa857207efd7c01139 Author: Eric W. Biederman Date: Sun Feb 22 00:11:09 2009 -0800 netns: Remove net_alive It turns out that net_alive is unnecessary, and the original problem that led to it being added was simply that the icmp code thought it was a network device and wound up being unable to handle packets while there were still packets in the network namespace. Now that icmp and tcp have been fixed to properly register themselves this problem is no longer present and we have a stronger guarantee that packets will not arrive in a network namespace then that provided by net_alive in netif_receive_skb. So remove net_alive allowing packet reception run a little faster. Additionally document the strong reason why network namespace cleanup is safe so that if something happens again someone else will have a chance of figuring it out. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit 6a1b3054d9fd98001a6631501caf1969138ee00d Author: Eric W. Biederman Date: Sun Feb 22 00:10:18 2009 -0800 tcp: Like icmp use register_pernet_subsys To remove the possibility of packets flying around when network devices are being cleaned up use reisger_pernet_subsys instead of register_pernet_device. Signed-off-by: Eric W. Biederman Acked-by: Denis V. Lunev Signed-off-by: David S. Miller commit 959d2726499175c6b724d87fed1dafca7582efe2 Author: Eric W. Biederman Date: Sun Feb 22 00:09:14 2009 -0800 netns: Fix icmp shutdown. Recently I had a kernel panic in icmp_send during a network namespace cleanup. There were packets in the arp queue that failed to be sent and we attempted to generate an ICMP host unreachable message, but failed because icmp_sk_exit had already been called. The network devices are removed from a network namespace and their arp queues are flushed before we do attempt to shutdown subsystems so this error should have been impossible. It turns out icmp_init is using register_pernet_device instead of register_pernet_subsys. Which resulted in icmp being shut down while we still had the possibility of packets in flight, making a nasty NULL pointer deference in interrupt context possible. Changing this to register_pernet_subsys fixes the problem in my testing. Signed-off-by: Eric W. Biederman Acked-by: Denis V. Lunev Signed-off-by: David S. Miller commit a6e8f27f3c02b0c0d0c45d14b2f4a8810c9a7dc7 Author: Jesper Dangaard Brouer Date: Sun Feb 22 00:07:13 2009 -0800 ipv4: Clean whitespaces in net/ipv4/Kconfig. While going through net/ipv4/Kconfig cleanup whitespaces. Signed-off-by: Jesper Dangaard Brouer Signed-off-by: David S. Miller commit b2cc46a8ee905d1d642e01761939879c495e3e3a Author: Jesper Dangaard Brouer Date: Sun Feb 22 00:06:20 2009 -0800 ipv4: Fix rp_filter description in net/ipv4/Kconfig. The reverse path filter (rp_filter) will NOT get enabled when enabling forwarding. Read the code and tested in in practice. Most distributions do enable it in startup scripts. Signed-off-by: Jesper Dangaard Brouer Signed-off-by: David S. Miller commit 0117cfabe3ba9b430c6ff6eecd4fdc569977f24f Author: Stephen Hemminger Date: Sun Feb 22 00:03:19 2009 -0800 snap: handle registration error and compile warning If this module can't load, it is almost certainly because something else is already bound to that SAP. So in that case, return the same error code as other SAP usage, and fail the module load. Also fixes a compiler warning about printk of non const. Signed-off-by: Stephen Hemminger Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 01af4a0e3cce86212f6bf54ebe8f84d7219c862a Author: Stephen Hemminger Date: Sun Feb 22 00:02:44 2009 -0800 llc: fix non-const printk warning Mark some strings as const. Signed-off-by: Stephen Hemminger Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 5747a1aacde268017784a6a56df06c3b40194381 Author: Stephen Hemminger Date: Sun Feb 22 00:02:08 2009 -0800 ip: ipip compile warning Get rid of compile warning about non-const format Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c1cf8422f0512c2b14f0d66bce34abb0645c888a Author: Stephen Hemminger Date: Fri Feb 20 08:25:36 2009 +0000 ip: add loose reverse path filtering Extend existing reverse path filter option to allow strict or loose filtering. (See http://en.wikipedia.org/wiki/Reverse_path_filtering). For compatibility with existing usage, the value 1 is chosen for strict mode and 2 for loose mode. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 6dac62d3888a34f5bccbe14222ba77e8877a2e54 Author: David S. Miller Date: Sun Feb 22 19:54:16 2009 -0800 Revert "etherh: Get working again." This reverts commit 7d3d5ec168f1f40e8547d2a1659670ef222a053b. Russell is going to merge this in via the ARM tree. Signed-off-by: David S. Miller commit be38e0fd5f90a91d09e0a85ffb294b70a7be6259 Author: Mimi Zohar Date: Fri Feb 20 14:28:29 2009 -0800 integrity: ima iint radix_tree_lookup locking fix Based on Andrew Morton's comments: - add missing locks around radix_tree_lookup in ima_iint_insert() Signed-off-by: Mimi Zohar Cc: James Morris Signed-off-by: Andrew Morton Signed-off-by: James Morris commit 1581e7ddbdd97443a134e1a0cc9d81256baf77a4 Author: Tetsuo Handa Date: Sat Feb 21 20:40:50 2009 +0900 TOMOYO: Do not call tomoyo_realpath_init unless registered. tomoyo_realpath_init() is unconditionally called by security_initcall(). But nobody will use realpath related functions if TOMOYO is not registered. So, let tomoyo_init() call tomoyo_realpath_init(). This patch saves 4KB of memory allocation if TOMOYO is not registered. Signed-off-by: Kentaro Takeda Signed-off-by: Tetsuo Handa Signed-off-by: Toshiharu Harada Signed-off-by: James Morris commit c23e253e67c9d8a91a0ffa33c1f571a17f0a2403 Author: Andreas Herrmann Date: Sat Feb 21 00:16:35 2009 +0100 x86: hpet: stop HPET_COUNTER when programming periodic mode Impact: fix system hang on some systems operating with HZ_1000 On a system that stalled with HZ_1000, the first value written to T0_CMP (when the main counter was not stopped) did not trigger an interrupt. Instead after the main counter wrapped around (after several minutes) an interrupt was triggered and afterwards the periodic interrupt took effect. This can be fixed by implementing HPET spec recommendation for programming the periodic mode (i.e. stopping the main counter). Signed-off-by: Andreas Herrmann Cc: Mark Hounschell Cc: Borislav Petkov Signed-off-by: Ingo Molnar commit 8d6f0c8214928f7c5083dd54ecb69c5d615b516e Author: Andreas Herrmann Date: Sat Feb 21 00:10:44 2009 +0100 x86: hpet: provide separate functions to stop and start the counter By splitting up existing hpet_start_counter function. Signed-off-by: Andreas Herrmann Cc: Mark Hounschell Cc: Borislav Petkov Signed-off-by: Ingo Molnar commit b98103a5597b87211a1c74077b06faeac554bedc Author: Andreas Herrmann Date: Sat Feb 21 00:09:47 2009 +0100 x86: hpet: print HPET registers during setup (if hpet=verbose is used) Signed-off-by: Andreas Herrmann Cc: Mark Hounschell Cc: Borislav Petkov Signed-off-by: Ingo Molnar commit 2702e0a46c2d28da92b32c9b068ee1291fc0de35 Merge: 42bb8cc... adfafef... Author: Ingo Molnar Date: Sun Feb 22 17:59:49 2009 +0100 Merge branch 'linus' into timers/hpet commit 93e051d2771e6bf70e86b8265bfbf296a457d044 Author: Mark Brown Date: Sun Feb 22 14:24:00 2009 +0000 ASoC: Only unregister drivers we registered for WM8753 Signed-off-by: Mark Brown commit eeb1080b29a0fa00e426ba77eb96f3a157b335ab Author: Mark Brown Date: Sun Feb 22 14:19:23 2009 +0000 ASoC: Report I/O errors from WM8753 reset Signed-off-by: Mark Brown commit 7691367d71fd77ab668ff3b6edb4340cecddc805 Author: Herbert Xu Date: Sat Feb 21 23:52:29 2009 -0800 tcp: Always set urgent pointer if it's beyond snd_nxt Our TCP stack does not set the urgent flag if the urgent pointer does not fit in 16 bits, i.e., if it is more than 64K from the sequence number of a packet. This behaviour is different from the BSDs, and clearly contradicts the purpose of urgent mode, which is to send the notification (though not necessarily the associated data) as soon as possible. Our current behaviour may in fact delay the urgent notification indefinitely if the receiver window does not open up. Simply matching BSD however may break legacy applications which incorrectly rely on the out-of-band delivery of urgent data, and conversely the in-band delivery of non-urgent data. Alexey Kuznetsov suggested a safe solution of following BSD only if the urgent pointer itself has not yet been transmitted. This way we guarantee that when the remote end sees the packet with non-urgent data marked as urgent due to wrap-around we would have advanced the urgent pointer beyond, either to the actual urgent data or to an as-yet untransmitted packet. The only potential downside is that applications on the remote end may see multiple SIGURG notifications. However, this would occur anyway with other TCP stacks. More importantly, the outcome of such a duplicate notification is likely to be harmless since the signal itself does not carry any information other than the fact that we're in urgent mode. Thanks to Ilpo Järvinen for fixing a critical bug in this and Jeff Chua for reporting that bug. Signed-off-by: Herbert Xu Acked-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 7d3d5ec168f1f40e8547d2a1659670ef222a053b Author: Russell King Date: Sat Feb 21 23:41:57 2009 -0800 etherh: Get working again. Further to a71558d, this is round five of fixes to make etherh work again. As mainline kernels stand, the fixes in b9a9b4b were the wrong approach. The 8390 driver was structured by Al Viro to allow the flexibility required by platforms. lib8390.c contains the core code which drivers explicitly include: - 8390.c includes lib8390.c to provide the standard ISA based driver. - etherh.c includes it with the accessors defined for RiscPC platforms, where it is addressed via the MMIO accessors with a device dependent register spacing. Other platform drivers do something similar. However, b9a9b4b caused the kernel to contain not only the etherh private build of lib8390 (included in etherh.c) but also lib8390.c itself, and referred the new net_device_ops methods to the ISA version. The result of this is is not pretty: Unable to handle kernel paging request at virtual address 12032030 pgd = c8330000 [12032030] *pgd=00000000 Internal error: Oops: 18331805 [#1] Modules linked in: ipv6 CPU: 0 Not tainted (2.6.29-rc3 #167) PC is at do_set_multicast_list+0xd0/0x190 LR is at bitrev32+0x28/0x34 pc : [] lr : [] psr: a0000093 sp : c8321d9c ip : c8321d84 fp : c8321dbc r10: c80c6800 r9 : 00000000 r8 : c80c6b60 r7 : c80c6b80 r6 : cc80c800 r5 : c80c6800 r4 : 00000000 r3 : cc80c80c r2 : 00000004 r1 : 00000007 r0 : e0000000 Flags: NzCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment user ... Fix up b9a9b4b by making etherh's net_device_ops refer to the internal lib8390 functions, and remove the build of the ISA 8390.c driver. Signed-off-by: Russell King Signed-off-by: David S. Miller commit 66da8c529ad4d330a268ac08aa101b87c5c911ff Author: Hannes Eder Date: Sat Feb 21 23:37:10 2009 -0800 ipv6: fix sparse warning: Using plain integer as NULL pointer Fix this sparse warning: net/ipv6/xfrm6_state.c:72:26: warning: Using plain integer as NULL pointer Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 9c3c133b1ed6e6d01bfabb6de29bf3d0f0886354 Author: Alexander Clouter Date: Sun Feb 22 12:03:56 2009 +0800 hwrng: timeriomem - New driver Some hardware platforms, the TS-7800[1] is one for example, can supply the kernel with an entropy source, albeit a slow one for TS-7800 users, by just reading a particular IO address. This source must not be read above a certain rate otherwise the quality suffers. The driver is then hooked into by calling platform_device_(register|add|del) passing a structure similar to: ------ static struct timeriomem_rng_data ts78xx_ts_rng_data = { .address = (u32 *__iomem) TS_RNG, .period = 1000000, /* one second */ }; static struct platform_device ts78xx_ts_rng_device = { .name = "timeriomem_rng", .id = -1, .dev = { .platform_data = &ts78xx_ts_rng_data, }, .num_resources = 0, }; ------ [1] http://www.embeddedarm.com/products/board-detail.php?product=TS-7800 Signed-off-by: Alexander Clouter Signed-off-by: Herbert Xu commit 54037505a5278ce85df66531f384109ad94947e3 Author: Don Skidmore Date: Sat Feb 21 15:42:56 2009 -0800 ixgbe: fix for 82598 Si errata causing buffer overflow The failure happens when an interrupt occurs and the driver is reading EICR. This read will cause a clear-by-read which leads to two TLP being inserted in the PCIe retry buffer leading to an overflow of the buffer and corruption of TLPs. The solution is different depending where the reading of EICR takes place. For ixgbe_msix_lsc() since we are in MSIX mode and know OCD is enabled a clear-by-write is done instead of the normal clear-by-read. For ixgbe_intr() 0xffffffff is written to EIMC before the read, masking the interrupts. Signed-off-by: Don Skidmore Acked-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit cd4d8fdad1f13205c769266dfa99015e226b6e07 Author: Patrick Ohly Date: Sat Feb 21 02:42:18 2009 -0800 net: kernel panic in dev_hard_start_xmit: remove faulty software TX time stamping The current implementation of the TX software time stamping fallback is faulty because it accesses the skb after ndo_start_xmit() returns successfully. This patch removes the fallback, which fixes kernel panics seen during stress tests. Hardware time stamping is not affected by this removal. Signed-off-by: Patrick Ohly Signed-off-by: Emil Tantilov Signed-off-by: David S. Miller commit f1085c4f319f1e43c95718045a235f276cc4b615 Author: Takashi Iwai Date: Fri Feb 20 14:50:35 2009 +0100 ALSA: hda - Update documentation for pincfg sysfs entries Added the brief descriptions of new sysfs entries for pint default config values. Signed-off-by: Takashi Iwai commit 2f334f92cfb44d17b9f24a43f8998cca03f9a3dd Author: Takashi Iwai Date: Fri Feb 20 14:37:42 2009 +0100 ALSA: hda - Remove codec-specific pin save/restore functions Replace the accessor to pin defaults with the common code for caching. Signed-off-by: Takashi Iwai commit 330ee9957910826a072c2ad5d4045182335f9963 Author: Takashi Iwai Date: Fri Feb 20 14:33:36 2009 +0100 ALSA: hda - Remove IDT codec-specific pin save/restore functions Removed its own save/restore functions and replaced with the common code. Signed-off-by: Takashi Iwai commit 0e8a21b59d48a63f45b3e6d2aca7fb91c5aec882 Author: Takashi Iwai Date: Fri Feb 20 14:13:06 2009 +0100 ALSA: hda - Remove realtek codec-specific pin save/restore functions Now it's done in the common code. Also use the common access functions for pin defaults. Signed-off-by: Takashi Iwai commit 3be141494a080a9189b51fa78154c975ad8d9806 Author: Takashi Iwai Date: Fri Feb 20 14:11:16 2009 +0100 ALSA: hda - Add generic pincfg initialization Added the generic pincfg cache and save/restore functions. Also introduced the pin-overriding via hwdep sysfs. Signed-off-by: Takashi Iwai commit d2f57cd54a602c979e571aa337b206c88609876d Merge: 7e0e44d... 55290e1... Author: Takashi Iwai Date: Fri Feb 20 16:06:47 2009 +0100 Merge branch 'fix/hda' into topic/hda commit 0da0a420bb542b13ebae142109a9d2045ade0cb1 Author: Mimi Zohar Date: Thu Feb 19 21:23:50 2009 -0500 integrity: ima scatterlist bug fix Based on Alexander Beregalov's post http://lkml.org/lkml/2009/2/19/198 - replaced sg_set_buf() with sg_init_one() kernel BUG at include/linux/scatterlist.h:65! invalid opcode: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC last sysfs file: CPU 2 Modules linked in: Pid: 1, comm: swapper Not tainted 2.6.29-rc5-next-20090219 #5 PowerEdge 1950 RIP: 0010:[] [] ima_calc_hash+0xc0/0x160 RSP: 0018:ffff88007f46bc40 EFLAGS: 00010286 RAX: ffffe200032c45e8 RBX: 00000000fffffff4 RCX: 0000000087654321 RDX: 0000000000000002 RSI: 0000000000000001 RDI: ffff88007cf71048 RBP: ffff88007f46bcd0 R08: 0000000000000000 R09: 0000000000000163 R10: ffff88007f4707a8 R11: 0000000000000000 R12: ffff88007cf71048 R13: 0000000000001000 R14: 0000000000000000 R15: 0000000000009d98 FS: 0000000000000000(0000) GS:ffff8800051ac000(0000) knlGS:0000000000000000 CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b CR2: 0000000000000000 CR3: 0000000000201000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Signed-off-by: Mimi Zohar Tested-by: Alexander Beregalov Signed-off-by: James Morris commit e8120ff1ffc51102ead1f4c98a3fd5d26fefc722 Author: Zhang Yanmin Date: Thu Feb 12 18:00:17 2009 +0200 SLUB: Fix default slab order for big object sizes The default order of kmalloc-8192 on 2*4 stoakley is an issue of calculate_order. slab_size order name ------------------------------------------------- 4096 3 sgpool-128 8192 2 kmalloc-8192 16384 3 kmalloc-16384 kmalloc-8192's default order is smaller than sgpool-128's. On 4*4 tigerton machine, a similiar issue appears on another kmem_cache. Function calculate_order uses 'min_objects /= 2;' to shrink. Plus size calculation/checking in slab_order, sometimes above issue appear. Below patch against 2.6.29-rc2 fixes it. I checked the default orders of all kmem_cache and they don't become smaller than before. So the patch wouldn't hurt performance. Signed-off-by Zhang Yanmin Signed-off-by: Pekka Enberg commit 51735a7ca67531267a27b57e5fe20f7815192f9c Author: Pekka Enberg Date: Fri Feb 20 12:21:33 2009 +0200 SLUB: Do not pass 8k objects through to the page allocator Increase the maximum object size in SLUB so that 8k objects are not passed through to the page allocator anymore. The network stack uses 8k objects for performance critical operations. The patch is motivated by a SLAB vs. SLUB regression in the netperf benchmark. The problem is that the kfree(skb->head) call in skb_release_data() that is subject to page allocator pass-through as the size passed to __alloc_skb() is larger than 4 KB in this test. As explained by Yanmin Zhang: I use 2.6.29-rc2 kernel to run netperf UDP-U-4k CPU_NUM client/server pair loopback testing on x86-64 machines. Comparing with SLUB, SLAB's result is about 2.3 times of SLUB's. After applying the reverting patch, the result difference between SLUB and SLAB becomes 1% which we might consider as fluctuation. [ penberg@cs.helsinki.fi: fix oops in kmalloc() ] Reported-by: "Zhang, Yanmin" Tested-by: "Zhang, Yanmin" Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit ffadd4d0feb5376c82dc3a4104731b7ce2794edc Author: Christoph Lameter Date: Tue Feb 17 12:05:07 2009 -0500 SLUB: Introduce and use SLUB_MAX_SIZE and SLUB_PAGE_SHIFT constants As a preparational patch to bump up page allocator pass-through threshold, introduce two new constants SLUB_MAX_SIZE and SLUB_PAGE_SHIFT and convert mm/slub.c to use them. Reported-by: "Zhang, Yanmin" Tested-by: "Zhang, Yanmin" Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit f3990e610a157e9c36af85a75bc66260dff31f40 Author: Clemens Ladisch Date: Fri Feb 20 09:32:40 2009 +0100 sound: usb-audio: remove MIN_PACKS_URB Remove the MIN_PACKS_URB symbol because other limits can force the number of packets down to one, regardless of the value of this symbol, and nobody has ever changed it anyway. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit eacbb9dba6b4c982a0217ea2c7d15db88d4fda37 Author: Clemens Ladisch Date: Fri Feb 20 09:33:40 2009 +0100 sound: virtuoso: increase minimum volume to -60 dB Use -60 dB as the minimum value of the master volume mixer control. While the DACs would support ranges down to about -120 dB, such attenuations are not useful in practice. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit d91b424d6d7bda0773b6b6b606d48d089c4f5115 Author: Clemens Ladisch Date: Fri Feb 20 09:31:14 2009 +0100 sound: oxygen: handle AK5385 ADC on Claro halo cards The HT-Omega Claro halo's ADC is an AK5385 instead of a WM8785, so we should handle the ADC parameters as we do with the X-Meridian. Using the code for the wrong ADC does not seem to have any audible effects, and the Windows driver does it, but it is nonetheless a good idea to run the AK5385 with an oversampling ratio that is not outside the documented limits. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 08361aa807ae5e5007cd226ca9e34287512de737 Author: Eric Dumazet Date: Fri Feb 20 11:03:33 2009 +0100 netfilter: ip_tables: unfold two critical loops in ip_packet_match() While doing oprofile tests I noticed two loops are not properly unrolled by gcc Using a hand coded unrolled loop provides nice speedup : ipt_do_table credited of 2.52 % of cpu instead of 3.29 % in tbench. Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit 268cb38e1802db560c73167e643f14a3dcb4b07c Author: Adam Nielsen Date: Fri Feb 20 10:55:14 2009 +0100 netfilter: x_tables: add LED trigger target Kernel module providing implementation of LED netfilter target. Each instance of the target appears as a led-trigger device, which can be associated with one or more LEDs in /sys/class/leds/ Signed-off-by: Adam Nielsen Acked-by: Richard Purdie Signed-off-by: Patrick McHardy commit af07d241dc76f0a52c7ff04df3a3970020fe6157 Author: Hagen Paul Pfeifer Date: Fri Feb 20 10:48:06 2009 +0100 netfilter: fix hardcoded size assumptions get_random_bytes() is sometimes called with a hard coded size assumption of an integer. This could not be true for next centuries. This patch replace it with a compile time statement. Signed-off-by: Hagen Paul Pfeifer Signed-off-by: Patrick McHardy commit e478075c6f07a383c378fb400edc1a7407a941b0 Author: Hagen Paul Pfeifer Date: Fri Feb 20 10:47:09 2009 +0100 netfilter: nf_conntrack: table max size should hold at least table size Table size is defined as unsigned, wheres the table maximum size is defined as a signed integer. The calculation of max is 8 or 4, multiplied the table size. Therefore the max value is aligned to unsigned. Signed-off-by: Hagen Paul Pfeifer Signed-off-by: Patrick McHardy commit 784544739a25c30637397ace5489eeb6e15d7d49 Author: Stephen Hemminger Date: Fri Feb 20 10:35:32 2009 +0100 netfilter: iptables: lock free counters The reader/writer lock in ip_tables is acquired in the critical path of processing packets and is one of the reasons just loading iptables can cause a 20% performance loss. The rwlock serves two functions: 1) it prevents changes to table state (xt_replace) while table is in use. This is now handled by doing rcu on the xt_table. When table is replaced, the new table(s) are put in and the old one table(s) are freed after RCU period. 2) it provides synchronization when accesing the counter values. This is now handled by swapping in new table_info entries for each cpu then summing the old values, and putting the result back onto one cpu. On a busy system it may cause sampling to occur at different times on each cpu, but no packet/byte counts are lost in the process. Signed-off-by: Stephen Hemminger Sucessfully tested on my dual quad core machine too, but iptables only (no ipv6 here) BTW, my new "tbench 8" result is 2450 MB/s, (it was 2150 MB/s not so long ago) Acked-by: Eric Dumazet Signed-off-by: Patrick McHardy commit be0c22a46cfb79ab2342bb28fde99afa94ef868e Author: Pablo Neira Ayuso Date: Wed Feb 18 01:40:43 2009 +0000 netlink: add NETLINK_BROADCAST_ERROR socket option This patch adds NETLINK_BROADCAST_ERROR which is a netlink socket option that the listener can set to make netlink_broadcast() return errors in the delivery to the caller. This option is useful if the caller of netlink_broadcast() do something with the result of the message delivery, like in ctnetlink where it drops a network packet if the event delivery failed, this is used to enable reliable logging and state-synchronization. If this socket option is not set, netlink_broadcast() only reports ESRCH errors and silently ignore ENOBUFS errors, which is what most netlink_broadcast() callers should do. This socket option is based on a suggestion from Patrick McHardy. Patrick McHardy can exchange this patch for a beer from me ;). Signed-off-by: Pablo Neira Ayuso Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 2d96cf8cdfd625da51e5d237d564cd75d3147547 Author: Santwona Behera Date: Fri Feb 20 00:58:45 2009 -0800 niu: Add TCAM classification configuration Signed-off-by: Santwona Behera Signed-off-by: David S. Miller commit 59089d8d162ddcb5c434672e915331964d38a754 Author: Santwona Behera Date: Fri Feb 20 00:58:13 2009 -0800 ethtool: Add RX pkt classification interface Signed-off-by: Santwona Behera Signed-off-by: David S. Miller commit 3876732c12cd2b9896e8c3e86fad142112e93569 Author: Thomas Klein Date: Fri Feb 20 00:42:01 2009 -0800 ehea: Fix memory hotplug handling Added missing set_bit() to disable data transfer when a memchange notification is handled Signed-off-by: Thomas Klein Signed-off-by: David S. Miller commit 376801172ade1ab80efdd42dba859282400885ed Author: Alexander Duyck Date: Thu Feb 19 20:40:30 2009 -0800 igb: this patch addes the sr-iov enablement option via num_vfs parameter This code adds a module parameter called num_vfs which defines if the driver should attempt to use sr-iov and if so how many VFs should be enabled. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 4ae196dfd61d06b061c069edcdd7c73121e60a21 Author: Alexander Duyck Date: Thu Feb 19 20:40:07 2009 -0800 igb: Add support for enabling VFs to PF driver. This patch adds the support to handle requests from the VF to perform operations such as completing resets, setting/reading mac address, adding vlans, adding multicast addresses, setting rlpml, and general communications between the PF and all VFs. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e173952257d7a3d3c64de3039d9fc02d1fbf49c3 Author: Alexander Duyck Date: Thu Feb 19 20:39:44 2009 -0800 igb: add pf side of VMDq support Add the pf portion of vmdq support. This provides enough support so that VMDq is enabled, and the pf is functional without enabling vfs. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 1bfaf07bb1d7201d3c6cb984bccd9c2416e19b6c Author: Alexander Duyck Date: Thu Feb 19 20:39:23 2009 -0800 igb: add vfs_allocated_count as placeholder for number of vfs This is the first step in supporting sr-iov. The vf_allocated_count value will be 0 until we actually have vfs present. In the meantime it represents an offset value for the start of the queues. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 46544258de71d7e32342ee71a25146ec6e2e6e47 Author: Alexander Duyck Date: Thu Feb 19 20:39:04 2009 -0800 igb: update napi polling to consolidate function and return correct values igb is currently not returning the correct values for napi. In addition it is doing more work than necessary since it will not exit polling until work_done is equal to zero. This patch makes the following changes: 1. Consolidates msi-x and non-msi polling routines. 2. Corrects return values for polling routines. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 3c842138c0cf313e906538b89d88ba0d969ce747 Author: Breno Leitao Date: Thu Feb 19 14:38:52 2009 -0800 e1000: Removing the unused macro PAGE_USE_COUNT() Removing the unused macro PAGE_USE_COUNT(), since there is no more reference to it. The last reference was removed by Jesse's commit number 630b25cdf4e3f8c0a11eb04fc8436cc36653cd58. Signed-off-by: Breno Leitao Acked-by: Jeff Kirsher Signed-off-by: David S. Miller commit ce3bdaa8710c10eec5a6dae67aaf73088d0ced4f Author: Mark Brown Date: Thu Feb 19 14:29:49 2009 +0000 ASoC: Disable WM8731 line bypass by default This avoids temporarily enabling the ouput stages during startup which can cause audible effets in the output stages. Reported-by: Fredrik Redgård Signed-off-by: Mark Brown commit 323dbf96382f057d035afce0237f08e18571ac1d Author: Eric Dumazet Date: Thu Feb 19 11:18:23 2009 +0100 netfilter: ip6_tables: unfold two loops in ip6_packet_match() ip6_tables netfilter module can use an ifname_compare() helper so that two loops are unfolded. Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit eacc17fb64f03b6c268aaf6cea320100d19d8af5 Author: Eric Dumazet Date: Thu Feb 19 11:17:17 2009 +0100 netfilter: xt_physdev: unfold two loops in physdev_mt() xt_physdev netfilter module can use an ifname_compare() helper so that two loops are unfolded. Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit 4323362e49bd10b8ff3fe5cf183fdd52662ff4a3 Author: Jan Engelhardt Date: Thu Feb 19 11:16:03 2009 +0100 netfilter: xtables: add backward-compat options Concern has been expressed about the changing Kconfig options. Provide the old options that forward-select. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit eca985d28e1a8092ba2686ec5485fd688df5cfb3 Author: Krzysztof Helt Date: Wed Feb 18 19:07:18 2009 +0100 sound: Remove documentation for OSS CS4232 driver There is no OSS cs4232 driver in the kernel any more and this documentation does not contain any info useful for ALSA driver. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 1275d6f608abda23d101ada17dc39940192d4bc4 Author: Clemens Ladisch Date: Thu Feb 19 08:44:12 2009 +0100 sound: oxygen: automatically restore overwritten EEPROM If the EEPROM was partially overwritten (which seems to happen before the OS is booted), restore its entire contents by deducing it from the remaining information. This does not have any effect on the Linux driver, which works even with incomplete information in the EEPROM, but it makes other drivers work again. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 30459d7b1843cbdea56ca120c8cac10dc5613e90 Author: Clemens Ladisch Date: Thu Feb 19 08:42:44 2009 +0100 sound: oxygen: handle cards with broken EEPROM Under as yet unknown circumstances, the first word of the sound card's EEPROM gets overwritten. When this has happened, we cannot rely on the subsystem IDs that the kernel reads from the PCI configuration registers. Instead, we read the IDs directly from the EEPROM and do the ID matching manually. Because the model-specific driver cannot determine the model before calling oxygen_pci_probe(), that function now gets a get_model() callback as parameter. The customizing of the model structure, which was formerly done by the probe() callback, also has moved into get_model(). Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit a69bb3c3fe0881d986ec78e253cb8a6bb9c28230 Author: Clemens Ladisch Date: Thu Feb 19 08:38:55 2009 +0100 sound: oxygen: use static driver name When allocating resources, use a fixed name instead of reading it from the model structure. This allows us to allocate the resources before the actual model is known. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 6ed91157093c60e26bf0215b752f07af52935afc Author: Clemens Ladisch Date: Thu Feb 19 08:38:25 2009 +0100 sound: oxygen: allocate model_data dynamically Allocate the model-specific data dynamically instead of including it in the memory block of the card structure. This will allow us to determine the actual model after the card creation. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit bb71858853a5c9616eea98512f4075d4f081154d Author: Clemens Ladisch Date: Thu Feb 19 08:37:13 2009 +0100 sound: oxygen: make the owner module a parameter of the probe function Move the owner field out of the oxygen_model structure and make it a parameter of oxygen_pci_probe(), because the actual owner module does not depend on the card model. Furthermore, moving it out of the model structure allows us to create the card structure before the actual model is known. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit a5e0e970c06065a14844b406a0c2a59776a1ccc6 Merge: 6ce6c47... b1a0aac... Author: Takashi Iwai Date: Thu Feb 19 10:22:14 2009 +0100 Merge branch 'topic/snd_card_new-err' into topic/oxygen commit fdcedf7b75808dd72c3cc0b931be11b04d75c60a Author: john stultz Date: Wed Feb 18 16:02:22 2009 -0800 time: apply NTP frequency/tick changes immediately Since the GENERIC_TIME changes landed, the adjtimex behavior changed for struct timex.tick and .freq changed. When the tick or freq value is set, we adjust the tick_length_base in ntp_update_frequency(). However, this new value doesn't get applied to tick_length until the next second (via second_overflow). This means some applications that do quick time tweaking do not see the requested change made as quickly as expected. I've run a few tests with this change, and ntpd still functions fine. Signed-off-by: John Stultz Signed-off-by: Ingo Molnar commit 7e0e44d430281d398769f1d7864e161203252760 Author: Takashi Iwai Date: Thu Feb 19 08:15:49 2009 +0100 ALSA: hda - Add digital-only mode for ALC268 ALC268 can be configured as digital-only, e.g. for HDMI, on some machines. Allow the parser to set up the digital-only mode. Signed-off-by: Takashi Iwai commit ab9fec099b796b002b6996c4c5845167d8fe6dbd Author: Takashi Iwai Date: Thu Feb 19 08:13:26 2009 +0100 ALSA: hda - Avoid doubly beep attachment in patch_alc268() Remove the doubly attachment in patch_alc268(). The input beep is attached conditionally only when needed. Signed-off-by: Takashi Iwai commit 07eba61dd68678e30b24b4776f59798f625e089d Author: Takashi Iwai Date: Thu Feb 19 08:06:35 2009 +0100 ALSA: hda - Don't enable beep for digital-only ALC262 When ALC262 codec is configured as digital-only, it's meaningless to add the digital beep input. Signed-off-by: Takashi Iwai commit 0a2e821d627ad5ced23cf31137625b81cc205e0f Author: Huang Ying Date: Thu Feb 19 14:44:02 2009 +0800 crypto: chainiv - Use kcrypto_wq instead of keventd_wq keventd_wq has potential starvation problem, so use dedicated kcrypto_wq instead. Signed-off-by: Huang Ying Signed-off-by: Herbert Xu commit 254eff771441f4ee7aa9cf770a6e4820492c9dab Author: Huang Ying Date: Thu Feb 19 14:42:19 2009 +0800 crypto: cryptd - Per-CPU thread implementation based on kcrypto_wq Original cryptd thread implementation has scalability issue, this patch solve the issue with a per-CPU thread implementation. struct cryptd_queue is defined to be a per-CPU queue, which holds one struct cryptd_cpu_queue for each CPU. In struct cryptd_cpu_queue, a struct crypto_queue holds all requests for the CPU, a struct work_struct is used to run all requests for the CPU. Testing based on dm-crypt on an Intel Core 2 E6400 (two cores) machine shows 19.2% performance gain. The testing script is as follow: -------------------- script begin --------------------------- #!/bin/sh dmc_create() { # Create a crypt device using dmsetup dmsetup create $2 --table "0 `blockdev --getsize $1` crypt cbc(aes-asm)?cryptd?plain:plain babebabebabebabebabebabebabebabe 0 $1 0" } dmsetup remove crypt0 dmsetup remove crypt1 dd if=/dev/zero of=/dev/ram0 bs=1M count=4 >& /dev/null dd if=/dev/zero of=/dev/ram1 bs=1M count=4 >& /dev/null dmc_create /dev/ram0 crypt0 dmc_create /dev/ram1 crypt1 cat >tr.sh <& /dev/null & dd if=/dev/dm-1 of=/dev/null >& /dev/null & done wait EOF for n in $(seq 10); do /usr/bin/time sh tr.sh done rm tr.sh -------------------- script end --------------------------- The separator of dm-crypt parameter is changed from "-" to "?", because "-" is used in some cipher driver name too, and cryptds need to specify cipher driver name instead of cipher name. The test result on an Intel Core2 E6400 (two cores) is as follow: without patch: -----------------wo begin -------------------------- 0.04user 0.38system 0:00.39elapsed 107%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6566minor)pagefaults 0swaps 0.07user 0.35system 0:00.35elapsed 121%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6567minor)pagefaults 0swaps 0.06user 0.34system 0:00.30elapsed 135%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6562minor)pagefaults 0swaps 0.05user 0.37system 0:00.36elapsed 119%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6607minor)pagefaults 0swaps 0.06user 0.36system 0:00.35elapsed 120%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6562minor)pagefaults 0swaps 0.05user 0.37system 0:00.31elapsed 136%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6594minor)pagefaults 0swaps 0.04user 0.34system 0:00.30elapsed 126%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6597minor)pagefaults 0swaps 0.06user 0.32system 0:00.31elapsed 125%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6571minor)pagefaults 0swaps 0.06user 0.34system 0:00.31elapsed 134%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6581minor)pagefaults 0swaps 0.05user 0.38system 0:00.31elapsed 138%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6600minor)pagefaults 0swaps -----------------wo end -------------------------- with patch: ------------------w begin -------------------------- 0.02user 0.31system 0:00.24elapsed 141%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6554minor)pagefaults 0swaps 0.05user 0.34system 0:00.31elapsed 127%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6606minor)pagefaults 0swaps 0.07user 0.33system 0:00.26elapsed 155%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6559minor)pagefaults 0swaps 0.07user 0.32system 0:00.26elapsed 151%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6562minor)pagefaults 0swaps 0.05user 0.34system 0:00.26elapsed 150%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6603minor)pagefaults 0swaps 0.03user 0.36system 0:00.31elapsed 124%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6562minor)pagefaults 0swaps 0.04user 0.35system 0:00.26elapsed 147%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6586minor)pagefaults 0swaps 0.03user 0.37system 0:00.27elapsed 146%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6562minor)pagefaults 0swaps 0.04user 0.36system 0:00.26elapsed 154%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6594minor)pagefaults 0swaps 0.04user 0.35system 0:00.26elapsed 154%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+6557minor)pagefaults 0swaps ------------------w end -------------------------- The middle value of elapsed time is: wo cryptwq: 0.31 w cryptwq: 0.26 The performance gain is about (0.31-0.26)/0.26 = 0.192. Signed-off-by: Huang Ying Signed-off-by: Herbert Xu commit 25c38d3fb92fc23af7730a1601bc20af8216ae44 Author: Huang Ying Date: Thu Feb 19 14:33:40 2009 +0800 crypto: api - Use dedicated workqueue for crypto subsystem Use dedicated workqueue for crypto subsystem A dedicated workqueue named kcrypto_wq is created to be used by crypto subsystem. The system shared keventd_wq is not suitable for encryption/decryption, because of potential starvation problem. Signed-off-by: Huang Ying Signed-off-by: Herbert Xu commit 251a2a958b0455d11b711aeeb57cabad66259461 Author: Randy Dunlap Date: Wed Feb 18 11:42:33 2009 -0800 smack: fix lots of kernel-doc notation Fix/add kernel-doc notation and fix typos in security/smack/. Signed-off-by: Randy Dunlap Acked-by: Casey Schaufler Signed-off-by: James Morris commit 9107584ecdda31981557034cccf5185afced3e0e Author: Hannes Eder Date: Wed Feb 18 19:36:04 2009 -0800 drivers/net/igb: fix sparse warning: symbol shadows an earlier one Impact: Move variable declaration as far inner as possible. Fix this sparse warning: drivers/net/igb/igb_main.c:1895:21: warning: symbol 'j' shadows an earlier one drivers/net/igb/igb_main.c:1855:16: originally declared here Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit ca1ada8861f22db37530594615b635d3dd1bde82 Author: Roel Kluin Date: Wed Feb 18 19:35:17 2009 -0800 atm: Add missing parentheses Signed-off-by: Roel Kluin Signed-off-by: David S. Miller commit fcf495b415c5b7611768f54ee931ca165289c8e3 Author: Jesse Brandeburg Date: Wed Feb 18 19:33:54 2009 -0800 e1000e: remove workaround for e1000 hardware During the move of support for PCIe devices from e1000 to e1000e, this workaround necessary only for older non-PCIe devices was mistakenly copied into e1000e. Remove it. Signed-off-by: Jesse Brandeburg Acked-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 5fbbcb79e5371d99565826a352c1003d0f1f0678 Author: Jeff Kirsher Date: Wed Feb 18 17:56:25 2009 -0800 igb: remove LRO Kconfig option To match ixgbe GRO functionality, we remove the LRO (which is now GRO) Kconfig option which enables GRO by default. Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e88721f87d8caa679e62d6004a9a5661f1ac7b0e Author: Krishna Kumar Date: Wed Feb 18 17:55:02 2009 -0800 net: Optimize skb_tx_hash() by eliminating a comparison Optimize skb_tx_hash() by eliminating a comparison that executes for every packet. skb_tx_hashrnd initialization is moved to a later part of the startup sequence, namely after the "random" driver is initialized. Rebooted the system three times and verified that the code generates different random numbers each time. Signed-off-by: Krishna Kumar Signed-off-by: David S. Miller commit 38bb045d493cc166920834087acd934dedc1b5d5 Author: Constantin Baranov Date: Wed Feb 18 17:53:20 2009 -0800 niu: improve ethtool support for gigabit copper cards Introduced support for link speed and duplex setting (ethtool -s), link advertising parameters and autonegotiation (ethtool -r): - struct niu_link_config: split advertising and autoneg fields into active and target values (similar to speed and duplex fields) - mii_init_common(): rewrite function to actually apply requested niu_link_config parameters instead of providing default initialization - link_status_1g(): move parsing of MII registers into new link_status_mii() function (link_status_1g_rgmii() could possibly use this new implementation too) - introduce simple nway_reset method - fix incorrect XMAC_CONFIG_MODE selection for 10Mbps case Signed-off-by: Constantin Baranov Signed-off-by: David S. Miller commit e0d8496a66de9eca13a88d93a5642db47e5a2b60 Author: Constantin Baranov Date: Wed Feb 18 17:52:41 2009 -0800 niu: fix PHY template choice for 10G copper Fixed a typo in niu_determine_phy_disposition() which resulted in phy_template_1g_copper being selected for 10G/copper configuration. Signed-off-by: Constantin Baranov Signed-off-by: David S. Miller commit ff2ef9021ea16188dbb355707fd31f6cf1a42ef7 Author: Hannes Eder Date: Wed Feb 18 17:49:50 2009 -0800 drivers/net/sfc: fix sparse warnings: Should it be static? Impact: Include the header file. If CONFIG_SFC_MTD is not defined then the functions 'efx_mtd_remove' and 'efx_mtd_rename' are defined 'static inline' with an empty function body in the header file, but the the whole file mtd.c is not built in this case. Fix this sparse warnings: drivers/net/sfc/mtd.c:204:6: warning: symbol 'efx_mtd_remove' was not declared. Should it be static? drivers/net/sfc/mtd.c:221:6: warning: symbol 'efx_mtd_rename' was not declared. Should it be static? drivers/net/sfc/mtd.c:230:5: warning: symbol 'efx_mtd_probe' was not declared. Should it be static? Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit c6f2981170272cce2c192087a16dd74dbde25ed2 Author: Mark Brown Date: Wed Feb 18 21:25:40 2009 +0000 ASoC: Add device init/exit annotations to new-style Wolfson CODEC drivers Signed-off-by: Mark Brown commit 519cf2df5fb50c6d24412b2421ce2d1ff0346163 Author: Mark Brown Date: Wed Feb 18 21:06:01 2009 +0000 ASoC: Check for errors when writing WM8731 reset register Signed-off-by: Mark Brown commit 74019224ac34b044b44a31dd89a54e3477db4896 Author: Ingo Molnar Date: Wed Feb 18 12:23:29 2009 +0100 timers: add mod_timer_pending() Impact: new timer API Based on an idea from Martin Josefsson with the help of Patrick McHardy and Stephen Hemminger: introduce the mod_timer_pending() API which is a mod_timer() offspring that is an invariant on already removed timers. (regular mod_timer() re-activates non-pending timers.) This is useful for the networking code in that it can allow unserialized mod_timer_pending() timer-forwarding calls, but a single del_timer*() will stop the timer from being reactivated again. Also while at it: - optimize the regular mod_timer() path some more, the timer-stat and a debug check was needlessly duplicated in __mod_timer(). - make the exports come straight after the function, as most other exports in timer.c already did. - eliminate __mod_timer() as an external API, change the users to mod_timer(). The regular mod_timer() code path is not impacted significantly, due to inlining optimizations and due to the simplifications. Based-on-patch-from: Stephen Hemminger Acked-by: Stephen Hemminger Cc: "David S. Miller" Cc: Patrick McHardy Cc: netdev@vger.kernel.org Cc: Oleg Nesterov Cc: Andrew Morton Signed-off-by: Ingo Molnar commit 4f1c3b7e7ee4d841c8af3a074dc361d6a7a77803 Author: Eric Dumazet Date: Wed Feb 18 19:11:39 2009 +0100 netfilter: xt_physdev fixes 1) physdev_mt() incorrectly assumes nulldevname[] is aligned on an int 2) It also uses word comparisons, while it could use long word ones. Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit cfac5ef7b92a2d504563989ecd0beb563920444b Author: Jan Engelhardt Date: Wed Feb 18 18:39:31 2009 +0100 netfilter: Combine ipt_ttl and ip6t_hl source Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit 563d36eb3fb22dd04da9aa6f12e1b9ba0ac115f3 Author: Jan Engelhardt Date: Wed Feb 18 18:38:40 2009 +0100 netfilter: Combine ipt_TTL and ip6t_HL source Suggested by: James King Similarly to commit c9fd49680954714473d6cbd2546d6ff120f96840, merge TTL and HL. Since HL does not depend on any IPv6-specific function, no new module dependencies would arise. With slight adjustments to the Kconfig help text. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit 6bab83fd886564e96abcff62862732159535f600 Author: Peter Ujfalusi Date: Wed Feb 18 14:39:05 2009 +0200 ASoC: TWL4030: Add digital loopback support This patch adds the digital loopback/bypass support for twl4030 codec. The digital loopback will let the digimic0 (routed in the TX1 capture path inside of TWL4030) data to be routed back to the RX2 playback path (I2S stereo). It can also route the analog capture date routed through the TX1 back to RX2. Effectively the digital loopback is routing the audio from the TX1 capture path to the RX2 playback path. Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown commit ddc214c43a923e89741e04da2f10e3037a64e222 Author: Eric Dumazet Date: Wed Feb 18 17:47:50 2009 +0100 netfilter: arp_tables: unfold two critical loops in arp_packet_match() x86 and powerpc can perform long word accesses in an efficient maner. We can use this to unroll two loops in arp_packet_match(), to perform arithmetic on long words instead of bytes. This is a win on x86_64 for example. Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit 55df4ac0c927c7f1f84e6d75532f0ca45d391e64 Author: Eric Leblond Date: Wed Feb 18 16:30:56 2009 +0100 netfilter: log invalid new icmpv6 packet with nf_log_packet() This patch adds a logging message for invalid new icmpv6 packet. Signed-off-by: Eric Leblond Signed-off-by: Patrick McHardy commit 842bff366b536787b88c07cbf2416e2cb26cae67 Author: Stephen Hemminger Date: Wed Feb 18 16:30:38 2009 +0100 netfilter: ebtables: remove unneeded initializations The initialization of the lock element is not needed since the lock is always initialized in ebt_register_table. Signed-off-by: Stephen Hemminger Signed-off-by: Patrick McHardy commit 9c8222b9e71b690c8388bb0ebe5c3e5a1469e884 Author: Stephen Hemminger Date: Wed Feb 18 16:30:20 2009 +0100 netfilter: x_tables: remove unneeded initializations Later patches change the locking on xt_table and the initialization of the lock element is not needed since the lock is always initialized in xt_table_register anyway. Signed-off-by: Stephen Hemminger Signed-off-by: Patrick McHardy commit 4a2f965ca5a4e2593744bf75425d85e0e8ff814a Author: Stephen Hemminger Date: Wed Feb 18 16:29:44 2009 +0100 netfilter: x_tables: change elements in x_tables Change to proper type on private pointer rather than anonymous void. Keep active elements on same cache line. Signed-off-by: Stephen Hemminger Signed-off-by: Patrick McHardy commit fecea3a389c89de9afae2eda74fad894d5677229 Author: Jan Engelhardt Date: Wed Feb 18 16:29:08 2009 +0100 netfilter: remove unneeded goto Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit fe2a7ce4de07472ace0cdf460a41f462a4621687 Author: Christoph Paasch Date: Wed Feb 18 16:28:35 2009 +0100 netfilter: change generic l4 protocol number 0 is used by Hop-by-hop header and so this may cause confusion. 255 is stated as 'Reserved' by IANA. Signed-off-by: Christoph Paasch Signed-off-by: Patrick McHardy commit 93b760b7072ca6972c15c798e97af3f830d8bbba Author: Mark Brown Date: Wed Feb 18 12:44:40 2009 +0000 ASoC: Implement SPI device unregistration for WM8731 Completely untested. Signed-off-by: Mark Brown commit fc9967576829a01c98e5388410dc12c61006f79f Author: Mark Brown Date: Wed Feb 18 12:34:53 2009 +0000 ASoC: Fix build for corgi and poodle Signed-off-by: Mark Brown commit 6fe4a28d8855e072036f36ee22f0a8f43f44918f Author: Herbert Xu Date: Wed Feb 18 21:41:29 2009 +0800 crypto: testmgr - Test skciphers with no IVs As it is an skcipher with no IV escapes testing altogether because we only test givcipher objects. This patch fixes the bypass logic to test these algorithms. Conversely, we're currently testing nivaead algorithms with IVs, which would have deadlocked had it not been for the fact that no nivaead algorithms have any test vectors. This patch also fixes that case. Both fixes are ugly as hell, but this ugliness should hopefully disappear once we move them into the per-type code (i.e., the AEAD test would live in aead.c and the skcipher stuff in ablkcipher.c). Signed-off-by: Herbert Xu commit 5852ae42424e3ddba2d3bdf594f72189497f17ee Author: Herbert Xu Date: Wed Feb 18 20:41:47 2009 +0800 crypto: aead - Avoid infinite loop when nivaead fails selftest When an aead constructed through crypto_nivaead_default fails its selftest, we'll loop forever trying to construct new aead objects but failing because it already exists. The crux of the issue is that once an aead fails the selftest, we'll ignore it on the next run through crypto_aead_lookup and attempt to construct a new aead. We should instead return an error to the caller if we find an an that has failed the test. This bug hasn't manifested itself yet because we don't have any test vectors for the existing nivaead algorithms. They're tested through the underlying algorithms only. Signed-off-by: Herbert Xu commit b170a137f467ea951c3f256da1b911545acf3ffd Author: Herbert Xu Date: Wed Feb 18 20:33:55 2009 +0800 crypto: skcipher - Avoid infinite loop when cipher fails selftest When an skcipher constructed through crypto_givcipher_default fails its selftest, we'll loop forever trying to construct new skcipher objects but failing because it already exists. The crux of the issue is that once a givcipher fails the selftest, we'll ignore it on the next run through crypto_skcipher_lookup and attempt to construct a new givcipher. We should instead return an error to the caller if we find a givcipher that has failed the test. Signed-off-by: Herbert Xu commit b3bdb30b6d1989129e297641fec791e9e555e4d8 Author: Takashi Iwai Date: Wed Feb 18 13:16:26 2009 +0100 ALSA: hda - Add quirk for Acer X3200 Acer X3200 needs model=auto, otherwise model=acer is pre-selected. Reference: Novell bnc#476268 https://bugzilla.novell.com/show_bug.cgi?id=476268 Signed-off-by: Takashi Iwai commit 59544d33ff3118f22a484d8be06cdf5cfc2fdca5 Author: Mark Brown Date: Wed Feb 18 11:36:44 2009 +0000 ASoC: Remove version display from the WM8753 driver Signed-off-by: Mark Brown commit 5998102b9095fdb7c67755812038612afea315c5 Author: Mark Brown Date: Mon Feb 16 20:49:16 2009 +0000 ASoC: Refactor WM8731 device registration Move the WM8731 driver to use a more standard device registration scheme where the device can be registered independantly of the ASoC probe. As a transition measure push the current manual code for registering the WM8731 into the individual machine driver probes. This allows separate patches to update the relevant architecture files with less risk of merge issues. Signed-off-by: Mark Brown commit 4dd3a29f295799295eac819bbf540690fbe30c16 Author: Yoichi Yuasa Date: Wed Feb 18 19:09:23 2009 +0900 sound: fix opensound URL in oss Introduction Signed-off-by: Yoichi Yuasa Signed-off-by: Takashi Iwai commit a8035c8f04477895207b92915b908344749be336 Author: Mark Brown Date: Mon Feb 16 19:35:43 2009 +0000 ASoC: Shuffle WM8731 SPI and I2C device registration This is a pure code motion patch intended to improve reviewability of a following patch moving WM8731 to use more standard device registration. Signed-off-by: Mark Brown commit 7ee753804185eb0a46ac964fd6a6564bd67290c9 Author: Mark Brown Date: Mon Feb 16 18:00:58 2009 +0000 ASoC: Rename AT91SAMG20-EK for applications This is a bit more idiomatic and makes identifying a configuration based on the board type work better. Signed-off-by: Mark Brown commit 5de7f9b20069257aa5f0bb74723c8603adc5841a Author: Mark Brown Date: Mon Feb 16 17:51:54 2009 +0000 ASoC: Actively manage MCLK for AT91SAM9G20-EK We have software control of the MCLK for the WM8731 so save a bit of power by actively managing it within the machine driver, enabling it only while the codec is active. Once ASoC supports multiple boards and doesn't require the soc-audio device the initial clock setup should be pushed down into the arch/arm code but for now this reduces merge issues. Tested-by: Sedji Gaouaou Signed-off-by: Mark Brown commit 40135ea07190316a789b2edfbf7c8131598bdf81 Author: Mark Brown Date: Mon Feb 16 16:04:05 2009 +0000 ASoC: Check machine type before loading on AT91SAM9G20-EK Signed-off-by: Mark Brown commit d6943541158985030108e4a0a483cdadc3c80ee1 Author: Mark Brown Date: Mon Feb 16 13:38:11 2009 +0000 ASoC: Improve diagnostics for AT91SAM9G20-EK probe We should display an error by default if we fail to register. Signed-off-by: Mark Brown commit c16159123d5b3245e2b30023a207606c74032f9c Author: Roel Kluin Date: Wed Feb 18 10:15:00 2009 +0100 sound: OSS: missing parentheses in pas2_card.c Add missing parentheses in pas2_card.c. Signed-off-by: Roel Kluin Signed-off-by: Takashi Iwai commit 3f683d6175748ef9daf4698d9ef5a488dd037063 Author: Herbert Xu Date: Wed Feb 18 16:56:59 2009 +0800 crypto: api - Fix crypto_alloc_tfm/create_create_tfm return convention This is based on a report and patch by Geert Uytterhoeven. The functions crypto_alloc_tfm and create_create_tfm return a pointer that needs to be adjusted by the caller when successful and otherwise an error value. This means that the caller has to check for the error and only perform the adjustment if the pointer returned is valid. Since all callers want to make the adjustment and we know how to adjust it ourselves, it's much easier to just return adjusted pointer directly. The only caveat is that we have to return a void * instead of struct crypto_tfm *. However, this isn't that bad because both of these functions are for internal use only (by types code like shash.c, not even algorithms code). This patch also moves crypto_alloc_tfm into crypto/internal.h (crypto_create_tfm is already there) to reflect this. Signed-off-by: Herbert Xu commit ff753308d2f70f210ba468492cd9a01274d9d7ce Author: Herbert Xu Date: Tue Feb 17 20:18:34 2009 +0800 crypto: api - crypto_alg_mod_lookup either tested or untested As it stands crypto_alg_mod_lookup will search either tested or untested algorithms, but never both at the same time. However, we need exactly that when constructing givcipher and aead so this patch adds support for that by setting the tested bit in type but clearing it in mask. This combination is currently unused. Signed-off-by: Herbert Xu commit 049359d655277c382683a6030ae0bac485568ffc Author: James Hsiao Date: Thu Feb 5 16:18:13 2009 +1100 crypto: amcc - Add crypt4xx driver This patch adds support for AMCC ppc4xx security device driver. This is the initial release that includes the driver framework with AES and SHA1 algorithms support. The remaining algorithms will be released in the near future. Signed-off-by: James Hsiao Signed-off-by: Herbert Xu commit 5b07bd57016fb1033c678746f90bfc3c12d3e494 Author: Neil Horman Date: Thu Feb 5 16:03:04 2009 +1100 crypto: ansi_cprng - Add maintainer Add myself as the maintainer for the CPRNG. Herbert shouldn't deal with it alone if (when?) it breaks :) Signed-off-by: Neil Horman Signed-off-by: Herbert Xu commit c5b1e545a567c52081239bd5d187669640d0146f Author: Neil Horman Date: Thu Feb 5 16:01:38 2009 +1100 crypto: ansi_cprng - Panic on CPRNG test failure when in FIPS mode FIPS 140-2 specifies that all access to various cryptographic modules be prevented in the event that any of the provided self tests fail on the various implemented algorithms. We already panic when any of the test in testmgr.c fail when we are operating in fips mode. The continuous test in the cprng here was missed when that was implmented. This code simply checks for the fips_enabled flag if the test fails, and warns us via syslog or panics the box accordingly. Signed-off-by: Neil Horman Signed-off-by: Herbert Xu commit 563f346d04e8373739240604a51ce8529dd9f07e Author: Herbert Xu Date: Sun Jan 18 20:33:33 2009 +1100 crypto: sha-s390 - Switch to shash This patch converts the S390 sha algorithms to the new shash interface. With fixes by Jan Glauber. Signed-off-by: Herbert Xu commit 9749598633efc2561224954217ff0d70aeed8b50 Author: Herbert Xu Date: Tue Feb 3 12:47:44 2009 +1100 crypto: shash - Add crypto_shash_blocksize This function is needed by algorithms that don't know their own block size, e.g., in s390 where the code is common between multiple versions of SHA. Signed-off-by: Herbert Xu commit d7992f42c61d5dc6d164f7dddd05284485204ada Author: Neil Horman Date: Wed Jan 28 15:20:51 2009 +1100 crypto: ansi_cprng - Force reset on allocation Pseudo RNGs provide predictable outputs based on input parateters {key, V, DT}, the idea behind them is that only the user should know what the inputs are. While its nice to have default known values for testing purposes, it seems dangerous to allow the use of those default values without some sort of safety measure in place, lest an attacker easily guess the output of the cprng. This patch forces the NEED_RESET flag on when allocating a cprng context, so that any user is forced to reseed it before use. The defaults can still be used for testing, but this will prevent their inadvertent use, and be more secure. Signed-off-by: Neil Horman Signed-off-by: Herbert Xu commit 54b6a1bd5364aca95cd6ffae00f2b64c6511122c Author: Huang Ying Date: Sun Jan 18 16:28:34 2009 +1100 crypto: aes-ni - Add support to Intel AES-NI instructions for x86_64 platform Intel AES-NI is a new set of Single Instruction Multiple Data (SIMD) instructions that are going to be introduced in the next generation of Intel processor, as of 2009. These instructions enable fast and secure data encryption and decryption, using the Advanced Encryption Standard (AES), defined by FIPS Publication number 197. The architecture introduces six instructions that offer full hardware support for AES. Four of them support high performance data encryption and decryption, and the other two instructions support the AES key expansion procedure. The white paper can be downloaded from: http://softwarecommunity.intel.com/isn/downloads/intelavx/AES-Instructions-Set_WP.pdf AES may be used in soft_irq context, but MMX/SSE context can not be touched safely in soft_irq context. So in_interrupt() is checked, if in IRQ or soft_irq context, the general x86_64 implementation are used instead. Signed-off-by: Huang Ying Signed-off-by: Herbert Xu commit 1cac2cbc76b9f3fce0d4ccc374e724e7f2533a47 Author: Huang Ying Date: Sun Jan 18 16:19:46 2009 +1100 crypto: cryptd - Add support to access underlying blkcipher cryptd_alloc_ablkcipher() will allocate a cryptd-ed ablkcipher for specified algorithm name. The new allocated one is guaranteed to be cryptd-ed ablkcipher, so the blkcipher underlying can be gotten via cryptd_ablkcipher_child(). Signed-off-by: Huang Ying Signed-off-by: Herbert Xu commit 1693531e9ef11959300617c68a8322ad006b5475 Author: Herbert Xu Date: Wed Jan 14 13:34:48 2009 +1100 crypto: shash - Remove superfluous check in init_tfm We're currently checking the frontend type in init_tfm. This is completely pointless because the fact that we're called at all means that the frontend is ours so the type must match as well. Signed-off-by: Herbert Xu commit 07bf44f86989f5ed866510374fe761d1903681fb Author: Huang Ying Date: Fri Jan 9 17:25:50 2009 +1100 crypto: aes - Export x86 AES encrypt/decrypt functions Intel AES-NI AES acceleration instructions touch XMM state, to use that in soft_irq context, general x86 AES implementation is used as fallback. The first parameter is changed from struct crypto_tfm * to struct crypto_aes_ctx * to make it easier to deal with 16 bytes alignment requirement of AES-NI implementation. Signed-off-by: Huang Ying Signed-off-by: Herbert Xu commit 109568e110ed67d4be1b28609b9fa00fca97f8eb Author: Huang Ying Date: Fri Jan 9 16:49:30 2009 +1100 crypto: aes - Move key_length in struct crypto_aes_ctx to be the last field The Intel AES-NI AES acceleration instructions need key_enc, key_dec in struct crypto_aes_ctx to be 16 byte aligned, it make this easier to move key_length to be the last one. Signed-off-by: Huang Ying Signed-off-by: Herbert Xu commit 39754f441055c861da403d4e9a67ed80f242a4b4 Author: Dhananjay Phadke Date: Tue Feb 17 20:27:02 2009 -0800 netxen: ratelimit error prints If for some reason, read from card memory fails the console get flooded with failure prints. This patch confines print under printk_ratelimit(). Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit d8313ce0f148e648d4e515db5d2c65bbd44fe29e Author: Dhananjay Phadke Date: Tue Feb 17 20:26:44 2009 -0800 netxen: fix sparse warnings Fix following sparse warnings (multiple instances) warning: restricted degrades to integer warning: cast to restricted type warning: incorrect type in argument 3 (different signedness) warning: context imbalance in 'netxen_nic_hw_write_wx_2M' - different lock contexts for basic block Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit ef38fa77786584c630f5da6696111a6a558c7f23 Author: Dhananjay Phadke Date: Tue Feb 17 20:26:22 2009 -0800 netxen: remove superfluous doorbell map For NX3031 pci doorbells are not used. If unnecessary mapping of doorbell space fails, pci probe bails out. Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit ad7bf428328d360b54e0d5f5fc7a9c0a6cf3b7fe Author: Hannes Eder Date: Sun Feb 15 02:13:01 2009 +0000 drivers/net/tokenring: fix sparse warning: cast truncates bits from const value Impact: Remove the write-only field 'current_ring_status' completely. Fix this sparse warnings: drivers/net/tokenring/smctr.c:4410:52: warning: cast truncates bits from constant value (100 becomes 0) drivers/net/tokenring/smctr.c:4415:52: warning: cast truncates bits from constant value (400 becomes 0) drivers/net/tokenring/smctr.c:4420:52: warning: cast truncates bits from constant value (800 becomes 0) drivers/net/tokenring/smctr.c:4425:52: warning: cast truncates bits from constant value (1000 becomes 0) drivers/net/tokenring/smctr.c:4430:52: warning: cast truncates bits from constant value (2000 becomes 0) drivers/net/tokenring/smctr.c:4435:52: warning: cast truncates bits from constant value (4000 becomes 0) drivers/net/tokenring/smctr.c:4440:52: warning: cast truncates bits from constant value (8000 becomes 0) Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 7f50ca07fffdfa8f74ff62e54bf569c745e906e5 Author: Hannes Eder Date: Sat Feb 14 11:50:45 2009 +0000 drivers/net/wireless/prism54: fix sparse warning: fix signedness Fix sparse warning: drivers/net/wireless/prism54/isl_ioctl.c:2997:32: warning: incorrect type in argument 2 (different signedness) drivers/net/wireless/prism54/oid_mgt.c:712:42: warning: incorrect type in argument 2 (different signedness) Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit b9da9e9544724ee25af493bf117e2a8413be34a8 Author: Hannes Eder Date: Sat Feb 14 11:50:26 2009 +0000 drivers/net/wireless/ipw2x00: fix sparse warnings: fix signedness Fix this sparse warnings: drivers/net/wireless/ipw2x00/ipw2100.c:1930:43: warning: incorrect type in argument 4 (different signedness) drivers/net/wireless/ipw2x00/ipw2100.c:1938:76: warning: incorrect type in argument 4 (different signedness) drivers/net/wireless/ipw2x00/ipw2100.c:1946:67: warning: incorrect type in argument 4 (different signedness) drivers/net/wireless/ipw2x00/ipw2100.c:1953:72: warning: incorrect type in argument 4 (different signedness) drivers/net/wireless/ipw2x00/ipw2100.c:4071:73: warning: incorrect type in argument 4 (different signedness) drivers/net/wireless/ipw2x00/ipw2100.c:4078:43: warning: incorrect type in argument 4 (different signedness) drivers/net/wireless/ipw2x00/ipw2100.c:4084:67: warning: incorrect type in argument 4 (different signedness) drivers/net/wireless/ipw2x00/ipw2100.c:7141:73: warning: incorrect type in argument 4 (different signedness) drivers/net/wireless/ipw2x00/ipw2100.c:8317:48: warning: incorrect type in argument 4 (different signedness) Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit fc68ed4fd7fdfafbefb270cf44194096156c7943 Author: Hannes Eder Date: Sat Feb 14 11:50:06 2009 +0000 drivers/net/wireless/b43: fix warning: format not a string literal and no ... Fix this compilation warning: drivers/net/wireless/b43/main.c: In function 'b43_print_fw_helptext': drivers/net/wireless/b43/main.c:1971: warning: format not a string literal and no format arguments drivers/net/wireless/b43/main.c:1973: warning: format not a string literal and no format arguments Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 93f726a90d1446c9e5a40fe8f88086542b273e7c Author: Hannes Eder Date: Sat Feb 14 11:49:48 2009 +0000 drivers/net/wireless/ath9k: fix sparse warnings: Should it be static? Impact: Make symbols static. Fix this sparse warnings: drivers/net/wireless/ath9k/eeprom.c:1343:5: warning: symbol 'ath9k_hw_4k_get_spur_channel' was not declared. Should it be static? drivers/net/wireless/ath9k/eeprom.c:1372:19: warning: symbol 'eep_4k_ops' was not declared. Should it be static? drivers/net/wireless/ath9k/eeprom.c:2649:5: warning: symbol 'ath9k_hw_def_get_spur_channel' was not declared. Should it be static? drivers/net/wireless/ath9k/eeprom.c:2678:19: warning: symbol 'eep_def_ops' was not declared. Should it be static? Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 9e05a2df09e91bfe50d16ff96cc208708599185c Author: Hannes Eder Date: Sat Feb 14 11:49:26 2009 +0000 drivers/net/wireless: fix sparse warnings: fix signedness Fix this sparse warnings: drivers/net/wireless/airo.c:2102:21: warning: incorrect type in initializer (different signedness) drivers/net/wireless/airo.c:2126:21: warning: incorrect type in initializer (different signedness) drivers/net/wireless/airo.c:2167:21: warning: incorrect type in initializer (different signedness) drivers/net/wireless/airo.c:2191:21: warning: incorrect type in initializer (different signedness) Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 49c4a5dceaff63c3080b3c9d311c1c023c3003af Author: Hannes Eder Date: Sat Feb 14 11:49:09 2009 +0000 drivers/net/wireless: fix sparse warnings: symbol shadows an earlier one Impact: Move variable closer to usage resp. remove redundant variables resp. rename function scope variable. Fix this sparse warnings: drivers/net/wireless/airo.c:3840:29: warning: symbol 'i' shadows an earlier one drivers/net/wireless/airo.c:3751:13: originally declared here drivers/net/wireless/airo.c:3847:29: warning: symbol 'i' shadows an earlier one drivers/net/wireless/airo.c:3751:13: originally declared here drivers/net/wireless/airo.c:3861:21: warning: symbol 'i' shadows an earlier one drivers/net/wireless/airo.c:3751:13: originally declared here drivers/net/wireless/wavelan.c:43:13: warning: symbol 'irq' shadows an earlier one drivers/net/wireless/wavelan.p.h:692:17: originally declared here Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit b1ae1e99bd9f611f16a09c1bca2a0a38e67b88c3 Author: Hannes Eder Date: Sat Feb 14 11:48:44 2009 +0000 drivers/net/wireless: fix sparse warning: context imbalance Impact: Attribute function with __acquires(...) resp. __releases(...). Fix this sparse warnings: drivers/net/wireless/strip.c:955:21: warning: context imbalance in 'strip_seq_start' - wrong count at exit drivers/net/wireless/strip.c:975:13: warning: context imbalance in 'strip_seq_stop' - unexpected unlock Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 5ed1e981bd243d78f95738a355bd117cf1f6daa1 Author: Hannes Eder Date: Sat Feb 14 11:48:25 2009 +0000 drivers/net/wan: fix sparse warning: symbol shadows an earlier one Impact: Rename function scope variable and while being at it fix some coding style issues. Fix this sparse warning: drivers/net/wan/sbni.c:1526:14: warning: symbol 'num' shadows an earlier one drivers/net/wan/sbni.c:160:13: originally declared here Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 5ee0d59335c551b7d3642f071bb4f3a30c287f59 Author: Hannes Eder Date: Sat Feb 14 11:48:07 2009 +0000 drivers/net/wan: fix warning: format not a string literal and no ... Impact: Use 'static const char[]' instead of 'static char[]'. Fix this compilation warnings: drivers/net/wan/lapbether.c: In function 'lapbeth_init_driver': drivers/net/wan/lapbether.c:441: warning: format not a string literal and no format arguments drivers/net/wan/z85230.c: In function 'z85230_init_driver': drivers/net/wan/z85230.c:1782: warning: format not a string literal and no format arguments Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 0227abc9d011892fd13f360b56a7b276ebea8b07 Author: Hannes Eder Date: Sat Feb 14 11:47:47 2009 +0000 drivers/net/usb: fix sparse warnings: Should it be static? Impact: Make symbols static. Fix this sparse warnings: drivers/net/usb/hso.c:1249:6: warning: symbol 'hso_unthrottle_tasklet' was not declared. Should it be static? drivers/net/usb/hso.c:1268:6: warning: symbol 'hso_unthrottle_workfunc' was not declared. Should it be static? drivers/net/usb/hso.c:1466:5: warning: symbol 'tiocmget_submit_urb' was not declared. Should it be static? drivers/net/usb/smsc95xx.c:62:5: warning: symbol 'turbo_mode' was not declared. Should it be static? Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit de2f19daac017301b0bfd73bdecff89e7ea30eb7 Author: Hannes Eder Date: Sat Feb 14 11:47:30 2009 +0000 drivers/net/tulip: fix sparse warning: symbol shadows an earlier one Impact: Rename a local variable resp. remove a redundant variable and while being at it use more unform loop constructs. Fix this sparse warning: drivers/net/tulip/de4x5.c:3944:13: warning: symbol 'i' shadows an earlier one drivers/net/tulip/de4x5.c:3938:9: originally declared here drivers/net/tulip/media.c:72:21: warning: symbol 'i' shadows an earlier one drivers/net/tulip/media.c:54:13: originally declared here drivers/net/tulip/media.c:134:21: warning: symbol 'i' shadows an earlier one drivers/net/tulip/media.c:117:13: originally declared here Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 65d9b8b19dd21eeff8c051484b9e972e0b932ff2 Author: Hannes Eder Date: Sat Feb 14 11:46:59 2009 +0000 drivers/net/tulip: fix warning: format not a string literal and no ... Impact: Use 'static const char[]' instead of 'static char[]' and while being at it add a KERN_INFO prefix. Fix this warning: drivers/net/tulip/de4x5.c: In function 'de4x5_hw_init': drivers/net/tulip/de4x5.c:1268: warning: format not a string literal and no format arguments drivers/net/tulip/winbond-840.c: In function 'w840_init': drivers/net/tulip/winbond-840.c:1666: warning: format not a string literal and no format arguments Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 05076c1824a5cc164c3d714f7b16ac61cb9bbbf5 Author: Hannes Eder Date: Sat Feb 14 11:44:44 2009 +0000 drivers/net/tokenring: fix sparse warning: symbol shadows an earlier one Impact: Remove redundant variables. Fix this sparse warnings: drivers/net/tokenring/lanstreamer.c:619:21: warning: symbol 'i' shadows an earlier one drivers/net/tokenring/lanstreamer.c:589:13: originally declared here drivers/net/tokenring/madgemc.c:695:34: warning: symbol 'tp' shadows an earlier one drivers/net/tokenring/madgemc.c:689:26: originally declared here drivers/net/tokenring/olympic.c:702:21: warning: symbol 'i' shadows an earlier one drivers/net/tokenring/olympic.c:440:13: originally declared here Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 1770e430ca1361fb8143c328037d1a3f34391602 Author: Hannes Eder Date: Sat Feb 14 11:44:19 2009 +0000 drivers/net/tokenring: fix warning: format not a string literal and no ... Impact: Use 'static const char[]' instead of 'static char[]'. Fix this warnings: drivers/net/tokenring/smctr.c:3644: warning: format not a string literal and no format arguments Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 6e470d261326801ff823a3b7a49581a8baae8698 Author: Hannes Eder Date: Sat Feb 14 11:43:15 2009 +0000 drivers/net/skfp: fix sparse warning: Should it be static? Impact: Move function declarations to header file. Fix this sparse warnings: drivers/net/skfp/cfm.c:146:6: warning: symbol 'all_selection_criteria' was not declared. Should it be static? drivers/net/skfp/drvfbi.c:186:6: warning: symbol 'mac1_irq' was not declared. Should it be static? drivers/net/skfp/drvfbi.c:284:6: warning: symbol 'read_address' was not declared. Should it be static? drivers/net/skfp/drvfbi.c:323:6: warning: symbol 'init_board' was not declared. Should it be static? drivers/net/skfp/fplustm.c:72:24: warning: symbol 'fddi_broadcast' was not declared. Should it be static? drivers/net/skfp/fplustm.c:679:6: warning: symbol 'mac2_irq' was not declared. Should it be static? drivers/net/skfp/fplustm.c:805:6: warning: symbol 'mac3_irq' was not declared. Should it be static? drivers/net/skfp/fplustm.c:856:5: warning: symbol 'init_fplus' was not declared. Should it be static? drivers/net/skfp/pcmplc.c:404:6: warning: symbol 'init_plc' was not declared. Should it be static? drivers/net/skfp/pcmplc.c:1592:5: warning: symbol 'pcm_status_twisted' was not declared. Should it be static? drivers/net/skfp/smtinit.c:68:5: warning: symbol 'init_smt' was not declared. Should it be static? Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 37d37695ef34b04ecf20586c12ec0c932283a130 Author: Hannes Eder Date: Sat Feb 14 11:41:03 2009 +0000 drivers/net/sfc: fix sparse warning: symbol shadows an earlier one Impact: Move variable declaration as close to their usage as possible. Fix this sparse warning: drivers/net/sfc/tenxpress.c:589:22: warning: symbol 'link_ok' shadows an earlier one drivers/net/sfc/tenxpress.c:575:30: originally declared here Signed-off-by: Hannes Eder Acked-by: Ben Hutchings Signed-off-by: David S. Miller commit 6ae038512ced0f179abd4d2387786cc69d2fb801 Author: Hannes Eder Date: Sat Feb 14 11:39:23 2009 +0000 drivers/net/pcmcia: fix warning: format not a string literal and no ... Impact: Use 'static const char[]' instead of 'static char[]' and while being at it prefix the message with KERN_INFO. Fix this warnings: drivers/net/pcmcia/axnet_cs.c:1716: warning: format not a string literal and no format arguments Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 1aef47c411f4b4b6bb9c8ebcdb703d3a20de1551 Author: Hannes Eder Date: Sat Feb 14 11:38:36 2009 +0000 drivers/net/ixgbe: fix sparse warning: Should it be static? Impact: Make symbol static. Fix this sparse warning: drivers/net/ixgbe/ixgbe_82598.c:59:5: warning: symbol 'ixgbe_get_pcie_msix_count_82598' was not declared. Should it be static? Signed-off-by: Hannes Eder Acked-by: Peter P Waskiewicz Jr Signed-off-by: David S. Miller commit 886a63e865eb346ab20572e802fc3118cb9aee14 Author: Hannes Eder Date: Sat Feb 14 11:36:20 2009 +0000 drivers/net/hamradio: fix sparse warnings: fix signedness Fix this sparse warnings: drivers/net/hamradio/hdlcdrv.c:274:34: warning: incorrect type in argument 2 (different signedness) drivers/net/hamradio/hdlcdrv.c:279:47: warning: incorrect type in argument 2 (different signedness) drivers/net/hamradio/hdlcdrv.c:288:39: warning: incorrect type in argument 2 (different signedness) drivers/net/hamradio/hdlcdrv.c:300:47: warning: incorrect type in argument 2 (different signedness) Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 9b329f18b943fb5648c10f79690918b9056dd5c5 Author: Hannes Eder Date: Sat Feb 14 11:35:35 2009 +0000 drivers/net/hamradio: fix sparse warning: symbol shadows an earlier one Impact: Rename inner scrope variable. Fix this sparse warning: drivers/net/hamradio/yam.c:856:35: warning: symbol 'dev' shadows an earlier one Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit e334f564e83c4aa6db4259b5d7e62d1b5032faf2 Author: Hannes Eder Date: Sat Feb 14 11:34:52 2009 +0000 drivers/net/hamradio: fix sparse warning: context imbalance Impact: Attribute functions with __acquires(...) resp. __releases(...). Fix this sparse warnings: drivers/net/hamradio/bpqether.c:387:13: warning: context imbalance in 'bpq_seq_start' - wrong count at exit drivers/net/hamradio/bpqether.c:419:13: warning: context imbalance in 'bpq_seq_stop' - unexpected unlock Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit eb33ae248682ecfdf44d693c72bc4f523f2fb6e3 Author: Hannes Eder Date: Sat Feb 14 11:33:21 2009 +0000 drivers/net/hamradio: fix warning: format not a string literal and no ... Impact: Use 'static const char[]' instead of 'static char[]' and while being at it fix an issue in 'mkiss_init_driver', where in case of an error the status code was not passed to printk. Fix this warnings: drivers/net/hamradio/6pack.c: In function 'sixpack_init_driver': drivers/net/hamradio/6pack.c:802: warning: format not a string literal and no format arguments drivers/net/hamradio/bpqether.c: In function 'bpq_init_driver': drivers/net/hamradio/bpqether.c:609: warning: format not a string literal and no format arguments drivers/net/hamradio/mkiss.c: In function 'mkiss_init_driver': drivers/net/hamradio/mkiss.c:988: warning: format not a string literal and no format arguments drivers/net/hamradio/mkiss.c:991: warning: format not a string literal and no format arguments drivers/net/hamradio/scc.c: In function 'scc_init_driver': drivers/net/hamradio/scc.c:2109: warning: format not a string literal and no format arguments drivers/net/hamradio/yam.c: In function 'yam_init_driver': drivers/net/hamradio/yam.c:1094: warning: format not a string literal and no format arguments Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit f6370117958d67608225d5e3b55e3ad2080640e8 Author: Hannes Eder Date: Sat Feb 14 11:32:25 2009 +0000 drivers/net/e1000e: fix sparse warning: Should it be static? Impact: Make symbol static. Fix this sparse warning: drivers/net/e1000e/82571.c:1229:5: warning: symbol 'e1000_check_for_serdes_link_82571' was not declared. Should it be static? Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit a243f848ce0e16f7919d683fdfd4c8ea378fe25d Author: Hannes Eder Date: Sat Feb 14 11:16:19 2009 +0000 drivers/net/cxgb3: fix sparse warnings: fix signedness Fix this sparse warning: drivers/net/cxgb3/ael1002.c:1010:60: warning: incorrect type in argument 4 (different signedness) Signed-off-by: Hannes Eder Acked-by: Divy Le Ray Signed-off-by: David S. Miller commit 97915b5bf6454416c7b27444fc95c08132b74251 Author: Hannes Eder Date: Sat Feb 14 11:16:04 2009 +0000 drivers/net/cxgb3: fix sparse warning: symbol shadows an earlier one Impact: Move variable declaration as close to usage as possible. Fix this sparse warning: drivers/net/cxgb3/cxgb3_main.c:1586:21: warning: symbol 'cap' shadows an earlier one Signed-off-by: Hannes Eder Acked-by: Divy Le Ray Signed-off-by: David S. Miller commit 54b87323eddd9b7854249f05cfd183a0ac602ab6 Author: Hannes Eder Date: Sat Feb 14 11:15:49 2009 +0000 drivers/net/bonding: fix sparse warning: symbol shadows an earlier one Impact: Rename function scope variable. Fix this sparse warning: drivers/net/bonding/bond_main.c:4704:13: warning: symbol 'mode' shadows an earlier one drivers/net/bonding/bond_main.c:95:13: originally declared here Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 1f78d9f94539b8806b81057e75025f2bac7d7ccc Author: Hannes Eder Date: Sat Feb 14 11:15:33 2009 +0000 drivers/net/bonding: fix sparse warnings: context imbalance Impact: Attribute functions with __acquires(...) and/or __releases(...). Fix this sparse warnings: drivers/net/bonding/bond_alb.c:1675:9: warning: context imbalance in 'bond_alb_handle_active_change' - unexpected unlock drivers/net/bonding/bond_alb.c:1742:9: warning: context imbalance in 'bond_alb_set_mac_address' - unexpected unlock drivers/net/bonding/bond_main.c:1025:17: warning: context imbalance in 'bond_do_fail_over_mac' - unexpected unlock drivers/net/bonding/bond_main.c:3195:13: warning: context imbalance in 'bond_info_seq_start' - wrong count at exit drivers/net/bonding/bond_main.c:3234:13: warning: context imbalance in 'bond_info_seq_stop' - unexpected unlock Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit b79d8fff0e54a19e96cbde2b1f79e0fd503c2c53 Author: Hannes Eder Date: Sat Feb 14 11:15:17 2009 +0000 drivers/net/atlx: fix sparse warnings: fix signedness Impact: While being at it: statics do not need to be initialized with 0. Fix this sparse warnings: drivers/net/atlx/atl1.c:109:1: warning: incorrect type in initializer (different signedness) drivers/net/atlx/atl2.c:2870:1: warning: incorrect type in initializer (different signedness) drivers/net/atlx/atl2.c:2880:1: warning: incorrect type in initializer (different signedness) drivers/net/atlx/atl2.c:2894:1: warning: incorrect type in initializer (different signedness) drivers/net/atlx/atl2.c:2904:1: warning: incorrect type in initializer (different signedness) drivers/net/atlx/atl2.c:2913:1: warning: incorrect type in initializer (different signedness) Signed-off-by: Hannes Eder Acked-by: Jay Cliburn Signed-off-by: David S. Miller commit fd8ef49edd81405e80e00eb81365ae4d6733d602 Author: Hannes Eder Date: Sat Feb 14 11:14:58 2009 +0000 drivers/net/atl1e: fix sparse warnings: fix signedness Fix this sparse warnings: drivers/net/atl1e/atl1e_main.c:716:39: warning: incorrect type in argument 2 (different signedness) drivers/net/atl1e/atl1e_param.c:57:1: warning: incorrect type in initializer (different signedness) drivers/net/atl1e/atl1e_param.c:68:1: warning: incorrect type in initializer (different signedness) drivers/net/atl1e/atl1e_param.c:81:1: warning: incorrect type in initializer (different signedness) drivers/net/atl1e/atl1e_param.c:92:1: warning: incorrect type in initializer (different signedness) Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 18c4c35ecbeda253ce7532a6ed7f2fa144147d64 Author: Hannes Eder Date: Sat Feb 14 11:14:45 2009 +0000 drivers/net/arcnet: fix sparse warning: symbol shadows an earlier one Impact: Remove redundant inner scope variable. Fix this sparse warning: drivers/net/arcnet/arcnet.c:383:21: warning: symbol 'count' shadows an earlier one drivers/net/arcnet/arcnet.c:375:13: originally declared here Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 8d668bfef68b35f7eedcc70fd5c47cdb24f406cc Author: Hannes Eder Date: Sat Feb 14 11:14:31 2009 +0000 drivers/net/s2io.c: fix sparse warning: symbol shadows an earlier one Impact: Remove redundant inner scope variable. Fix this sparse warning: drivers/net/s2io.c:7223:21: warning: symbol 'i' shadows an earlier one drivers/net/s2io.c:7184:13: originally declared here Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 5b5103ec2dba07a15861e81cb783dd0fbaed24ed Author: Hannes Eder Date: Sat Feb 14 11:14:04 2009 +0000 drivers/net/r6040.c: fix sparse warning: Using plain integer as NULL pointer Fix this sparse warnings: drivers/net/r6040.c:487:31: warning: Using plain integer as NULL pointer drivers/net/r6040.c:492:31: warning: Using plain integer as NULL pointer Signed-off-by: Hannes Eder Acked-by: Florian Fainelli Signed-off-by: David S. Miller commit d6781f2af8567524f8c95d9907718a6c61fe417d Author: Hannes Eder Date: Sat Feb 14 11:13:52 2009 +0000 drivers/net/ppp*.c: fix sparse warnings: fix signedness Fix this sparse warnings: drivers/net/ppp_generic.c:919:43: warning: incorrect type in argument 1 (different signedness) drivers/net/pppoe.c:1195:43: warning: incorrect type in argument 1 (different signedness) drivers/net/pppol2tp.c:2666:43: warning: incorrect type in argument 1 (different signedness) Signed-off-by: Hannes Eder Acked-by: Cyrill Gorcunov Signed-off-by: David S. Miller commit 416c6f90f8a107ccae3788bb9798d10a2dac9ed0 Author: Hannes Eder Date: Sat Feb 14 11:13:39 2009 +0000 drivers/net/ni65.c: fix sparse warnings: fix signedness Fix this sparse warnings: drivers/net/ni65.c:488:36: warning: incorrect type in argument 2 (different signedness) Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 00137dad17707f0d14dbf7e193761220f1c2fe03 Author: Hannes Eder Date: Sat Feb 14 11:13:24 2009 +0000 drivers/net/lance.c: fix sparse warnings: fix signedness Impact: Besides from fixing the signedness issue remove some whitespace to obey to the 80 character limit. Fix this sparse warnings: drivers/net/lance.c:399:19: warning: incorrect type in assignment (different signedness) drivers/net/lance.c:654:29: warning: incorrect type in argument 2 (different signedness) Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 7c34eb897362a51133222ef4229628469333f4d9 Author: Hannes Eder Date: Sat Feb 14 11:12:48 2009 +0000 drivers/net/niu.c: fix sparse warning: symbol shadows an earlier one Impact: Move variable declaration to a more inner scope. Fix this sparse warning: drivers/net/niu.c:2399:21: warning: symbol 'err' shadows an earlier one drivers/net/niu.c:2287:13: originally declared here Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 5d7dce76c51a590fdd7616285a96825aa517ede0 Author: Hannes Eder Date: Sat Feb 14 11:12:36 2009 +0000 drivers/net/ns83820.c: fix sparse warnings: fix signedness Fix this sparse warnings: drivers/net/ns83820.c:479:36: warning: incorrect type in argument 2 (different signedness) drivers/net/ns83820.c:479:36: warning: incorrect type in argument 2 (different signedness) drivers/net/ns83820.c:479:36: warning: incorrect type in argument 2 (different signedness) drivers/net/ns83820.c:479:36: warning: incorrect type in argument 2 (different signedness) Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit fbf978914e8fbc804ddbd68550bb2c7d14b2049d Author: Hannes Eder Date: Sat Feb 14 11:12:23 2009 +0000 drivers/net/ni65.c: fix sparse warnings: symbol shadows an earlier one Impact: Remove redundant variable declaration or move them to a more inner scope. Fix this sparse warnings: drivers/net/ni65.c:900:37: warning: symbol 'p' shadows an earlier one drivers/net/ni65.c:874:21: originally declared here drivers/net/ni65.c:925:21: warning: symbol 'p' shadows an earlier one drivers/net/ni65.c:874:21: originally declared here drivers/net/ni65.c:945:29: warning: symbol 'k' shadows an earlier one drivers/net/ni65.c:926:15: originally declared here Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit f11bf7a31e9a3dccf893e0fceeb1d7d9fd4dfcb4 Author: Hannes Eder Date: Sat Feb 14 11:12:10 2009 +0000 drivers/net/e2100.c: fix sparse warning: symbol shadows an earlier one Impact: Remove redundant inner scope variable and while being at it make use of ARRAY_SIZE instead of a hardcoded number. Fix this sparse warning: drivers/net/e2100.c:219:56: warning: symbol 'i' shadows an earlier one drivers/net/e2100.c:181:13: originally declared here Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 1256f7394cc08c60d4502a2f08d7260f3fd97d56 Author: Hannes Eder Date: Sat Feb 14 11:11:55 2009 +0000 drivers/net/at1700.c: fix sparse warning: symbol shadows an earlier one Impact: Move variable declaration to a more inner scope. Fix this sparse warning: drivers/net/at1700.c:846:21: warning: symbol 'i' shadows an earlier one drivers/net/at1700.c:831:13: originally declared here Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 71d98b4628ee869d62814f6d8607d76cab4b9ec5 Author: Jack Morgenstein Date: Tue Feb 17 14:51:47 2009 -0800 IPoIB: In unicast_arp_send(), only free newly-created paths If path_rec_start() returns error, call path_free() only if the path was newly-created. If we free an existing path whose valid flag was zero, (but do not detach it from the list) we cause corruption of the path list (of which it is a member), and get a kernel crash. The simplest solution is to not free an existing path -- just leave it in the list as-is (i.e., with its valid flag cleared). Thanks to Yossi Etigin of Voltaire for identifying the problem flow which caused the kernel crash. Signed-off-by: Jack Morgenstein Signed-off-by: Moni Shua Signed-off-by: Roland Dreier commit f17c75453b2d195eba0a90d9f16a3ba88c85b3b4 Author: Ingo Molnar Date: Tue Feb 17 20:43:37 2009 +0100 irq: name 'p' variables a bit better 'p' stands for pointer - make it clear in setup_irq() and free_irq() what kind of pointer it is. Cc: Linus Torvalds Signed-off-by: Ingo Molnar commit 8316e38100c70cd1443ac90074eccdd033aa218d Author: Ingo Molnar Date: Tue Feb 17 20:28:29 2009 +0100 irq: further clean up the free_irq() code flow Linus noticed that the 'pp' variable can be eliminated altogether, and the loop can be cleaned up further. Cc: Linus Torvalds Signed-off-by: Ingo Molnar commit 22d22ee5146ae823b1e93fe2887a7cba56015091 Author: Mark Brown Date: Mon Feb 16 19:20:15 2009 +0000 ASoC: Clean up WM8731 bias level configuration The WM8731 bias level configuration function was written slightly obscurely - streamline the code a little and refresh the comments. Signed-off-by: Mark Brown commit 7b317b692a03a870d7acda0a0bd4d211f1c064fe Author: Mark Brown Date: Mon Feb 16 14:08:22 2009 +0000 ASoC: Remove version display from the WM8731 driver It makes boot a bit more noisy and I never remember to update it. Signed-off-by: Mark Brown commit 31b59cf9cebb5bb675f49fe44814bbb7270374cc Author: Paul Fertser Date: Mon Feb 16 02:49:41 2009 +0300 ASoC: Fix WM8753 DAIs unregistering WM8753 uses a tricky way to switch DAIs "on the fly", for that it registers 2 dummy DAIs and substitutes them depending on mixer control. List element of registered dummy DAIs should be preserved to allow unregistering of DAIs on module unload. Signed-off-by: Paul Fertser Signed-off-by: Mark Brown commit cda9043d56cee9fea39e4ee33fd605ae477a1950 Author: Takashi Iwai Date: Tue Feb 17 08:10:54 2009 +0100 ALSA: cs4236 - Merge snd-cs4236-lib module into snd-cs4236 Since cs4232 and cs4236 drivers are merged, there is no reason to keep snd-cs4236-lib module separately. Let's merge it into the main driver as well. Signed-off-by: Takashi Iwai commit b22f5d94c432e97df8d85151fcf3da16cee75f04 Author: Takashi Iwai Date: Tue Feb 17 08:02:16 2009 +0100 sound: OSS: ad1848 - Fix another typo Fix another typo of || and &&. Reported-by: Jörg-Volker Peetz Signed-off-by: Takashi Iwai commit 83807400794a1d680a4fb70a610c5f486e734f45 Author: Takashi Iwai Date: Tue Feb 17 07:59:40 2009 +0100 ALSA: au88x0 - Fix &&|| typo Fixed a typo of || and &&. As it's in a disabled code section, there is no behavior change, though. Reported-by: Jörg-Volker Peetz Signed-off-by: Takashi Iwai commit 426328963078f644c7194403a308588cf684d4c6 Author: Steve Wise Date: Mon Feb 16 21:23:32 2009 -0800 RDMA/cxgb3: Remove modulo math from build_rdma_recv() Remove modulo usage to avoid a divide in the fast path (not all gcc versions do strength reduction here). Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit c844a5d38e4247fc71e371221cf762a2a44d565b Author: Takashi Iwai Date: Mon Feb 16 23:17:33 2009 +0100 ALSA: Fix documentation for snd-cs4236 driver Updated; removal of snd-cs4232 entry. Signed-off-by: Takashi Iwai commit c2b73d1458014a9f461b75bc1756a699a6c0781f Author: Krzysztof Helt Date: Mon Feb 16 21:38:37 2009 +0100 ALSA: cs4236: cs4232 and cs4236 driver merge to solve PnP BIOS detection cs4232 and cs4236 driver merge to solve PnP BIOS detection. Also, the patch adds recognition if the chip is cs4236b+ or earlier part. This unifies drivers for both cs4232 and cs4236+ chips. It allows to use the PnP BIOS detection for the cs4236+ chips. Previously, only the snd-cs4232 could be detected by the PnP BIOS. The cs4232+ cards reports two separate PnP BIOS ids. The patch adds search for the second id to find out resources assigned to a control port. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 96cf45cf559be375de29dd45afc50fa8946fb2aa Merge: 4c9f1d3... b1a0aac... Author: Takashi Iwai Date: Mon Feb 16 23:03:57 2009 +0100 Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge commit c23127566c7a54c8413bf1b99becea76072f467e Author: Takashi Iwai Date: Mon Feb 16 15:20:41 2009 +0100 ALSA: hda - Clean up quirks for HP laptops with AD1984A Clean up quirks for HP laptops with AD1984A using SND_PCI_QUIRK_MASK() Signed-off-by: Takashi Iwai commit 2ae466f8cc522843fa9a456e46007dd98b052b13 Author: Takashi Iwai Date: Mon Feb 16 14:16:36 2009 +0100 ALSA: hda - Cleanup IDT92HD7x HP quirks Clean up IDT92HD7x quirks for HP laptops with SND_PCI_QUIRK_MASK(). Signed-off-by: Takashi Iwai commit 2b8f836fb196acede88b6cc772e9057e0a9c0223 Author: Américo Wang Date: Mon Feb 16 18:54:21 2009 +0800 sched: use TASK_NICE for task_struct #define TASK_NICE(p) PRIO_TO_NICE((p)->static_prio) So it's better to use TASK_NICE here. Signed-off-by: WANG Cong Acked-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit a259cb8eb784352ee9ce46a4fc6cd94fc2fbc68d Author: Roel Kluin Date: Sun Feb 15 20:51:19 2009 +0100 sound: OSS: &&/|| typo in ad1848.c &&/|| typo Signed-off-by: Roel Kluin Signed-off-by: Takashi Iwai commit e23573d7e350b06416f311f0129b945d33492001 Merge: e2ea57a... d14a7e0... Author: Takashi Iwai Date: Mon Feb 16 10:23:35 2009 +0100 Merge branch 'fix/hda' into topic/hda commit e2ea57a8df6da45f5f63ab7b56528a552f36fb72 Author: Herton Ronaldo Krzesinski Date: Mon Feb 16 10:23:00 2009 +0100 ALSA: hda - Fix speaker output on HP DV4 1155-SE Force speaker pin config with model=hp-dv5 model for cases when bios doesn't set it up properly. All reported hp laptops using model=hp-dv5 model have speaker at pin 0x0d with same config, so it's safe to add this within hp-dv5 model. Reference: alsa-devel mailing list thread on http://mailman.alsa-project.org/pipermail/alsa-devel/2009-February/014390.html Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Takashi Iwai commit 1c10c49d83e2062b309cc88e8eb3abb05d397480 Author: Thomas Gleixner Date: Mon Feb 16 00:08:56 2009 -0800 net: replace commatas with semicolons Impact: syntax fix Interestingly enough this compiles w/o any complaints: orphans = percpu_counter_sum_positive(&tcp_orphan_count), sockets = percpu_counter_sum_positive(&tcp_sockets_allocated), Signed-off-by: Thomas Gleixner Signed-off-by: David S. Miller commit 914e1c8b6980c516667375d3e55f0b6e674c8c58 Author: Vlad Yasevich Date: Fri Feb 13 08:33:44 2009 +0000 sctp: Inherit all socket options from parent correctly. During peeloff/accept() sctp needs to save the parent socket state into the new socket so that any options set on the parent are inherited by the child socket. This was found when the parent/listener socket issues SO_BINDTODEVICE, but the data was misrouted after a route cache flush. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit faee47cdbfe8d74a1573c2f81ea6dbb08d735be6 Author: Vlad Yasevich Date: Fri Feb 13 08:33:43 2009 +0000 sctp: Fix the RTO-doubling on idle-link heartbeats SCTP incorrectly doubles rto ever time a Hearbeat chunk is generated. However RFC 4960 states: On an idle destination address that is allowed to heartbeat, it is recommended that a HEARTBEAT chunk is sent once per RTO of that destination address plus the protocol parameter 'HB.interval', with jittering of +/- 50% of the RTO value, and exponential backoff of the RTO if the previous HEARTBEAT is unanswered. Essentially, of if the heartbean is unacknowledged, do we double the RTO. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 4458f04c02a46c679a90ef71f866a415c192deb4 Author: Vlad Yasevich Date: Fri Feb 13 08:33:42 2009 +0000 sctp: Clean up sctp checksumming code The sctp crc32c checksum is always generated in little endian. So, we clean up the code to treat it as little endian and remove all the __force casts. Suggested by Herbert Xu. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 06e868066e3b5828383eb40ff4d1c0029100b0b5 Author: Lucas Nussbaum Date: Fri Feb 13 08:33:41 2009 +0000 sctp: Allow to disable SCTP checksums via module parameter This is a new version of my patch, now using a module parameter instead of a sysctl, so that the option is harder to find. Please note that, once the module is loaded, it is still possible to change the value of the parameter in /sys/module/sctp/parameters/, which is useful if you want to do performance comparisons without rebooting. Computation of SCTP checksums significantly affects the performance of SCTP. For example, using two dual-Opteron 246 connected using a Gbe network, it was not possible to achieve more than ~730 Mbps, compared to 941 Mbps after disabling SCTP checksums. Unfortunately, SCTP checksum offloading in NICs is not commonly available (yet). By default, checksums are still enabled, of course. Signed-off-by: Lucas Nussbaum Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 85e8d004ecbc51ead6ae926e15973b42cf07b36e Author: Alexander Duyck Date: Mon Feb 16 00:00:20 2009 -0800 igb: transition driver to only using advanced descriptors Currently the driver uses advanced descriptors for its main functionality, but then uses legacy when testing. This patch changes this so that advanced descriptors are used throughout and all mentions of legacy descriptors are removed. Signed-off-by: Alexander Duyck Acked-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit cbd347adfee2ba52a8ef85f92a46933d5840cc39 Author: Alexander Duyck Date: Sun Feb 15 23:59:44 2009 -0800 igb: remove unused defines This patch removes all of the unused defines from the .h files contained in igb. For some defines there was a use and so I plugged them into the correct locations. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit bc1cbd3493c7a6b44fa6a1e6040ae3d9640d47c4 Author: Alexander Duyck Date: Fri Feb 13 14:45:17 2009 +0000 igb: misc cleanup to combine one if statement This patch combines a pair of if statements into one. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher CC: Ben Hutchings Signed-off-by: David S. Miller commit 56fbbb4e619f4bf604c350e3948a291bda759101 Author: Alexander Duyck Date: Thu Feb 12 18:17:42 2009 +0000 igb: cleanup incorrect comment and set IP Checksum Enable IP Checksum enable doesn't need packet split in order to function. It only requires the use of advanced descriptors which the current igb driver does. So we can enable it always without any issues. Signed-off-by: Alexander Duyck Acked-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 1e5c3d218ac19d5a5e9b3a8f09777c2b555b2499 Author: Alexander Duyck Date: Thu Feb 12 18:17:21 2009 +0000 igb: reduce size required to trigger low latency Update the Adaptive Interrupt Moderation algorithm so that the low latency state is triggered less easily to prevent high interrupt loads. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 73cd78f1d36da244b8b3b81d3a0f32372a636e5c Author: Alexander Duyck Date: Thu Feb 12 18:16:59 2009 +0000 igb: misc whitespace/formatting cleanups This patch is intended to hold several whitespace, formatting, and comment cleanups that have been found while cleaning up the igb driver. Signed-off-by: Alexander Duyck Acked-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit eaf5d59092dbed853bfab956ce123293832998f5 Author: Lennert Buytenhek Date: Thu Feb 12 14:08:39 2009 +0000 mv643xx_eth: implement Large Receive Offload Controlled by a compile-time (Kconfig) option for now, since it isn't a win in all cases. Signed-off-by: Lennert Buytenhek Signed-off-by: David S. Miller commit b8df184f88f06f985ae58248305ddc257dc016b8 Author: Lennert Buytenhek Date: Thu Feb 12 14:08:07 2009 +0000 mv643xx_eth: allow enabling/disabling tx checksumming via ethtool Signed-off-by: Lennert Buytenhek Signed-off-by: David S. Miller commit d888b3738eba7ebc5844d5977c30e290dfbe435b Author: Lennert Buytenhek Date: Thu Feb 12 14:07:56 2009 +0000 mv643xx_eth: export rx csum get/set methods via ethtool Signed-off-by: Lennert Buytenhek Signed-off-by: David S. Miller commit e7d2f4dbd9224ba50d6d5331bb0538d2ce9027f8 Author: Lennert Buytenhek Date: Thu Feb 12 14:07:37 2009 +0000 mv643xx_eth: implement ethtool rx/tx ring size query and resizing Rename the mp->default_[rt]x_ring_size variables to ->[rt]x_ring_size, allow them to be read via the standard ethtool ->get_ringparam() op, and add a ->set_ringparam() op to allow resizing them at run time. Signed-off-by: Lennert Buytenhek Signed-off-by: David S. Miller commit 3e5080344e95c0861a7ca494288593023ee383c6 Author: Lennert Buytenhek Date: Thu Feb 12 14:07:09 2009 +0000 mv643xx_eth: rework interrupt coalescing, and export via ethtool This patch: - increases the precision of the receive/transmit interrupt coalescing register value computations by using 64bit temporaries; - adds functions to read the current hardware coalescing register values and convert them back to usecs; - exports the {get,set} {rx,tx} coal methods via the standard ethtool coalescing interface. Signed-off-by: Lennert Buytenhek Signed-off-by: David S. Miller commit 6bdf576e4b068e86381280c58393cad42ffc8cc8 Author: Lennert Buytenhek Date: Thu Feb 12 14:06:46 2009 +0000 mv643xx_eth: unify ethtool ops for phy'd and phy-less interfaces It's a waste having two different versions of this structure around when the differences between ethtool ops for phy'd and phy-less interfaces are so minor. Signed-off-by: Lennert Buytenhek Signed-off-by: David S. Miller commit aa611f85d0d656870dbb906e75d8cac6acb58943 Author: Hannes Eder Date: Sat Feb 14 13:10:33 2009 +0000 drivers/isdn/hardware/mISDN: change type of hfc_jiffies to unsigned long Jiffies are unsigned long, make sure we fit in jiffies store variable on archs with bits per long > 32. Patch suggested by Jiri Slaby. Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit f8532fde95c53e8ef2b5ea44542c82c117d28041 Author: Hannes Eder Date: Thu Feb 12 09:32:41 2009 +0000 drivers/isdn/mISDN: fix sparse warnings: make symbols static Fix this sparse warnings: drivers/isdn/mISDN/clock.c:44:1: warning: symbol 'iclock_lock' was not declared. Should it be static? drivers/isdn/mISDN/clock.c:45:9: warning: symbol 'iclock_count' was not declared. Should it be static? drivers/isdn/mISDN/clock.c:46:17: warning: symbol 'iclock_tv' was not declared. Should it be static? drivers/isdn/mISDN/clock.c:47:9: warning: symbol 'iclock_tv_valid' was not declared. Should it be static? drivers/isdn/mISDN/clock.c:48:20: warning: symbol 'iclock_current' was not declared. Should it be static? Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 6c2959aa7b81b83c9c4b4cb822bb7c0a637e869a Author: Hannes Eder Date: Thu Feb 12 09:28:40 2009 +0000 drivers/isdn/hardware/mISDN: fix sparse warnings: make symbols static Fix this sparse warnings: drivers/isdn/hardware/mISDN/hfcpci.c:59:19: warning: symbol 'hfc_tl' was not declared. Should it be static? drivers/isdn/hardware/mISDN/hfcpci.c:60:9: warning: symbol 'hfc_jiffies' was not declared. Should it be static? drivers/isdn/hardware/mISDN/hfcsusb.h:201:6: warning: symbol 'conf_str' was not declared. Should it be static? drivers/isdn/hardware/mISDN/hfcsusb.h:319:12: warning: symbol 'HFC_TE_LAYER1_STATES' was not declared. Should it be static? drivers/isdn/hardware/mISDN/hfcsusb.h:331:12: warning: symbol 'HFC_NT_LAYER1_STATES' was not declared. Should it be static? drivers/isdn/hardware/mISDN/hfcsusb.c:38:12: warning: symbol 'hfcsusb_rev' was not declared. Should it be static? drivers/isdn/hardware/mISDN/hfcsusb.c:978:1: warning: symbol 'fill_isoc_urb' was not declared. Should it be static? drivers/isdn/hardware/mISDN/hfcsusb.c:1724:1: warning: symbol 'setup_hfcsusb' was not declared. Should it be static? Signed-off-by: Hannes Eder Signed-off-by: David S. Miller commit 2b1440230abc8fae0271b012711ecaf64eb38f86 Author: Eilon Greenstein Date: Thu Feb 12 08:38:35 2009 +0000 bnx2x: Version And updating the year Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 356e23850b5ed4471470a918623021765fcaf125 Author: Eilon Greenstein Date: Thu Feb 12 08:38:32 2009 +0000 bnx2x: Clean-up Whitespaces, empty lines, 80 columns, indentations and removing redundant parenthesis Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit f53722514242da8346cbed2223bcea9eed744ebd Author: Eilon Greenstein Date: Thu Feb 12 08:38:30 2009 +0000 bnx2x: Comments and prints Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 9898f86d3927bf3526aef433c8ced0b51178c35c Author: Eilon Greenstein Date: Thu Feb 12 08:38:27 2009 +0000 bnx2x: Re-arrange module parameters Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 359d8b1599050977771190cf938ef010e951ee04 Author: Eilon Greenstein Date: Thu Feb 12 08:38:25 2009 +0000 bnx2x: Moving includes Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 8440d2b63667c7d09ccbe43b8bd928d3c4662879 Author: Eilon Greenstein Date: Thu Feb 12 08:38:22 2009 +0000 bnx2x: Driver dump Re-arrange the driver debug print to support the Tx multi-queue and add support for debug prints at the end of the ring (when start Signed-off-by: David S. Miller commit 0febaa42a3fa90ce9453c67a549525f365b77a9d Author: Eilon Greenstein Date: Thu Feb 12 08:38:20 2009 +0000 bnx2x: Removing unused struct Signed-off-by: Harvey Harrison Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 4781bfad732af717784ee6b5bcdd97f4c3e8f597 Author: Eilon Greenstein Date: Thu Feb 12 08:38:17 2009 +0000 bnx2x: Sparse endianity annotation Resolving the majority of the issues, but there are still some left for future patches. Signed-off-by: Harvey Harrison Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 0626b89971d75b35698f208fd7abe4303e1588b9 Author: Eilon Greenstein Date: Thu Feb 12 08:38:14 2009 +0000 bnx2x: Removing redundant macros Signed-off-by: Harvey Harrison Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 5cd65a93e9335393d5e1f18d35d337b7ba1280f8 Author: Eilon Greenstein Date: Thu Feb 12 08:38:11 2009 +0000 bnx2x: Better struct naming This is the device info from the chip shared memory - rename to avoid confusion Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit b5bf9068ebb1b4012e4c0fef58490f97e6b6a0db Author: Eilon Greenstein Date: Thu Feb 12 08:38:08 2009 +0000 bnx2x: Loopback in diag mode When loading in diag mode, set the device to loopback instead of normal link and then changing it to loopback mode Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 26e029752c8f8671b1de83fe86906fc29f9eda92 Author: Eilon Greenstein Date: Thu Feb 12 08:38:01 2009 +0000 bnx2x: Optimize chip MPS configuration Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit cfb18c5cb7ef5506a2864f9ec360cbb2ca6e8d28 Author: Eilon Greenstein Date: Thu Feb 12 08:37:57 2009 +0000 bnx2x: Memory clean up on failure Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 3ce2c3f9a30dd7756dcbe2322841754f18f098f0 Author: Eilon Greenstein Date: Thu Feb 12 08:37:52 2009 +0000 bnx2x: Using nvram default WoL config The driver default WoL setting is set to the nvram default value Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 3e5b510eb8c9ea5f762e0a0a9ce59254d6671dce Author: Eilon Greenstein Date: Thu Feb 12 08:37:25 2009 +0000 bnx2x: smp_mb and not just smp_rmb Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 8b3a0f0ba3c6c26330b49db178de3898a54f9f8a Author: Eilon Greenstein Date: Thu Feb 12 08:37:23 2009 +0000 bnx2x: Increasing FW timeout When enabling many debug prints, it can take a while before processing an event. To ease the debug process, allow bigger timeout before giving up Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 36e552ab1a51067c5ff8de63416e3fcf2c86a7bf Author: Eilon Greenstein Date: Thu Feb 12 08:37:21 2009 +0000 bnx2x: Returning EBUSY in debug mode as well Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 8d5726c404fd41fedb7a49e1fbef62c60754021a Author: Eilon Greenstein Date: Thu Feb 12 08:37:19 2009 +0000 bnx2x: Manual setting for MRRS Allows better debug capabilities if the user wants to force an MRRS value Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 052a38e096dece43e38a19a896ae7ad019415bc1 Author: Eilon Greenstein Date: Thu Feb 12 08:37:16 2009 +0000 bnx2x: Using registers name Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit c2c8b03e200bdda3ba23d27f5c33bac784dced01 Author: Eilon Greenstein Date: Thu Feb 12 08:37:14 2009 +0000 bnx2x: Pre emphasis configuration Supporting non-default pre-emphasis settings for the internal and some external PHYs Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit ed8680a7e68fc07d6b2bfa977e8f5f3d3c568d14 Author: Eilon Greenstein Date: Thu Feb 12 08:37:12 2009 +0000 bnx2x: GMII not SGMII Fixing the function name Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 3a36f2efbf9ac5da1d08cb44d237ba35ec354888 Author: Eilon Greenstein Date: Thu Feb 12 08:37:09 2009 +0000 bnx2x: Removing CL73 code This code is disabled, so removing it to avoid confusion Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit c1b7399027254a45a4036c548c13eb97c7d0d8fa Author: Eilon Greenstein Date: Thu Feb 12 08:37:07 2009 +0000 bnx2x: Using the HW 5th lane This 1G interface (on top of the 4 lanes 10G interface) requires additional setting to work in CL45 Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 811a2f2d3be9a39bd4e0930501fda8630857748d Author: Eilon Greenstein Date: Thu Feb 12 08:37:04 2009 +0000 bnx2x: EMAC reset The NIG_ENABLE does not reset the emac. Replace it with explicit reset Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit a35da8dbf1ff403633bb6256fba691b224f17f61 Author: Eilon Greenstein Date: Thu Feb 12 08:37:02 2009 +0000 bnx2x: Saving PHY FW version Some PHYs (like the BCM8726) FW version cannot be read after activating the PHY, so we need to save this information Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 285771852891b52a740b4ab2f2903cbfef5ec6a9 Author: Eilon Greenstein Date: Thu Feb 12 08:37:00 2009 +0000 bnx2x: Supporting BCM8481 PHY Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 46c6a67495b3ec76204db800fc8d60a260f91cfe Author: Eilon Greenstein Date: Thu Feb 12 08:36:58 2009 +0000 bnx2x: PHY lock list Some dual port PHY require HW lock since they are used by both interfaces (different driver instances). Since this list is getting longer, update a parameter at load time instead of calculating it on runtime Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 589abe3a0f594a7707a15674ca9e80370c972832 Author: Eilon Greenstein Date: Thu Feb 12 08:36:55 2009 +0000 bnx2x: Supporting BCM8726 PHY Also adding the ability to recognize the optic module and disable it if it is not authorized for safety reasons - since this feature might upset some users which are willing to take the risk, it is optional and can be disabled by setting an nvram bit (or a trivial driver patch to set this bit). This dual port PHY requires special handling if the ports are swapped. Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 4acac6a53a3c9dfc604a9a8647f16b0242080e93 Author: Eilon Greenstein Date: Thu Feb 12 08:36:52 2009 +0000 bnx2x: GPIO accessories A GPIO is used with the 8726 PHY. Adding the GPIO related functions in this Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 87942b467880fb65381af87a5ff61fdb7ede5eb3 Author: Eilon Greenstein Date: Thu Feb 12 08:36:49 2009 +0000 bnx2x: Removing redundant device parameters Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 35b19ba51c1e6258a338a0855c72384abc33ce11 Author: Eilon Greenstein Date: Thu Feb 12 08:36:47 2009 +0000 bnx2x: Removing the board type There are too many different board types and this field is not scalable. Removing it and making decisions according to other fields Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 1c06328c0345638ea7532b45cadfe713c9e9781e Author: Eilon Greenstein Date: Thu Feb 12 08:36:43 2009 +0000 bnx2x: Flow control enhancement Setting better HW thresholds and enabling FW capabilities for better enforcement. Also set the HW to more efficiently use the internal buffers if this is a single port design Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 8a1c38d17d88c8df3dcbea1c01a390ab2087f8ad Author: Eilon Greenstein Date: Thu Feb 12 08:36:40 2009 +0000 bnx2x: BW shaper enhancements Some of the configuration can be set when loading the device and shouldn't be re-calculated after each link up indication since it is not dependent on the link speed Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 748e543974eec6afb1f55f8430781150d0da8b0a Author: Eilon Greenstein Date: Thu Feb 12 08:36:37 2009 +0000 bnx2x: Moving skb_record_rx_queue Should be called for all incoming packets and not just for GRO packets Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit de832a55d28bdcc38a3f3c160554d2dfa5a62069 Author: Eilon Greenstein Date: Thu Feb 12 08:36:33 2009 +0000 bnx2x: Per queue statistics Re-ordering the statistics to enhance readability and adding per queue statistics (available via ethtool -S) Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit d3d4f49527249e87d11219a22469dff25b674c08 Author: Eilon Greenstein Date: Thu Feb 12 08:36:27 2009 +0000 bnx2x: Removing microcode assertion check This check is unreliable since latest MC can issue warnings on rare occasions which are not fatal errors Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit f1ef27ef42dc946a255de4cc7b878630011735d8 Author: Eilon Greenstein Date: Thu Feb 12 08:36:23 2009 +0000 bnx2x: Disabling interrupts after iSCSI-boot Before initializing the chip after iSCSI boot, the interrupts of the function that was used to boot must be disabled. That means that the driver needs to set the chip as if it is the iSCSI PCI function - this bug is exposed only with MSI Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 0f00846deb9c9eaaeb4668b81496b783a04a241f Author: Eilon Greenstein Date: Thu Feb 12 08:36:18 2009 +0000 bnx2x: System-page alignment Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 8badd27aa0d7c02572fcd1a4a3c6b57d67f40b78 Author: Eilon Greenstein Date: Thu Feb 12 08:36:15 2009 +0000 bnx2x: MSI support Enabling MSI on top of MSI-X and INTA. Also changing the module parameter to allow choosing INTA or MSI even when MSI-X is available. The default status block should not be reversed for endianity. Since MSI can issue re-configuration, the interrupt disable function now requires mmiowb Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 555f6c78373f969f14487253abe331d085449360 Author: Eilon Greenstein Date: Thu Feb 12 08:36:11 2009 +0000 bnx2x: Multi-queue Adding Tx multi-queue and enabling multi-queue by default Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 8d9c5f34a25d6a30d15a800d83a3428ad44271d8 Author: Eilon Greenstein Date: Sun Feb 15 23:24:08 2009 -0800 bnx2x: New FW This is the FW blob and the relevant definitions without any logic. It also contains the minimal mandatory code changes to work with this FW but it does not contain enabling of the new features that this FW provides. This FW is needed for: - More efficient multi-queue - per queue statistics - Big-endian issue with MSI - Improved pause response Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 33af6bcc005a826726b48e8775df5d58112bc10b Author: Patrick Ohly Date: Thu Feb 12 05:03:43 2009 +0000 igb: use timecompare to implement hardware time stamping Both TX and RX hardware time stamping are implemented. Due to hardware limitations it is not possible to verify reliably which packet was time stamped when multiple were pending for sending; this could be solved by only allowing one packet marked for hardware time stamping into the queue (not implemented yet). RX time stamping relies on the flag in the packet descriptor which marks packets that were time stamped. In "all packet" mode this flag is not set. TODO: also support that mode (even though it'll suffer from race conditions). Signed-off-by: John Ronciak Signed-off-by: Patrick Ohly Signed-off-by: David S. Miller commit c6cb090ba7cd88aec03718dab76e4dad56862cae Author: Patrick Ohly Date: Thu Feb 12 05:03:42 2009 +0000 igb: stub support for SIOCSHWTSTAMP Signed-off-by: John Ronciak Signed-off-by: Patrick Ohly Signed-off-by: David S. Miller commit 38c845c7648ee354fd1d2fb8a7fbc352f2d3dcc3 Author: Patrick Ohly Date: Thu Feb 12 05:03:41 2009 +0000 igb: access to NIC time Adds the register definitions and code to read the time register. Signed-off-by: John Ronciak Signed-off-by: Patrick Ohly Signed-off-by: David S. Miller commit d24fff22d8dba13cc21034144f68f213415cb7c8 Author: Patrick Ohly Date: Thu Feb 12 05:03:40 2009 +0000 net: pass new SIOCSHWTSTAMP through to device drivers Signed-off-by: Patrick Ohly Signed-off-by: David S. Miller commit 51f31cabe3ce5345b51e4a4f82138b38c4d5dc91 Author: Patrick Ohly Date: Thu Feb 12 05:03:39 2009 +0000 ip: support for TX timestamps on UDP and RAW sockets Instructions for time stamping outgoing packets are take from the socket layer and later copied into the new skb. Signed-off-by: Patrick Ohly Signed-off-by: David S. Miller commit 20d4947353be60e909e6b1a79d241457edd6833f Author: Patrick Ohly Date: Thu Feb 12 05:03:38 2009 +0000 net: socket infrastructure for SO_TIMESTAMPING The overlap with the old SO_TIMESTAMP[NS] options is handled so that time stamping in software (net_enable_timestamp()) is enabled when SO_TIMESTAMP[NS] and/or SO_TIMESTAMPING_RX_SOFTWARE is set. It's disabled if all of these are off. Signed-off-by: Patrick Ohly Signed-off-by: David S. Miller commit ac45f602ee3d1b6f326f68bc0c2591ceebf05ba4 Author: Patrick Ohly Date: Thu Feb 12 05:03:37 2009 +0000 net: infrastructure for hardware time stamping The additional per-packet information (16 bytes for time stamps, 1 byte for flags) is stored for all packets in the skb_shared_info struct. This implementation detail is hidden from users of that information via skb_* accessor functions. A separate struct resp. union is used for the additional information so that it can be stored/copied easily outside of skb_shared_info. Compared to previous implementations (reusing the tstamp field depending on the context, optional additional structures) this is the simplest solution. It does not extend sk_buff itself. TX time stamping is implemented in software if the device driver doesn't support hardware time stamping. The new semantic for hardware/software time stamping around ndo_start_xmit() is based on two assumptions about existing network device drivers which don't support hardware time stamping and know nothing about it: - they leave the new skb_shared_tx unmodified - the keep the connection to the originating socket in skb->sk alive, i.e., don't call skb_orphan() Given that skb_shared_tx is new, the first assumption is safe. The second is only true for some drivers. As a result, software TX time stamping currently works with the bnx2 driver, but not with the unmodified igb driver (the two drivers this patch series was tested with). Signed-off-by: Patrick Ohly Signed-off-by: David S. Miller commit cb9eff097831007afb30d64373f29d99825d0068 Author: Patrick Ohly Date: Thu Feb 12 05:03:36 2009 +0000 net: new user space API for time stamping of incoming and outgoing packets User space can request hardware and/or software time stamping. Reporting of the result(s) via a new control message is enabled separately for each field in the message because some of the fields may require additional computation and thus cause overhead. User space can tell the different kinds of time stamps apart and choose what suits its needs. When a TX timestamp operation is requested, the TX skb will be cloned and the clone will be time stamped (in hardware or software) and added to the socket error queue of the skb, if the skb has a socket associated with it. The actual TX timestamp will reach userspace as a RX timestamp on the cloned packet. If timestamping is requested and no timestamping is done in the device driver (potentially this may use hardware timestamping), it will be done in software after the device's start_hard_xmit routine. Signed-off-by: Patrick Ohly Signed-off-by: David S. Miller commit a75244c3d519fcb490ca2bf3f123c98017f1e8d0 Author: Patrick Ohly Date: Thu Feb 12 05:03:35 2009 +0000 timecompare: generic infrastructure to map between two time bases Mapping from a struct timecounter to a time returned by functions like ktime_get_real() is implemented. This is sufficient to use this code in a network device driver which wants to support hardware time stamping and transformation of hardware time stamps to system time. The interface could have been made more versatile by not depending on a time counter, but this wasn't done to avoid writing glue code elsewhere. The method implemented here is the one used and analyzed under the name "assisted PTP" in the LCI PTP paper: http://www.linuxclustersinstitute.org/conferences/archive/2008/PDF/Ohly_92221.pdf Acked-by: John Stultz Signed-off-by: Patrick Ohly Signed-off-by: David S. Miller commit a038a353c3de4040d8445ec568acebdac144436f Author: Patrick Ohly Date: Thu Feb 12 05:03:34 2009 +0000 clocksource: allow usage independent of timekeeping.c So far struct clocksource acted as the interface between time/timekeeping.c and hardware. This patch generalizes the concept so that a similar interface can also be used in other contexts. For that it introduces new structures and related functions *without* touching the existing struct clocksource. The reasons for adding these new structures to clocksource.[ch] are * the APIs are clearly related * struct clocksource could be cleaned up to use the new structs * avoids proliferation of files with similar names (timesource.h? timecounter.h?) As outlined in the discussion with John Stultz, this patch adds * struct cyclecounter: stateless API to hardware which counts clock cycles * struct timecounter: stateful utility code built on a cyclecounter which provides a nanosecond counter * only the function to read the nanosecond counter; deltas are used internally and not exposed to users of timecounter The code does no locking of the shared state. It must be called at least as often as the cycle counter wraps around to detect these wrap arounds. Both is the responsibility of the timecounter user. Acked-by: John Stultz Signed-off-by: Patrick Ohly Signed-off-by: David S. Miller commit e5a3b95f581da62e2054ef79d3be2d383e9ed664 Author: Tetsuo Handa Date: Sat Feb 14 11:46:56 2009 +0900 TOMOYO: Don't create securityfs entries unless registered. TOMOYO should not create /sys/kernel/security/tomoyo/ interface unless TOMOYO is registered. Signed-off-by: Kentaro Takeda Signed-off-by: Tetsuo Handa Signed-off-by: Toshiharu Harada Signed-off-by: James Morris commit a0a522ce3d6d8c907e45d4f2730ee8573484cc88 Author: Henrik Austad Date: Fri Feb 13 20:35:45 2009 +0100 sched: idle_at_tick is only used when CONFIG_SMP is set Impact: struct rq size optimization The idle_at_tick in struct rq is only used in SMP settings and it does not make sense to have this in the rq in an UP setup. Signed-off-by: Henrik Austad Signed-off-by: Ingo Molnar commit 5274f8354d6a1ed9d6688e6a89b705b94aa1b6e9 Merge: ad0b0fd... a0490fa... d2f8d7e... Author: Ingo Molnar Date: Sun Feb 15 21:15:16 2009 +0100 Merge branch 'sched/urgent'; commit 'v2.6.29-rc5' into sched/core commit ae88a23b32fa7e0dc9fa7ce735966e68eb41b0bc Author: Ingo Molnar Date: Sun Feb 15 11:29:50 2009 +0100 irq: refactor and clean up the free_irq() code flow Impact: cleanup - separate out the loop from the actual freeing logic, this wins us two indentation levels allowing a number of followup prettifications - turn the WARN_ON() into a more informative WARN(). - clean up the comments and the code flow some more Cc: Linus Torvalds Signed-off-by: Ingo Molnar commit 327ec5699c29454322d0136375f717f509c145b6 Author: Ingo Molnar Date: Sun Feb 15 11:21:37 2009 +0100 irq: clean up manage.c - make printk message git-greppable - fix a few style details Signed-off-by: Ingo Molnar commit 0a834a36ac92375cd82d9e4fe4f571e257997d6a Author: dave graham Date: Sat Feb 14 23:46:10 2009 -0800 e1000e: Remove mutex_trylock and associated WARN on failure. Single-thread access must be ensured for ICH8 NVM and PHY operations. This synchronization is provided by the nvm_mutex. To assist in understanding the contexts from which this code could be reached, a WARN was output if the mutex was not going to be immediately acquirable (if !mutex_trylock()). The code has now been optimized, and we have verified that the few remaining mutex contentions are reasonable and non-blocking, and it is time to remove the mutex_trylock() and WARN messages. Signed-off-by: dave graham Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 5e30589521518bff36fd2638b3c3d69679c50436 Merge: ac178ef... d2f8d7e... Author: David S. Miller Date: Sat Feb 14 23:12:00 2009 -0800 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ Conflicts: drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl3945-base.c commit ac178ef0ae9eb44fd527d87aa9b6394e05f56e1f Merge: f3a7c66... 6d08b9b... Author: David S. Miller Date: Sat Feb 14 23:06:44 2009 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit f3a7c66b5ce0b75a9774a50b5dcce93e5ba28370 Author: Harvey Harrison Date: Sat Feb 14 22:58:35 2009 -0800 net: replace __constant_{endian} uses in net headers Base versions handle constant folding now. For headers exposed to userspace, we must only expose the __ prefixed versions. Signed-off-by: Harvey Harrison Signed-off-by: David S. Miller commit 35c26c2cf6a6a2d1c48add732d8ba002bd90784c Author: Harvey Harrison Date: Sat Feb 14 22:56:56 2009 -0800 rndis: remove private wrapper of __constant_cpu_to_le32 Use cpu_to_le32 directly as it handles constant folding now, replace direct uses of __constant_cpu_to_{endian} as well. Signed-off-by: Harvey Harrison Acked-by: David Brownell Signed-off-by: David S. Miller commit ab46d779661d7a03b7aa00279eead5dc3f0b3901 Author: Herbert Xu Date: Sat Feb 14 20:46:39 2009 -0800 tun: Fix merge error When forward-porting the tun accounting patch I managed to break the send path compltely by dropping the tun_get call. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 33043cbb9fd49a957089f5948fe814764d7abbd6 Author: Tetsuo Handa Date: Fri Feb 13 16:00:58 2009 +0900 TOMOYO: Fix exception policy read failure. Due to wrong initialization, "cat /sys/kernel/security/tomoyo/exception_policy" returned nothing. Signed-off-by: Kentaro Takeda Signed-off-by: Tetsuo Handa Signed-off-by: Toshiharu Harada Signed-off-by: James Morris commit 26036651c562609d1f52d181f9d2cccbf89929b1 Author: Eric Paris Date: Thu Feb 12 14:51:04 2009 -0500 SELinux: convert the avc cache hash list to an hlist We do not need O(1) access to the tail of the avc cache lists and so we are wasting lots of space using struct list_head instead of struct hlist_head. This patch converts the avc cache to use hlists in which there is a single pointer from the head which saves us about 4k of global memory. Resulted in about a 1.5% decrease in time spent in avc_has_perm_noaudit based on oprofile sampling of tbench. Although likely within the noise.... Signed-off-by: Eric Paris Reviewed-by: Paul Moore Signed-off-by: James Morris commit edf3d1aecd0d608acbd561b0c527e1d41abcb657 Author: Eric Paris Date: Thu Feb 12 14:50:59 2009 -0500 SELinux: code readability with avc_cache The code making use of struct avc_cache was not easy to read thanks to liberal use of &avc_cache.{slots_lock,slots}[hvalue] throughout. This patch simply creates local pointers and uses those instead of the long global names. Signed-off-by: Eric Paris Signed-off-by: James Morris commit f1c6381a6e337adcecf84be2a838bd9e610e2365 Author: Eric Paris Date: Thu Feb 12 14:50:54 2009 -0500 SELinux: remove unused av.decided field It appears there was an intention to have the security server only decide certain permissions and leave other for later as some sort of a portential performance win. We are currently always deciding all 32 bits of permissions and this is a useless couple of branches and wasted space. This patch completely drops the av.decided concept. This in a 17% reduction in the time spent in avc_has_perm_noaudit based on oprofile sampling of a tbench benchmark. Signed-off-by: Eric Paris Reviewed-by: Paul Moore Acked-by: Stephen Smalley Signed-off-by: James Morris commit 21193dcd1f3570ddfd8a04f4465e484c1f94252f Author: Eric Paris Date: Thu Feb 12 14:50:49 2009 -0500 SELinux: more careful use of avd in avc_has_perm_noaudit we are often needlessly jumping through hoops when it comes to avd entries in avc_has_perm_noaudit and we have extra initialization and memcpy which are just wasting performance. Try to clean the function up a bit. This patch resulted in a 13% drop in time spent in avc_has_perm_noaudit in my oprofile sampling of a tbench benchmark. Signed-off-by: Eric Paris Reviewed-by: Paul Moore Acked-by: Stephen Smalley Signed-off-by: James Morris commit 906d27d9d28fd50fb40026e56842d8f6806a7a04 Author: Eric Paris Date: Thu Feb 12 14:50:43 2009 -0500 SELinux: remove the unused ae.used Currently SELinux code has an atomic which was intended to track how many times an avc entry was used and to evict entries when they haven't been used recently. Instead we never let this atomic get above 1 and evict when it is first checked for eviction since it hits zero. This is a total waste of time so I'm completely dropping ae.used. This change resulted in about a 3% faster avc_has_perm_noaudit when running oprofile against a tbench benchmark. Signed-off-by: Eric Paris Reviewed by: Paul Moore Acked-by: Stephen Smalley Signed-off-by: James Morris commit a5dda683328f99c781f92c66cc52ffc0639bef58 Author: Eric Paris Date: Thu Feb 12 14:50:11 2009 -0500 SELinux: check seqno when updating an avc_node The avc update node callbacks do not check the seqno of the caller with the seqno of the node found. It is possible that a policy change could happen (although almost impossibly unlikely) in which a permissive or permissive_domain decision is not valid for the entry found. Simply pass and check that the seqno of the caller and the seqno of the node found match. Signed-off-by: Eric Paris Acked-by: Stephen Smalley Signed-off-by: James Morris commit 4cb912f1d1447077160ace9ce3b3a10696dd74e5 Author: Eric Paris Date: Thu Feb 12 14:50:05 2009 -0500 SELinux: NULL terminate al contexts from disk When a context is pulled in from disk we don't know that it is null terminated. This patch forecebly null terminates contexts when we pull them from disk. Signed-off-by: Eric Paris Acked-by: Stephen Smalley Signed-off-by: James Morris commit 4ba0a8ad63e12a03ae01c039482967cc496b9174 Author: Eric Paris Date: Thu Feb 12 15:01:10 2009 -0500 SELinux: better printk when file with invalid label found Currently when an inode is read into the kernel with an invalid label string (can often happen with removable media) we output a string like: SELinux: inode_doinit_with_dentry: context_to_sid([SOME INVALID LABEL]) returned -22 dor dev=[blah] ino=[blah] Which is all but incomprehensible to all but a couple of us. Instead, on EINVAL only, I plan to output a much more user friendly string and I plan to ratelimit the printk since many of these could be generated very rapidly. Signed-off-by: Eric Paris Acked-by: Stephen Smalley Signed-off-by: James Morris commit 200ac532a4bc3134147ca06686c56a6420e66c46 Author: Eric Paris Date: Thu Feb 12 15:01:04 2009 -0500 SELinux: call capabilities code directory For cleanliness and efficiency remove all calls to secondary-> and instead call capabilities code directly. capabilities are the only module that selinux stacks with and so the code should not indicate that other stacking might be possible. Signed-off-by: Eric Paris Acked-by: Stephen Smalley Signed-off-by: James Morris commit bf3dbe5c8c4b85f98c36d35432efa6573b75e6d3 Author: Kevin Hilman Date: Fri Feb 13 11:36:37 2009 -0800 ASoC: Fix DaVinci module unload error Fix for the error when the audio module is unloaded. On unregistering the platform_device, platform_device_release will free the platform data.If platform data is static the kernel panics when it is freed. Instead use the platform device helper function to add data. This change has been tested on DM644x EVM, DM644x SFFSDR and DM355 EVM. Signed-off-by: Chaithrika U S Signed-off-by: Kevin Hilman Signed-off-by: Mark Brown commit 6d08b9b9c6eb2414c4a037407dd121298a74fb36 Author: Luis R. Rodriguez Date: Tue Feb 10 15:35:27 2009 -0800 ath9k: add udelay() for AR5416 on ath9k_hw_configpcipowersave() We need the udelay() for all families, including AR5416. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 24c1a280c8db6beddbb62662c30b79cd3c8d4d01 Author: Luis R. Rodriguez Date: Tue Feb 10 15:35:22 2009 -0800 ath9k: add comments for ath9k_hw_configpcipowersave() This is used for ASPM. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit a89d03c4230beb50756c98d2d1ba036c83da7680 Author: Reinette Chatre Date: Tue Feb 10 15:19:04 2009 -0800 iwlwifi: fix FAT channel config for 5000 series The test to find out if we have FAT channels do not consider that the value of regulatory_bands for the 5000 series is larger than its eeprom size. Using the eeprom size is strange in itself. Use a new EEPROM_REGULATORY_BAND_NO_FAT to indicate no FAT support and test for that explicitly. Signed-off-by: Reinette Chatre Acked-by: Samuel Ortiz Tested-by: Johannes Berg Signed-off-by: John W. Linville commit 24566f4a15e2626cfaf2854057b636ef40ee8481 Author: Tomas Winkler Date: Tue Feb 10 15:19:03 2009 -0800 iwlwifi: drop PCIe workaround applicable for development boards This patch remove w/a used for development boards. These boards are not available thus no need to keep it inside driver Signed-off-by: Tomas Winkler Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 3fdb68de22c9881691c485b05ed3204bdc431a18 Author: Tomas Winkler Date: Tue Feb 10 15:19:02 2009 -0800 iwlwifi: use pci registers defined in pci_regs.h This patch replaces where possible usage of pci register defined in the driver by ones defined in pci_regs.h Signed-off-by: Tomas Winkler Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit fe3d2c3fe32dd4d0a421ba39caba1cf87402314e Author: Johannes Berg Date: Tue Feb 10 21:26:03 2009 +0100 mac80211: split managed/ibss code a little more It appears that you can completely mess up mac80211 in IBSS mode by sending it a disassoc or deauth: it'll stop queues and do a lot more but not ever do anything again. Fix this by not handling all those frames in IBSS mode, Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit a71800f3e3de15583c5d336aafa2853786be18a2 Author: Johannes Berg Date: Tue Feb 10 21:26:02 2009 +0100 mac80211: fix IBSS auth The code beyond this point is supposed to be used for non-IBSS (managed) mode only. Signed-off-by: Johannes Berg Cc: Jouni Malinen Signed-off-by: John W. Linville commit 9a03d6d7a8698f26f8ef02dd3c91f8f68c4edcc7 Author: Johannes Berg Date: Tue Feb 10 21:26:01 2009 +0100 mac80211: calculate wstats_flags on the fly Just to make wext.c more self-contained. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 00d3f14cf9f12c21428121026a5e1d5f65926447 Author: Johannes Berg Date: Tue Feb 10 21:26:00 2009 +0100 mac80211: use cfg80211s BSS infrastructure Remove all the code from mac80211 to keep track of BSSes and use the cfg80211-provided code completely. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 79420f09e76e8e1dd1149d6ce9c20e06cbb5802a Author: Johannes Berg Date: Tue Feb 10 21:25:59 2009 +0100 cfg80211: add more flexible BSS lookup Add a more flexible BSS lookup function so that mac80211 or other drivers can actually use this for getting the BSS to connect to. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit d491af19db3adcc1eb1653e60a427fb4df36f361 Author: Johannes Berg Date: Tue Feb 10 21:25:58 2009 +0100 cfg80211: allow users to request removing a BSS This patch introduces cfg80211_unlink_bss, a function to allow a driver to remove a BSS from the internal list and make it not show up in scan results any more -- this is to be used when the driver detects that the BSS is no longer available. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 78c1c7e109f1f14e7c18f290c4ebc58da220c7ba Author: Johannes Berg Date: Tue Feb 10 21:25:57 2009 +0100 cfg80211: free_priv for BSS info When cfg80211 users have their own allocated data in the per-BSS private data, they will need to free this when the BSS struct is destroyed. Add a free_priv method and fix one place where the BSS was kfree'd rather than released properly. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 99cf5f5f3571ce3a837e379d3b87bf5ddf54f17d Author: Johannes Berg Date: Tue Feb 10 21:25:56 2009 +0100 mac80211: dont add BSS when creating IBSS There's no need to create a BSS struct only to pass it to ieee80211_sta_join_ibss, so refactor this function into __ieee80211_sta_join_ibss which takes all the relevant paramters, and ieee80211_sta_join_ibss which takes a BSS struct (used when joining an IBSS that already has other members). Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 2a5193119269062608582418deba7af82844159a Author: Johannes Berg Date: Tue Feb 10 21:25:55 2009 +0100 cfg80211/nl80211: scanning (and mac80211 update to use it) This patch adds basic scan capability to cfg80211/nl80211 and changes mac80211 to use it. The BSS list that cfg80211 maintains is made driver-accessible with a private area in each BSS struct, but mac80211 doesn't yet use it. That's another large project. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 849b7967818995a32c3017542e33eb3155944368 Author: Johannes Berg Date: Tue Feb 10 21:25:54 2009 +0100 mac80211: further cleanups to stopping BA sessions Essentially consisting of passing the sta_info pointer around, instead of repeatedly doing hash lookups. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit d75636ef9c1af224f1097941879d5a8db7cd04e5 Author: Johannes Berg Date: Tue Feb 10 21:25:53 2009 +0100 mac80211: RX aggregation: clean up stop session Clean up the locking by splitting it into two functions, this will also enable further cleanups of stopping all sessions. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 2dace10efb8b761ccbd18d524f3b14d823edf8c0 Author: Johannes Berg Date: Tue Feb 10 21:25:52 2009 +0100 mac80211: clean up BA session teardown The sta_info pointer can very well be passed to ieee80211_sta_tear_down_BA_sessions, this will later allow us to pass it through even further. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 55687e380a3965ac448e03281e027553a6ae6dac Author: Johannes Berg Date: Tue Feb 10 21:25:51 2009 +0100 mac80211: fix aggregation timer lockups As far as I can tell, there are possible lockups because both the RX session_timer and TX addba_resp_timer are del_timer_sync'ed under the sta spinlock which both timer functions take. Additionally, the TX agg code seems to leak memory when TX aggregation is not disabled before the sta_info is freed. Fix this by making the free code a little smarter in the RX agg case, and actually make the sta_info_destroy code free the TX agg info in the TX agg case. We won't notify the peer, but it'll notice something is wrong anyway, and normally this only happens after we've told it in some other way we will no longer talk to it. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 23e6a7ea5cb1a902d37ab0c783709c178fa834df Author: Johannes Berg Date: Tue Feb 10 21:25:50 2009 +0100 mac80211: fix race in TX aggregation When disabling TX aggregation because it was rejected or from the timer (it was not accepted), there is a window where we first set the state to operation, unlock, and then undo the whole thing. Avoid that by splitting up the stop function. Also get rid of the pointless sta_info indirection in the timer. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 86ab6c5a6c5204f6c25281b9039330b8f5e9b692 Author: Johannes Berg Date: Tue Feb 10 21:25:49 2009 +0100 mac80211: document TX aggregation (and small cleanup) Add documentation and move ieee80211_start_tx_ba_cb_irqsafe to right after ieee80211_start_tx_ba_cb. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 955d3fe3e8b38de19761e4ac7afdb9d7a33b9566 Author: Johannes Berg Date: Tue Feb 10 21:25:48 2009 +0100 mac80211: hardware should not deny going back to legacy Doing so would be an MLME protocol violation when the peer disabled the aggregation session. Quick driver review indicates that there are error codes passed all over the drivers but cannot ever be nonzero except in error conditions that would indicate mac80211 bugs. No real changes here, since no drivers currently can return -EBUSY. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 8abd3f9bc476b5b7f6de1b6fb576b87ba338f7fd Author: Johannes Berg Date: Tue Feb 10 21:25:47 2009 +0100 mac80211: restrict aggregation to supported interface modes We can only support aggregation on AP/STA right now. HT isn't defined for IBSS, WDS or MESH. In the WDS/MESH cases it's not clear what to put into the IBSS field, and we don't handle that in the code at all. Also fix the code to handle VLAN correctly. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit b8695a8fe6d89140f8d17668e99ebd39358d7c0b Author: Johannes Berg Date: Tue Feb 10 21:25:46 2009 +0100 mac80211: restructure HT code Create two new files, agg-tx.c and agg-rx.c to make it clearer which code is common (ht.c) and which is specific (agg-*.c). Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 20ad19d0ac7389b04b566ebf3e0e497974f63ffa Author: Johannes Berg Date: Tue Feb 10 21:25:45 2009 +0100 mac80211: fix RX aggregation timeouts The values are in TUs (1.024ms), not ms. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 8b1c814d65ae3219ee19d39ad6097f3d5249c23d Author: Johannes Berg Date: Tue Feb 10 21:25:44 2009 +0100 mac80211: remove stray aggregation debugfs definition Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 7ab17c45b566b8a4a87ceac6cd6c6d77857189ab Author: Johannes Berg Date: Tue Feb 10 21:25:43 2009 +0100 mac80211: remove bssid argument from prepare_for_handlers It's a little confusing to get the BSSID outside the function and pass it in, when it's only needed for this function, so change that. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 14b80724367dfdc86f4807461dd1f7f2dd630416 Author: Johannes Berg Date: Tue Feb 10 21:25:42 2009 +0100 mac80211: fix beacon enable more Hopefully the last required fix ... disable beaconing only on beaconing interfaces, and thus avoid calling ieee80211_if_config for purely virtual interfaces (those driver doesn't know about). Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 60b22511921fe79b2a94a27c09cadfd32fcef5d5 Author: Johannes Berg Date: Tue Feb 10 21:25:41 2009 +0100 mac80211: reject extra IEs for probe request when hw_scan We cannot currently hand off extra IEs to hw_scan, so reject configuring extra IEs for probe request frames when hw_scan is set. Signed-off-by: Johannes Berg Cc: Jouni Malinen Signed-off-by: John W. Linville commit e4e5e2b0b83c816e581ca4671569306bcba77667 Author: Johannes Berg Date: Tue Feb 10 21:25:40 2009 +0100 mac80211: properly validate/translate IW_AUTH_MFP values Make sure nobody passes in bogus values, and translate the values (although it isn't necessary). Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit a4727801004f255f589478b2d75ec00f0a9e30c5 Author: Johannes Berg Date: Tue Feb 10 21:25:39 2009 +0100 zd1211rw: honour enable_beacon conf This makes zd1211rw honour enable_beacon, as well as fixing a memory leak: the beacon skb is leaked when configuring it to the hardware fails. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 5e1333624827e7a91b2d2cc04ce978f050cae15e Author: Johannes Berg Date: Tue Feb 10 21:25:38 2009 +0100 mac80211: disable IBSS beacon before join Before we have a probe response frame (which is used as the beacon too) there's no need to ask drivers to beacon, they will not get a beacon anyway. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 570a0a7c3ba6e44b0fe7f1d42e69ba139b533737 Author: Johannes Berg Date: Tue Feb 10 21:25:37 2009 +0100 zd1211rw: do not ratelimit no-ops It is rather confusing to see this in the log: [ 695.606877] __ratelimit: 40 callbacks suppressed [ 700.726878] __ratelimit: 40 callbacks suppressed without ever seeing any actual message. This is because zd1211rw doesn't compile out the net_ratelimit() call properly if debugging is not enabled. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 572e00122190e3064fa19bd9780b146d2d0f1905 Author: Kalle Valo Date: Tue Feb 10 17:09:31 2009 +0200 mac80211: use ps-poll when dynamic power save mode is disabled When a directed tim bit is set, mac80211 currently disables power save ands sends a null frame to the AP. But if dynamic power save is disabled, mac80211 will not enable power save ever gain. Fix this by adding ps-poll functionality to mac80211. When a directed tim bit is set, mac80211 sends a ps-poll frame to the AP and checks for the more data bit in the returned data frames. Using ps-poll is slower than waking up with null frame, but it's saves more power in cases where the traffic is low. Userspace can control if either ps-poll or null wakeup method is used by enabling and disabling dynamic power save. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 1fb3606bc5864c64c78ce4e1751e5382a9a5aa84 Author: Kalle Valo Date: Tue Feb 10 17:09:24 2009 +0200 mac80211: remove multicast check from check_tim() Currently mac80211 checks for the multicast tim bit from beacons, disables power save and sends a null frame if the bit is set. This was added to support ath9k. But this is a bit controversial because the AP will send multicast frames immediately after the beacon and the time constraints are really high. Relying mac80211 to be fast enough here might not be reliable in all situations. And there's no need to send a null frame, AP will send the frames immediately after the dtim beacon no matter what. Also if dynamic power save is disabled (iwconfig wlan0 power timeout 0) currently mac80211 disables power save whenever the multicast bit is set but it's never enabled again after receiving the first multicast/broadcast frame. The current implementation is not usable on p54/stlc45xx and the easiest way to fix this is to remove the multicast tim bit check altogether. Handling multicast tim bit in host is rare, most of the designs do this in firmware/hardware, so it's better not to have it in mac80211. It's a lot better to do this in firmware/hardware, or if that's not possible it could be done in the driver. Also renamed the function to ieee80211_check_tim() to follow the style of the file. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit f733ded107ff15022e3f0f8204f11ab2e83a2aa4 Author: Tobias Klauser Date: Mon Feb 9 23:06:53 2009 +0100 orinoco: Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Signed-off-by: Tobias Klauser Signed-off-by: John W. Linville commit 925be8a3077351edbf2b59ca689105df214a0792 Author: Tobias Klauser Date: Mon Feb 9 23:05:40 2009 +0100 ath5k: Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Signed-off-by: Tobias Klauser Acked-by: Jiri Slaby Signed-off-by: John W. Linville commit 2660b81a378ab227b78c4cc618453fa7e19a7c7b Author: Sujith Date: Mon Feb 9 13:27:26 2009 +0530 ath9k: Remove all the useless ah_ variable prefixes Signed-off-by: Sujith Signed-off-by: John W. Linville commit f74df6fbe31561091bf42be0ed30232be2b9d3ac Author: Sujith Date: Mon Feb 9 13:27:24 2009 +0530 ath9k: Cleanup EEPROM operations This patch removes the various function pointer assignments and unifies them in a single ops structure. Signed-off-by: Sujith Signed-off-by: John W. Linville commit e153789dc3846b35494435b4a8ae82a034c99dae Author: Sujith Date: Mon Feb 9 13:27:15 2009 +0530 ath9k: Add callbacks hooks for EEPROM operations This is preparatory work for removing the individual function pointer assignments in eeprom.c Signed-off-by: Sujith Signed-off-by: John W. Linville commit cbe61d8a41210600bc76b212edcd4dc0f55c014f Author: Sujith Date: Mon Feb 9 13:27:12 2009 +0530 ath9k: Merge ath_hal and ath_hal_5416 structures Finally, merge these structures and have a single HW specific data structure. Signed-off-by: Sujith Signed-off-by: John W. Linville commit ba52da58be0acf3b7775972b2b5234ce64388c79 Author: Sujith Date: Mon Feb 9 13:27:10 2009 +0530 ath9k: Remove duplicate variables A few variables (bssid, bssidmask, curaid) were duplicated in struct ath_softc and in ath_hal, remove them. Signed-off-by: Sujith Signed-off-by: John W. Linville commit d6bad496c6fbe3adb3323915a8b0430fa2955199 Author: Sujith Date: Mon Feb 9 13:27:08 2009 +0530 ath9k: Move regulatory information to a separate structure Signed-off-by: Sujith Signed-off-by: John W. Linville commit d535a42a21eb62bb0e7f35b8ae39da07b679dda4 Author: Sujith Date: Mon Feb 9 13:27:06 2009 +0530 ath9k: Store HW version information in a separate structure This patch moves all the HW version/revision specific information into a separate structure. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 17d7904de85125c62c7258d7cb21207f26d04048 Author: Sujith Date: Mon Feb 9 13:27:03 2009 +0530 ath9k: Remove all the sc_ prefixes This patch removes the useless sc_ prefixes for all variables. Also, refer to interfaces as VIFs and not as VAPs anymore. Signed-off-by: Sujith Signed-off-by: John W. Linville commit ee6e8d1c234e62e503f2dd8137643b24cf424886 Author: Sujith Date: Mon Feb 9 13:29:49 2009 +0530 ath9k: Convert ANI channel to a pointer This patch converts the ANI channel reference to a pointer, this facilitates moving struct ar5416AniState to ani.h Signed-off-by: Sujith Signed-off-by: John W. Linville commit 394cf0a1ca02e7998c8d01975b60a3cdc121e7d8 Author: Sujith Date: Mon Feb 9 13:26:54 2009 +0530 ath9k: Header file cleanup Split the core header files into manageable pieces. Signed-off-by: Sujith Signed-off-by: John W. Linville commit fa8419d08e58c82add921b4e4eb01eb589b8586b Author: Nick Kossifidis Date: Mon Feb 9 06:17:45 2009 +0200 ath5k: Don't call reset on config_interface * We call reset too often and this can result various PHY problems. On config_interface we don't need to reset the whole device. TODO: Create a function hw_fast_reset that only resets the PCU (tx/rx stuff) and not the whole device so that we can use this for stuck beacons etc. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 1e3e6e8fe2f422f75619b1110f78bb638ae905b9 Author: Nick Kossifidis Date: Mon Feb 9 06:15:42 2009 +0200 ath5k: Disable BMISS interrupts * Don't enable BMISS interrupts as we don't handle them yet Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit e8f055f0c3ba226ca599c14c2e5fe829f6f57cbb Author: Nick Kossifidis Date: Mon Feb 9 06:12:58 2009 +0200 ath5k: Update reset code * Update reset and sync with HALs * Clean up eeprom settings and tweaking of initvals and put them on separate functions * Set/Restore 32KHz ref clk operation * Add some more documentation TODO: Spur mitigation, tpc, half/quarter rate, compression etc v2: Address comments from Bob and Felix and fix RSSI threshold bug introduced on the first version of the patch Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit a406c139091902acebafb2462b64ba498901e820 Author: Nick Kossifidis Date: Mon Feb 9 06:08:51 2009 +0200 ath5k: Update initvals * Update initvals to match legacy and Sam's HAL Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 8892e4ec62f1553d36c88e613890aa4d7c5a372e Author: Nick Kossifidis Date: Mon Feb 9 06:06:34 2009 +0200 ath5k: Update RF Buffer handling * Use the new way to modify rf buffer and put some rf buffer documentation on rfbufer.h * Merge all rf regs functions to one * Sync with legacy HAL and Sam's HAL * Set gain_F settings so that gain_F optimization engine works on RF5111/RF5112 (note that both HALs only use step 0 for RF5111 and they don't use gain_F optimization for this chip, code is there but is never used) Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 6f3b414aca060a847e243f676b8601731938eb48 Author: Nick Kossifidis Date: Mon Feb 9 06:03:41 2009 +0200 ath5k: Update gain_F calibration code and add documentation * Update and cleanup rf gain optimization code * Add comments and refferences to docs and use sane function names * Use only step index on ath5k_gain, no need to have a pointer to the current step since we can determine te step from it's index, this also allows us to put all other structs on rfgain.h and cleanup ath5k.h a little * No need for ah_rfgain variable, we use ah_gain.g_state for everything * Tested on RF2112B chip but gain_F calibration is not yet done (we will finish this on the next patch where we'll rewrite rf-buffer handling) * Use initial rf gain settings for 2316 and 2317 SoCs introduced on a previous patch It seems big but it's mostly cleanup, very few functional changes have been made on phy.c Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 33a31826b4fe9f26d6b383bad19b7ae522fda006 Author: Nick Kossifidis Date: Mon Feb 9 06:00:34 2009 +0200 ath5k: PHY code cleanup * Clean up initial rf buffer settings (new file rfbufer.h) and introduce a new way to access specific rf registers (will use it later) * Clean up initial rf gain settings by moving them on a new file (rfgain.h) so we can later work on gain optimization functions * Update initial rf buffer settings and initial rf gain settings from HALs. This breaks things for now because our current dumps come from pre-configured rf buffer (regdumps already had the needed values set from binary HAL). Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 7b08b3b4a973de20d28d8a322c002c0a5444002a Author: Alina Friedrichsen Date: Thu Feb 5 17:58:34 2009 +0100 mac80211: Remove TSF atomic requirement from the documentation The atomic requirement for the TSF callbacks is outdated. get_tsf() is only called by ieee80211_rx_bss_info() which is indirectly called by the work queue ieee80211_sta_work(). In the same context are called several other non-atomic functions, too. And the atomic requirement causes problems for drivers of USB wifi cards. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit 97d97b80984d0207e5c125c1b7b9467aad365d8d Author: Vivek Natarajan Date: Thu Feb 5 20:05:15 2009 +0530 mac80211: Fix the wrong WARN_ON message appearing on enabling power save. This issue happens only when we are associated with a 11n AP and power save is enabled. In the function 'ieee80211_master_start_xmit', ps_disable_work is queued where wake_queues is called. But before this work is executed, we check if the queues are stopped in _ieee80211_tx and return TX_AGAIN to ieee8011_tx which leads to the warning message. This patch fixes this erroneous case. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit dec59d6faffb44e741d9c19ffdf368d69a968a54 Author: David Kilroy Date: Wed Feb 4 23:05:58 2009 +0000 orinoco: hermes doesn't need to be a separate module Just compile it into the orinoco module. If we merge USB support, the module can then be split as appropriate. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit f90d8d4789eba79b0a715e41aba4c09403088847 Author: David Kilroy Date: Wed Feb 4 23:05:57 2009 +0000 orinoco: hermes_dld does not need to be a module Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit cb1576a829826d56fab59e22aa3af8c5a7db9936 Author: David Kilroy Date: Wed Feb 4 23:05:56 2009 +0000 orinoco: Move WEXT handlers into a separate file No functional change. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit 712a4342a0d89e855a03ba06fb11f7eb29456d45 Author: David Kilroy Date: Wed Feb 4 23:05:55 2009 +0000 orinoco: Move hardware functions into separate file No functional change. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit 5865d015cf85c619a51f8be93d44ec932bc90038 Author: David Kilroy Date: Wed Feb 4 23:05:54 2009 +0000 orinoco: Add hardware function to set multicast mode No functional change. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit cfeb1db6db80435ccf1f9b18ea71bb233f7db20c Author: David Kilroy Date: Wed Feb 4 23:05:53 2009 +0000 orinoco: Use accessor functions for bitrate tables ... when used by the WEXT ioctl functions. This will allow us to separate the card specific stuff from the WEXT code. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit 37a2e566f82de9a88fe119479162f9984af2180d Author: David Kilroy Date: Wed Feb 4 23:05:52 2009 +0000 orinoco: Move firmware handling into a separate file No functional change. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit 4adb474b6b7e26e1318acab5e98864aa78f9b233 Author: David Kilroy Date: Wed Feb 4 23:05:51 2009 +0000 orinoco: Move MIC helpers into new file No functional change. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit f1464ede550b8fda75086cb9bacf8d60fc9f6780 Merge: 9e30d77... c85e5a4... Author: Takashi Iwai Date: Fri Feb 13 15:10:35 2009 +0100 Merge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc commit c85e5a4161b4768599deaee7a5df3ded9c34ea3b Merge: d5e9ba1... 14fa43f... Author: Mark Brown Date: Fri Feb 13 14:02:08 2009 +0000 Merge branch 'for-2.6.29' into for-2.6.30 commit d5e9ba1d58b6da1c58a91113fc350ece97ec5a0b Author: Timur Tabi Date: Tue Feb 3 11:09:32 2009 -0600 ASoC: add additional controls to the CS4270 codec driver Update the CS4270 codec driver to allow applications to use the mixer to control Digital Loopback, Soft Ramp, Zero Cross, Popguard, and Auto-Mute. Soft Ramp, Zero Cross, and Auto-Mute are disabled by the driver when it first initializes the hardware, but these features either don't work or interfere with normal ALSA behavior. However, they can now be re-enabled by an application if desired. Remove CONFIG_SND_SOC_CS4270_HWMUTE and always allow ASoC to control the mute bits. The driver previously and erroneously assumed that these bits control only external muting circuitry, but they also control internal muting circuitry, so they should always be used. Signed-off-by: Timur Tabi Signed-off-by: Mark Brown commit 6a05ac4afa90ac9c38fedd3f6940fe8da5d1fcf6 Author: Takashi Iwai Date: Fri Feb 13 11:19:09 2009 +0100 ALSA: hda - Support multiple digital outs with auto-probing Added the support of multiple digital outputs via auto-probing for Realtek ALC88x codecs. The multiple outputs are handled as slave streams, so only one PCM stream (and the corresponding IEC958* elements) is provided to control both digital outputs. Signed-off-by: Takashi Iwai commit 9b5f12e5a4029c1cd03784754687faef6d9e54fa Author: Takashi Iwai Date: Fri Feb 13 11:47:37 2009 +0100 ALSA: hda - Add proper cleanup for multiout-dig for ALC codecs The recent patch_realtek.c contains the slave digital-out support as well. Signed-off-by: Takashi Iwai commit c8a1a8985d705339a346203f26d2d6ff137f84c9 Merge: 9468350... 9411e21... Author: Takashi Iwai Date: Fri Feb 13 11:59:26 2009 +0100 Merge branch 'fix/hda' into topic/hda commit 8f8573ae9f5deefada6f5d64d0a52c9b39c730c7 Merge: 37bed90... 0e43785... 005bf0e6... 548c893... Author: Ingo Molnar Date: Fri Feb 13 11:57:18 2009 +0100 Merge branches 'irq/genirq', 'irq/sparseirq' and 'irq/urgent' into irq/core commit 0e43785c57fee50fbc00ea0378e941efb61fa0c2 Author: Johannes Weiner Date: Fri Feb 13 04:38:04 2009 +0100 irq: use GFP_KERNEL for action allocation in request_irq() request_irq() calls into proc code via __setup_irq() which is not safe in an atomic context, so request_irq() can itself use the more reliable GFP_KERNEL allocation for the action descriptor. Signed-off-by: Johannes Weiner Signed-off-by: Ingo Molnar commit 946835074e026f4bbe9f3c2b091dca6346bd1474 Author: Takashi Iwai Date: Fri Feb 13 09:31:20 2009 +0100 ALSA: hda - Add quirk for Acer AX1700-U3700A Force model=auto for Acer AX1700-U3700A with ALC888 codec. Since Acer devices are handlded as model=acer as default, the auto parsing has to be specified explicitly. (Maybe it's better rather to remove this default model=acer handling, though.) Signed-off-by: Takashi Iwai commit 344384494e7d3feb0a945a31280a35c5fcca2bbc Merge: 27e0898... 92258a3... Author: Takashi Iwai Date: Fri Feb 13 08:41:44 2009 +0100 Merge branch 'fix/hda' into topic/hda commit 27e089888fb1a3d1d13892262f9d522b03985044 Author: Aristeu Sergio Rozanski Filho Date: Thu Feb 12 17:50:37 2009 -0500 ALSA: hda: add quirk for Lenovo X200 laptop dock Currently the HP connector on X200 dock doesn't detect when a HP is connected nor allows sound to be played using it. This patch fixes the problem by adding a quirk for this specific model. It's possible that others have the same NID (0x19) to report when dock HP is connected, but I don't have access to any. Please Cc me in the reply since I'm not subscribed to alsa-devel@. Signed-off-by: Aristeu Rozanski Signed-off-by: Takashi Iwai commit 8bb0ac5573ff0879fef511e1a80a4a4db0316daa Author: Matthew Ranostay Date: Thu Feb 12 16:50:01 2009 -0500 ALSA: hda: Add STAC_DELL_S14 quirk Add STAC_DELL_S14 quirk for new laptop series. Removed un-needed pins in pin_nids for stac92hd83xxx. Also reorganized connection selection code for the respective ports per quirk define. Signed-off-by: Matthew Ranostay Signed-off-by: Takashi Iwai commit ae374d667a54fb5e2c9c0c4e87b206bd665f3ad6 Author: Takashi Iwai Date: Fri Feb 13 08:33:55 2009 +0100 ALSA: hda - Update documentation Update documentation regarding codec probing; the new probe_only option and the new probe_mask usage. Signed-off-by: Takashi Iwai commit 20db7cb0acd0ba5a3b12f686148d670294a69366 Author: Takashi Iwai Date: Fri Feb 13 08:18:48 2009 +0100 ALSA: hda - Add forced codec-slots for ASUS W5F ASUS W5F needs the fixed codec-slots to probe to override the BIOS problem. Tested-by: Giovanni Moser Frainer Signed-off-by: Takashi Iwai commit f1eaaeec11982c6b529d4255987fdf507a5fa69e Author: Takashi Iwai Date: Fri Feb 13 08:16:55 2009 +0100 ALSA: hda - Allow fixed codec-probe mask Some devices have broken BIOS and they don't set the codec probe-bit properly after cleared by the driver. This makes the driver skipping the necessary codec slots. Since BIOS update isn't always easy, now the semantics of probe_mask option is changed a bit. When it contains the bit 8 (0x100), the lower bits are used to probe that slots regardless of codec-probe bits returned by the hardware. For example, probe_mask=0x103 will force to probe the codec slot #0 and #1. Signed-off-by: Takashi Iwai commit ce3dd39595d9d64f4ba6ee8dd24c6269a3b56b6a Author: Jarek Poplawski Date: Thu Feb 12 16:51:43 2009 -0800 net: Fix page seeking for skb_splice_bits(). struct page walking should be done with proper accessor functions, not directly. With doubts from David S. Miller and Herbert Xu. Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit b53fab9d48e9bd9aeba0b500dec550becd981a91 Author: Randy Dunlap Date: Thu Feb 12 09:54:14 2009 -0800 ima: fix build error IMA_LSM_RULES requires AUDIT. This is automatic if SECURITY_SELINUX=y but not when SECURITY_SMACK=y (and SECURITY_SELINUX=n), so make the dependency explicit. This fixes the following build error: security/integrity/ima/ima_policy.c:111:error: implicit declaration of function 'security_audit_rule_match' security/integrity/ima/ima_policy.c:230:error: implicit declaration of function 'security_audit_rule_init' Signed-off-by: Randy Dunlap Acked-by: Mimi Zohar Signed-off-by: James Morris commit 35d50e60e8b12e4adc2fa317343a176d87294a72 Author: Tetsuo Handa Date: Thu Feb 12 15:53:38 2009 +0900 tomoyo: fix sparse warning Fix sparse warning. $ make C=2 SUBDIRS=security/tomoyo CF="-D__cold__=" CHECK security/tomoyo/common.c CHECK security/tomoyo/realpath.c CHECK security/tomoyo/tomoyo.c security/tomoyo/tomoyo.c:110:8: warning: symbol 'buf' shadows an earlier one security/tomoyo/tomoyo.c:100:7: originally declared here Signed-off-by: Kentaro Takeda Signed-off-by: Tetsuo Handa Signed-off-by: Toshiharu Harada Signed-off-by: James Morris commit 41480ae7a383dcffa497decdd97b3cb2caaa18ec Merge: 508eb2c... 34aeb43... Author: Paul Mundt Date: Thu Feb 12 17:27:56 2009 +0900 Merge branch 'sh/stable-updates' commit 42d5aaa2d826f54924e260b58a8e410e59d54163 Author: James Morris Date: Thu Feb 12 16:29:04 2009 +1100 security: change link order of LSMs so security=tomoyo works LSMs need to be linked before root_plug to ensure the security= boot parameter works with them. Do this for Tomoyo. (root_plug probably needs to be taken out and shot at some point, too). Signed-off-by: James Morris commit d74db3b22a75fac474abe711f582ffe25eacce25 Author: Kentaro Takeda Date: Thu Feb 5 17:18:18 2009 +0900 MAINTAINERS info The archive of tomoyo-users-en mailing list is available at http://lists.sourceforge.jp/mailman/archives/tomoyo-users-en/ . Mailing lists for Japanese users are at http://lists.sourceforge.jp/mailman/archives/tomoyo-users/ and http://lists.sourceforge.jp/mailman/archives/tomoyo-dev/ . TOMOYO Linux English portal is at http://elinux.org/TomoyoLinux . Signed-off-by: Kentaro Takeda Signed-off-by: James Morris commit 00d7d6f840ddc947237307e022de5e75ded4105f Author: Kentaro Takeda Date: Thu Feb 5 17:18:17 2009 +0900 Kconfig and Makefile TOMOYO uses LSM hooks for pathname based access control and securityfs support. Signed-off-by: Kentaro Takeda Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit f7433243770c77979c396b4c7449a10e9b3521db Author: Kentaro Takeda Date: Thu Feb 5 17:18:16 2009 +0900 LSM adapter functions. DAC's permissions and TOMOYO's permissions are not one-to-one mapping. Regarding DAC, there are "read", "write", "execute" permissions. Regarding TOMOYO, there are "allow_read", "allow_write", "allow_read/write", "allow_execute", "allow_create", "allow_unlink", "allow_mkdir", "allow_rmdir", "allow_mkfifo", "allow_mksock", "allow_mkblock", "allow_mkchar", "allow_truncate", "allow_symlink", "allow_rewrite", "allow_link", "allow_rename" permissions. +----------------------------------+----------------------------------+ | requested operation | required TOMOYO's permission | +----------------------------------+----------------------------------+ | sys_open(O_RDONLY) | allow_read | +----------------------------------+----------------------------------+ | sys_open(O_WRONLY) | allow_write | +----------------------------------+----------------------------------+ | sys_open(O_RDWR) | allow_read/write | +----------------------------------+----------------------------------+ | open_exec() from do_execve() | allow_execute | +----------------------------------+----------------------------------+ | open_exec() from !do_execve() | allow_read | +----------------------------------+----------------------------------+ | sys_read() | (none) | +----------------------------------+----------------------------------+ | sys_write() | (none) | +----------------------------------+----------------------------------+ | sys_mmap() | (none) | +----------------------------------+----------------------------------+ | sys_uselib() | allow_read | +----------------------------------+----------------------------------+ | sys_open(O_CREAT) | allow_create | +----------------------------------+----------------------------------+ | sys_open(O_TRUNC) | allow_truncate | +----------------------------------+----------------------------------+ | sys_truncate() | allow_truncate | +----------------------------------+----------------------------------+ | sys_ftruncate() | allow_truncate | +----------------------------------+----------------------------------+ | sys_open() without O_APPEND | allow_rewrite | +----------------------------------+----------------------------------+ | setfl() without O_APPEND | allow_rewrite | +----------------------------------+----------------------------------+ | sys_sysctl() for writing | allow_write | +----------------------------------+----------------------------------+ | sys_sysctl() for reading | allow_read | +----------------------------------+----------------------------------+ | sys_unlink() | allow_unlink | +----------------------------------+----------------------------------+ | sys_mknod(S_IFREG) | allow_create | +----------------------------------+----------------------------------+ | sys_mknod(0) | allow_create | +----------------------------------+----------------------------------+ | sys_mknod(S_IFIFO) | allow_mkfifo | +----------------------------------+----------------------------------+ | sys_mknod(S_IFSOCK) | allow_mksock | +----------------------------------+----------------------------------+ | sys_bind(AF_UNIX) | allow_mksock | +----------------------------------+----------------------------------+ | sys_mknod(S_IFBLK) | allow_mkblock | +----------------------------------+----------------------------------+ | sys_mknod(S_IFCHR) | allow_mkchar | +----------------------------------+----------------------------------+ | sys_symlink() | allow_symlink | +----------------------------------+----------------------------------+ | sys_mkdir() | allow_mkdir | +----------------------------------+----------------------------------+ | sys_rmdir() | allow_rmdir | +----------------------------------+----------------------------------+ | sys_link() | allow_link | +----------------------------------+----------------------------------+ | sys_rename() | allow_rename | +----------------------------------+----------------------------------+ TOMOYO requires "allow_execute" permission of a pathname passed to do_execve() but does not require "allow_read" permission of that pathname. Let's consider 3 patterns (statically linked, dynamically linked, shell script). This description is to some degree simplified. $ cat hello.c #include int main() { printf("Hello\n"); return 0; } $ cat hello.sh #! /bin/sh echo "Hello" $ gcc -static -o hello-static hello.c $ gcc -o hello-dynamic hello.c $ chmod 755 hello.sh Case 1 -- Executing hello-static from bash. (1) The bash process calls fork() and the child process requests do_execve("hello-static"). (2) The kernel checks "allow_execute hello-static" from "bash" domain. (3) The kernel calculates "bash hello-static" as the domain to transit to. (4) The kernel overwrites the child process by "hello-static". (5) The child process transits to "bash hello-static" domain. (6) The "hello-static" starts and finishes. Case 2 -- Executing hello-dynamic from bash. (1) The bash process calls fork() and the child process requests do_execve("hello-dynamic"). (2) The kernel checks "allow_execute hello-dynamic" from "bash" domain. (3) The kernel calculates "bash hello-dynamic" as the domain to transit to. (4) The kernel checks "allow_read ld-linux.so" from "bash hello-dynamic" domain. I think permission to access ld-linux.so should be charged hello-dynamic program, for "hello-dynamic needs ld-linux.so" is not a fault of bash program. (5) The kernel overwrites the child process by "hello-dynamic". (6) The child process transits to "bash hello-dynamic" domain. (7) The "hello-dynamic" starts and finishes. Case 3 -- Executing hello.sh from bash. (1) The bash process calls fork() and the child process requests do_execve("hello.sh"). (2) The kernel checks "allow_execute hello.sh" from "bash" domain. (3) The kernel calculates "bash hello.sh" as the domain to transit to. (4) The kernel checks "allow_read /bin/sh" from "bash hello.sh" domain. I think permission to access /bin/sh should be charged hello.sh program, for "hello.sh needs /bin/sh" is not a fault of bash program. (5) The kernel overwrites the child process by "/bin/sh". (6) The child process transits to "bash hello.sh" domain. (7) The "/bin/sh" requests open("hello.sh"). (8) The kernel checks "allow_read hello.sh" from "bash hello.sh" domain. (9) The "/bin/sh" starts and finishes. Whether a file is interpreted as a program or not depends on an application. The kernel cannot know whether the file is interpreted as a program or not. Thus, TOMOYO treats "hello-static" "hello-dynamic" "ld-linux.so" "hello.sh" "/bin/sh" equally as merely files; no distinction between executable and non-executable. Therefore, TOMOYO doesn't check DAC's execute permission. TOMOYO checks "allow_read" permission instead. Calling do_execve() is a bold gesture that an old program's instance (i.e. current process) is ready to be overwritten by a new program and is ready to transfer control to the new program. To split purview of programs, TOMOYO requires "allow_execute" permission of the new program against the old program's instance and performs domain transition. If do_execve() succeeds, the old program is no longer responsible against the consequence of the new program's behavior. Only the new program is responsible for all consequences. But TOMOYO doesn't require "allow_read" permission of the new program. If TOMOYO requires "allow_read" permission of the new program, TOMOYO will allow an attacker (who hijacked the old program's instance) to open the new program and steal data from the new program. Requiring "allow_read" permission will widen purview of the old program. Not requiring "allow_read" permission of the new program against the old program's instance is my design for reducing purview of the old program. To be able to know whether the current process is in do_execve() or not, I want to add in_execve flag to "task_struct". Signed-off-by: Kentaro Takeda Signed-off-by: Tetsuo Handa Signed-off-by: Toshiharu Harada Signed-off-by: James Morris commit 26a2a1c9eb88d9aca8891575b3b986812e073872 Author: Kentaro Takeda Date: Thu Feb 5 17:18:15 2009 +0900 Domain transition handler. This file controls domain creation/deletion/transition. Every process belongs to a domain in TOMOYO Linux. Domain transition occurs when execve(2) is called and the domain is expressed as 'process invocation history', such as ' /sbin/init /etc/init.d/rc'. Domain information is stored in current->cred->security field. Signed-off-by: Kentaro Takeda Signed-off-by: Tetsuo Handa Signed-off-by: Toshiharu Harada Signed-off-by: James Morris commit b69a54ee582373d76e4b5560970db5b8c618b12a Author: Kentaro Takeda Date: Thu Feb 5 17:18:14 2009 +0900 File operation restriction part. This file controls file related operations of TOMOYO Linux. tomoyo/tomoyo.c calls the following six functions in this file. Each function handles the following access types. * tomoyo_check_file_perm sysctl()'s "read" and "write". * tomoyo_check_exec_perm "execute". * tomoyo_check_open_permission open(2) for "read" and "write". * tomoyo_check_1path_perm "create", "unlink", "mkdir", "rmdir", "mkfifo", "mksock", "mkblock", "mkchar", "truncate" and "symlink". * tomoyo_check_2path_perm "rename" and "unlink". * tomoyo_check_rewrite_permission "rewrite". ("rewrite" are operations which may lose already recorded data of a file, i.e. open(!O_APPEND) || open(O_TRUNC) || truncate() || ftruncate()) The functions which actually checks ACLs are the following three functions. Each function handles the following access types. ACL directive is expressed by "allow_". * tomoyo_check_file_acl Open() operation and execve() operation. ("read", "write", "read/write" and "execute") * tomoyo_check_single_write_acl Directory modification operations with 1 pathname. ("create", "unlink", "mkdir", "rmdir", "mkfifo", "mksock", "mkblock", "mkchar", "truncate", "symlink" and "rewrite") * tomoyo_check_double_write_acl Directory modification operations with 2 pathname. ("link" and "rename") Also, this file contains handlers of some utility directives for file related operations. * "allow_read": specifies globally (for all domains) readable files. * "path_group": specifies pathname macro. * "deny_rewrite": restricts rewrite operation. Signed-off-by: Kentaro Takeda Signed-off-by: Tetsuo Handa Signed-off-by: Toshiharu Harada Signed-off-by: James Morris commit 9590837b89aaa4523209ac91c52db5ea0d9142fd Author: Kentaro Takeda Date: Thu Feb 5 17:18:13 2009 +0900 Common functions for TOMOYO Linux. This file contains common functions (e.g. policy I/O, pattern matching). -------------------- About pattern matching -------------------- Since TOMOYO Linux is a name based access control, TOMOYO Linux seriously considers "safe" string representation. TOMOYO Linux's string manipulation functions make reviewers feel crazy, but there are reasons why TOMOYO Linux needs its own string manipulation functions. ----- Part 1 : preconditions ----- People definitely want to use wild card. To support pattern matching, we have to support wild card characters. In a typical Linux system, filenames are likely consists of only alphabets, numbers, and some characters (e.g. + - ~ . / ). But theoretically, the Linux kernel accepts all characters but NUL character (which is used as a terminator of a string). Some Linux systems can have filenames which contain * ? ** etc. Therefore, we have to somehow modify string so that we can distinguish wild card characters and normal characters. It might be possible for some application's configuration files to restrict acceptable characters. It is impossible for kernel to restrict acceptable characters. We can't accept approaches which will cause troubles for applications. ----- Part 2 : commonly used approaches ----- Text formatted strings separated by space character (0x20) and new line character (0x0A) is more preferable for users over array of NUL-terminated string. Thus, people use text formatted configuration files separated by space character and new line. We sometimes need to handle non-printable characters. Thus, people use \ character (0x5C) as escape character and represent non-printable characters using octal or hexadecimal format. At this point, we remind (at least) 3 approaches. (1) Shell glob style expression (2) POSIX regular expression (UNIX style regular expression) (3) Maverick wild card expression On the surface, (1) and (2) sound good choices. But they have a big pitfall. All meta-characters in (1) and (2) are legal characters for representing a pathname, and users easily write incorrect expression. What is worse, users unlikely notice incorrect expressions because characters used for regular pathnames unlikely contain meta-characters. This incorrect use of meta-characters in pathname representation reveals vulnerability (e.g. unexpected results) only when irregular pathname is specified. The authors of TOMOYO Linux think that approaches which adds some character for interpreting meta-characters as normal characters (i.e. (1) and (2)) are not suitable for security use. Therefore, the authors of TOMOYO Linux propose (3). ----- Part 3: consideration points ----- We need to solve encoding problem. A single character can be represented in several ways using encodings. For Japanese language, there are "ShiftJIS", "ISO-2022-JP", "EUC-JP", "UTF-8" and more. Some languages (e.g. Japanese language) supports multi-byte characters (where a single character is represented using several bytes). Some multi-byte characters may match the escape character. For Japanese language, some characters in "ShiftJIS" encoding match \ character, and bothering Web's CGI developers. It is important that the kernel string is not bothered by encoding problem. Linus said, "I really would expect that kernel strings don't have an encoding. They're just C strings: a NUL-terminated stream of bytes." http://lkml.org/lkml/2007/11/6/142 Yes. The kernel strings are just C strings. We are talking about how to store and carry "kernel strings" safely. If we store "kernel string" into policy file as-is, the "kernel string" will be interpreted differently depending on application's encoding settings. One application may interpret "kernel string" as "UTF-8", another application may interpret "kernel string" as "ShiftJIS". Therefore, we propose to represent strings using ASCII encoding. In this way, we are no longer bothered by encoding problems. We need to avoid information loss caused by display. It is difficult to input and display non-printable characters, but we have to be able to handle such characters because the kernel string is a C string. If we use only ASCII printable characters (from 0x21 to 0x7E) and space character (0x20) and new line character (0x0A), it is easy to input from keyboard and display on all terminals which is running Linux. Therefore, we propose to represent strings using only characters which value is one of "from 0x21 to 0x7E", "0x20", "0x0A". We need to consider ease of splitting strings from a line. If we use an approach which uses "\ " for representing a space character within a string, we have to count the string from the beginning to check whether this space character is accompanied with \ character or not. As a result, we cannot monotonically split a line using space character. If we use an approach which uses "\040" for representing a space character within a string, we can monotonically split a line using space character. If we use an approach which uses NUL character as a delimiter, we cannot use string manipulation functions for splitting strings from a line. Therefore, we propose that we represent space character as "\040". We need to avoid wrong designations (incorrect use of special characters). Not all users can understand and utilize POSIX's regular expressions correctly and perfectly. If a character acts as a wild card by default, the user will get unexpected result if that user didn't know the meaning of that character. Therefore, we propose that all characters but \ character act as a normal character and let the user add \ character to make a character act as a wild card. In this way, users needn't to know all wild card characters beforehand. They can learn when they encountered an unseen wild card character for their first time. ----- Part 4: supported wild card expressions ----- At this point, we have wild card expressions listed below. +-----------+--------------------------------------------------------------+ | Wild card | Meaning and example | +-----------+--------------------------------------------------------------+ | \* | More than or equals to 0 character other than '/'. | | | /var/log/samba/\* | +-----------+--------------------------------------------------------------+ | \@ | More than or equals to 0 character other than '/' or '.'. | | | /var/www/html/\@.html | +-----------+--------------------------------------------------------------+ | \? | 1 byte character other than '/'. | | | /tmp/mail.\?\?\?\?\?\? | +-----------+--------------------------------------------------------------+ | \$ | More than or equals to 1 decimal digit. | | | /proc/\$/cmdline | +-----------+--------------------------------------------------------------+ | \+ | 1 decimal digit. | | | /var/tmp/my_work.\+ | +-----------+--------------------------------------------------------------+ | \X | More than or equals to 1 hexadecimal digit. | | | /var/tmp/my-work.\X | +-----------+--------------------------------------------------------------+ | \x | 1 hexadecimal digit. | | | /tmp/my-work.\x | +-----------+--------------------------------------------------------------+ | \A | More than or equals to 1 alphabet character. | | | /var/log/my-work/\$-\A-\$.log | +-----------+--------------------------------------------------------------+ | \a | 1 alphabet character. | | | /home/users/\a/\*/public_html/\*.html | +-----------+--------------------------------------------------------------+ | \- | Pathname subtraction operator. | | | +---------------------+------------------------------------+ | | | | Example | Meaning | | | | +---------------------+------------------------------------+ | | | | /etc/\* | All files in /etc/ directory. | | | | +---------------------+------------------------------------+ | | | | /etc/\*\-\*shadow\* | /etc/\* other than /etc/\*shadow\* | | | | +---------------------+------------------------------------+ | | | | /\*\-proc\-sys/ | /\*/ other than /proc/ /sys/ | | | | +---------------------+------------------------------------+ | +-----------+--------------------------------------------------------------+ +----------------+---------------------------------------------------------+ | Representation | Meaning and example | +----------------+---------------------------------------------------------+ | \\ | backslash character itself. | +----------------+---------------------------------------------------------+ | \ooo | 1 byte character. | | | ooo is 001 <= ooo <= 040 || 177 <= ooo <= 377. | | | | | | \040 for space character. | | | \177 for del character. | | | | +----------------+---------------------------------------------------------+ ----- Part 5: Advantages ----- We can obtain extensibility. Since our proposed approach adds \ to a character to interpret as a wild card, we can introduce new wild card in future while maintaining backward compatibility. We can process monotonically. Since our proposed approach separates strings using a space character, we can split strings using existing string manipulation functions. We can reliably analyze access logs. It is guaranteed that a string doesn't contain space character (0x20) and new line character (0x0A). It is guaranteed that a string won't be converted by FTP and won't be damaged by a terminal's settings. It is guaranteed that a string won't be affected by encoding converters (except encodings which insert NUL character (e.g. UTF-16)). ----- Part 6: conclusion ----- TOMOYO Linux is using its own encoding with reasons described above. There is a disadvantage that we need to introduce a series of new string manipulation functions. But TOMOYO Linux's encoding is useful for all users (including audit and AppArmor) who want to perform pattern matching and safely exchange string information between the kernel and the userspace. -------------------- About policy interface -------------------- TOMOYO Linux creates the following files on securityfs (normally mounted on /sys/kernel/security) as interfaces between kernel and userspace. These files are for TOMOYO Linux management tools *only*, not for general programs. * profile * exception_policy * domain_policy * manager * meminfo * self_domain * version * .domain_status * .process_status ** /sys/kernel/security/tomoyo/profile ** This file is used to read or write profiles. "profile" means a running mode of process. A profile lists up functions and their modes in "$number-$variable=$value" format. The $number is profile number between 0 and 255. Each domain is assigned one profile. To assign profile to domains, use "ccs-setprofile" or "ccs-editpolicy" or "ccs-loadpolicy" commands. (Example) [root@tomoyo]# cat /sys/kernel/security/tomoyo/profile 0-COMMENT=-----Disabled Mode----- 0-MAC_FOR_FILE=disabled 0-MAX_ACCEPT_ENTRY=2048 0-TOMOYO_VERBOSE=disabled 1-COMMENT=-----Learning Mode----- 1-MAC_FOR_FILE=learning 1-MAX_ACCEPT_ENTRY=2048 1-TOMOYO_VERBOSE=disabled 2-COMMENT=-----Permissive Mode----- 2-MAC_FOR_FILE=permissive 2-MAX_ACCEPT_ENTRY=2048 2-TOMOYO_VERBOSE=enabled 3-COMMENT=-----Enforcing Mode----- 3-MAC_FOR_FILE=enforcing 3-MAX_ACCEPT_ENTRY=2048 3-TOMOYO_VERBOSE=enabled - MAC_FOR_FILE: Specifies access control level regarding file access requests. - MAX_ACCEPT_ENTRY: Limits the max number of ACL entries that are automatically appended during learning mode. Default is 2048. - TOMOYO_VERBOSE: Specifies whether to print domain policy violation messages or not. ** /sys/kernel/security/tomoyo/manager ** This file is used to read or append the list of programs or domains that can write to /sys/kernel/security/tomoyo interface. By default, only processes with both UID = 0 and EUID = 0 can modify policy via /sys/kernel/security/tomoyo interface. You can use keyword "manage_by_non_root" to allow policy modification by non root user. (Example) [root@tomoyo]# cat /sys/kernel/security/tomoyo/manager /usr/lib/ccs/loadpolicy /usr/lib/ccs/editpolicy /usr/lib/ccs/setlevel /usr/lib/ccs/setprofile /usr/lib/ccs/ld-watch /usr/lib/ccs/ccs-queryd ** /sys/kernel/security/tomoyo/exception_policy ** This file is used to read and write system global settings. Each line has a directive and operand pair. Directives are listed below. - initialize_domain: To initialize domain transition when specific program is executed, use initialize_domain directive. * initialize_domain "program" from "domain" * initialize_domain "program" from "the last program part of domain" * initialize_domain "program" If the part "from" and after is not given, the entry is applied to all domain. If the "domain" doesn't start with "", the entry is applied to all domain whose domainname ends with "the last program part of domain". This directive is intended to aggregate domain transitions for daemon program and program that are invoked by the kernel on demand, by transiting to different domain. - keep_domain To prevent domain transition when program is executed from specific domain, use keep_domain directive. * keep_domain "program" from "domain" * keep_domain "program" from "the last program part of domain" * keep_domain "domain" * keep_domain "the last program part of domain" If the part "from" and before is not given, this entry is applied to all program. If the "domain" doesn't start with "", the entry is applied to all domain whose domainname ends with "the last program part of domain". This directive is intended to reduce total number of domains and memory usage by suppressing unneeded domain transitions. To declare domain keepers, use keep_domain directive followed by domain definition. Any process that belongs to any domain declared with this directive, the process stays at the same domain unless any program registered with initialize_domain directive is executed. In order to control domain transition in detail, you can use no_keep_domain/no_initialize_domain keywrods. - alias: To allow executing programs using the name of symbolic links, use alias keyword followed by dereferenced pathname and reference pathname. For example, /sbin/pidof is a symbolic link to /sbin/killall5 . In normal case, if /sbin/pidof is executed, the domain is defined as if /sbin/killall5 is executed. By specifying "alias /sbin/killall5 /sbin/pidof", you can run /sbin/pidof in the domain for /sbin/pidof . (Example) alias /sbin/killall5 /sbin/pidof - allow_read: To grant unconditionally readable permissions, use allow_read keyword followed by canonicalized file. This keyword is intended to reduce size of domain policy by granting read access to library files such as GLIBC and locale files. Exception is, if ignore_global_allow_read keyword is given to a domain, entries specified by this keyword are ignored. (Example) allow_read /lib/libc-2.5.so - file_pattern: To declare pathname pattern, use file_pattern keyword followed by pathname pattern. The pathname pattern must be a canonicalized Pathname. This keyword is not applicable to neither granting execute permissions nor domain definitions. For example, canonicalized pathname that contains a process ID (i.e. /proc/PID/ files) needs to be grouped in order to make access control work well. (Example) file_pattern /proc/\$/cmdline - path_group To declare pathname group, use path_group keyword followed by name of the group and pathname pattern. For example, if you want to group all files under home directory, you can define path_group HOME-DIR-FILE /home/\*/\* path_group HOME-DIR-FILE /home/\*/\*/\* path_group HOME-DIR-FILE /home/\*/\*/\*/\* in the exception policy and use like allow_read @HOME-DIR-FILE to grant file access permission. - deny_rewrite: To deny overwriting already written contents of file (such as log files) by default, use deny_rewrite keyword followed by pathname pattern. Files whose pathname match the patterns are not permitted to open for writing without append mode or truncate unless the pathnames are explicitly granted using allow_rewrite keyword in domain policy. (Example) deny_rewrite /var/log/\* - aggregator To deal multiple programs as a single program, use aggregator keyword followed by name of original program and aggregated program. This keyword is intended to aggregate similar programs. For example, /usr/bin/tac and /bin/cat are similar. By specifying "aggregator /usr/bin/tac /bin/cat", you can run /usr/bin/tac in the domain for /bin/cat . For example, /usr/sbin/logrotate for Fedora Core 3 generates programs like /tmp/logrotate.\?\?\?\?\?\? and run them, but TOMOYO Linux doesn't allow using patterns for granting execute permission and defining domains. By specifying "aggregator /tmp/logrotate.\?\?\?\?\?\? /tmp/logrotate.tmp", you can run /tmp/logrotate.\?\?\?\?\?\? as if /tmp/logrotate.tmp is running. ** /sys/kernel/security/tomoyo/domain_policy ** This file contains definition of all domains and permissions that are granted to each domain. Lines from the next line to a domain definition ( any lines starting with "") to the previous line to the next domain definitions are interpreted as access permissions for that domain. ** /sys/kernel/security/tomoyo/meminfo ** This file is to show the total RAM used to keep policy in the kernel by TOMOYO Linux in bytes. (Example) [root@tomoyo]# cat /sys/kernel/security/tomoyo/meminfo Shared: 61440 Private: 69632 Dynamic: 768 Total: 131840 You can set memory quota by writing to this file. (Example) [root@tomoyo]# echo Shared: 2097152 > /sys/kernel/security/tomoyo/meminfo [root@tomoyo]# echo Private: 2097152 > /sys/kernel/security/tomoyo/meminfo ** /sys/kernel/security/tomoyo/self_domain ** This file is to show the name of domain the caller process belongs to. (Example) [root@etch]# cat /sys/kernel/security/tomoyo/self_domain /usr/sbin/sshd /bin/zsh /bin/cat ** /sys/kernel/security/tomoyo/version ** This file is used for getting TOMOYO Linux's version. (Example) [root@etch]# cat /sys/kernel/security/tomoyo/version 2.2.0-pre ** /sys/kernel/security/tomoyo/.domain_status ** This is a view (of a DBMS) that contains only profile number and domainnames of domain so that "ccs-setprofile" command can do line-oriented processing easily. ** /sys/kernel/security/tomoyo/.process_status ** This file is used by "ccs-ccstree" command to show "list of processes currently running" and "domains which each process belongs to" and "profile number which the domain is currently assigned" like "pstree" command. This file is writable by programs that aren't registered as policy manager. Signed-off-by: Kentaro Takeda Signed-off-by: Tetsuo Handa Signed-off-by: Toshiharu Harada Signed-off-by: James Morris commit c73bd6d473ceb5d643d3afd7e75b7dc2e6918558 Author: Kentaro Takeda Date: Thu Feb 5 17:18:12 2009 +0900 Memory and pathname management functions. TOMOYO Linux performs pathname based access control. To remove factors that make pathname based access control difficult (e.g. symbolic links, "..", "//" etc.), TOMOYO Linux derives realpath of requested pathname from "struct dentry" and "struct vfsmount". The maximum length of string data is limited to 4000 including trailing '\0'. Since TOMOYO Linux uses '\ooo' style representation for non ASCII printable characters, maybe TOMOYO Linux should be able to support 16336 (which means (NAME_MAX * (PATH_MAX / (NAME_MAX + 1)) * 4 + (PATH_MAX / (NAME_MAX + 1))) including trailing '\0'), but I think 4000 is enough for practical use. TOMOYO uses only 0x21 - 0x7E (as printable characters) and 0x20 (as word delimiter) and 0x0A (as line delimiter). 0x01 - 0x20 and 0x80 - 0xFF is handled in \ooo style representation. The reason to use \ooo is to guarantee that "%s" won't damage logs. Userland program can request open("/tmp/file granted.\nAccess /tmp/file ", O_WRONLY | O_CREAT, 0600) and logging such crazy pathname using "Access %s denied.\n" format will cause "fabrication of logs" like Access /tmp/file granted. Access /tmp/file denied. TOMOYO converts such characters to \ooo so that the logs will become Access /tmp/file\040granted.\012Access\040/tmp/file denied. and the administrator can read the logs safely using /bin/cat . Likewise, a crazy request like open("/tmp/\x01\x02\x03\x04\x05\x06\x07\x08\x09", O_WRONLY | O_CREAT, 0600) will be processed safely by converting to Access /tmp/\001\002\003\004\005\006\007\010\011 denied. Signed-off-by: Kentaro Takeda Signed-off-by: Tetsuo Handa Signed-off-by: Toshiharu Harada Signed-off-by: James Morris commit f9ce1f1cda8b73a36f47e424975a9dfa78b7840c Author: Kentaro Takeda Date: Thu Feb 5 17:18:11 2009 +0900 Add in_execve flag into task_struct. This patch allows LSM modules to determine whether current process is in an execve operation or not so that they can behave differently while an execve operation is in progress. This patch is needed by TOMOYO. Please see another patch titled "LSM adapter functions." for backgrounds. Signed-off-by: Tetsuo Handa Signed-off-by: David Howells Signed-off-by: James Morris commit e930e99500e5bd055270c668cca8bd2f33056895 Author: Harvey Harrison Date: Wed Feb 11 14:49:30 2009 -0800 ALSA: echoaudio - replace uses of __constant_{endian} The base versions handle constant folding now. Signed-off-by: Harvey Harrison Signed-off-by: Takashi Iwai commit c98041f7d71890ac6aa2257d78ef175db44d2cd3 Author: Herton Ronaldo Krzesinski Date: Wed Feb 11 20:33:15 2009 -0200 ALSA: hda - Cleanup setting of pin_configs in patch_stac927x After commit "ALSA: hda - Fix restore of pin configs at resume for STAC/IDT codecs", the introduced stac_save_pin_cfgs function checks already for pins == NULL case, saving then default pin configs from machine with stac92xx_save_bios_config_regs. So we can remove the extra checks when stac927x_brd_tbl[spec->board_config] == NULL. Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Takashi Iwai commit a1152e3570e271dbf217391d549d3e47e258fe05 Merge: 0852d7a... 26a74f1... Author: Takashi Iwai Date: Thu Feb 12 00:14:34 2009 +0100 Merge branch 'fix/hda' into topic/hda commit 0852d7a654f75d22a3c09fd7da4a3551bbb37740 Author: Takashi Iwai Date: Wed Feb 11 11:35:15 2009 +0100 ALSA: hda - Detect multiple digital-out pins Detect multiple digital-out pins in snd_hda_parse_pin_defconfig(). The dig_out_pin and dig_out_type fields become arrays. The codec parser still doesn't use this multiple pins detection, though. Signed-off-by: Takashi Iwai commit 523979adfa0b79d4e3aa053220c37a9233294206 Author: Mimi Zohar Date: Wed Feb 11 11:12:28 2009 -0500 integrity: audit update Based on discussions on linux-audit, as per Steve Grubb's request http://lkml.org/lkml/2009/2/6/269, the following changes were made: - forced audit result to be either 0 or 1. - made template names const - Added new stand-alone message type: AUDIT_INTEGRITY_RULE Signed-off-by: Mimi Zohar Acked-by: Steve Grubb Signed-off-by: James Morris commit 51621fbdb1ea8709ab67170b54e71be6d9fa29ad Author: Hannes Hering Date: Wed Feb 11 13:47:57 2009 -0800 ehea: Fix: Remove adapter from adapter list in error path Remove adapter from adapter list before freeing data structure in error path. Signed-off-by: Hannes Hering Signed-off-by: David S. Miller commit fb791b1cfb74937332a22d6bf06eed7866fbcc3c Author: David Kilroy Date: Wed Feb 4 23:05:50 2009 +0000 orinoco: Move scan helpers to a separate file No functional change. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit aea48b1529c6c4d39af82fc36728da49668392c6 Author: David Kilroy Date: Wed Feb 4 23:05:49 2009 +0000 orinoco: use orinoco_private instead of net_device in scan helper This makes the interface to the scan helpers consistent, so we can split them out. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit 47445cb95015bef0d54ca799f31e454797378a71 Author: David Kilroy Date: Wed Feb 4 23:05:48 2009 +0000 orinoco: Rename orinoco.c So that we can split up the file and still produce a module named orinoco.o. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit 2131266d6e53e8f84f8111323036343d72bcb856 Author: David Kilroy Date: Wed Feb 4 23:05:47 2009 +0000 orinoco: Fix interesting checkpatch errors ERROR: "foo * bar" should be "foo *bar" ERROR: do not initialise statics to 0 or NULL WARNING: printk() should include KERN_ facility level WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit b2f30a0a2395b6c7e7138fbdabec2cb02ff373a7 Author: David Kilroy Date: Wed Feb 4 23:05:46 2009 +0000 orinoco: keep line length below 80 characters Remove most checkpatch warnings of the type WARNING: line over 80 characters Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit 566f2d9eac49119289cd73e6c302ecc392eaf932 Author: David Kilroy Date: Wed Feb 4 23:05:45 2009 +0000 orinoco: remove unnecessary braces Remove the following checkpatch warnings WARNING: braces {} are not necessary for any arm of this statement WARNING: braces {} are not necessary for single statement blocks Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit a94e8427c8bd358b602288d0b1e0cff83a9401bc Author: David Kilroy Date: Wed Feb 4 23:05:44 2009 +0000 orinoco: spaces in parenthesised expressions Remove checkpatch warnings of the following type: ERROR: space prohibited after that open parenthesis '(' ERROR: space prohibited before that close parenthesis ')' ERROR: space prohibited after that '!' (ctx:BxW) ERROR: space required before the open parenthesis '(' ERROR: space required before the open brace '{' Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit 6fe9deb1747e1e3b9f626878a9954b9eef8ab17d Author: David Kilroy Date: Wed Feb 4 23:05:43 2009 +0000 orinoco: address leading and trailing whitespace Remove the following checkpatch errors from orinoco.c ERROR: trailing whitespace ERROR: code indent should use tabs where possible WARNING: suspect code indent for conditional statements Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit ce1a9ee33a5864f3d199baa1d3e154a1f9a6f3dd Author: Michael Buesch Date: Wed Feb 4 19:55:22 2009 +0100 b43: Add parts of LP-PHY TX power control This adds the initial parts of the LP-PHY TX power control. This also adds helper functions for bulk access of LP tables. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 7a9470806053f765ecf7f3932acb4c95c204ad4b Author: Vasanthakumar Thiagarajan Date: Wed Feb 4 18:28:48 2009 +0530 mac80211: Free current bss information in few places where we don't need it any more Signed-off-by: Vasanthakumar Thiagarajan Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 029bc43270e770e0d57d67dc431fe711c58e74f5 Author: Sujith Date: Wed Feb 4 08:10:26 2009 +0530 ath9k: Add retry counters to rate control debug file Signed-off-by: Sujith Signed-off-by: John W. Linville commit d42c6b71a8e722e00a302e7e3365909560de478a Author: Sujith Date: Wed Feb 4 08:10:22 2009 +0530 ath9k: Handle mac80211's FIF_CONTROL flag properly Signed-off-by: Sujith Signed-off-by: John W. Linville commit 254ad0ff9387d1c0a2f975ff40b2f4d1302ccc3a Author: Sujith Date: Wed Feb 4 08:10:19 2009 +0530 ath9k: Remove all the redundant internal buffer types Use mac80211's primitives for identifying the frame type, and cleanup the driver-specific macros. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 141b38b6bc6db69348a9eaed87137451240bc55f Author: Sujith Date: Wed Feb 4 08:10:07 2009 +0530 ath9k: Lock mac80211 callbacks with a mutex Signed-off-by: Sujith Signed-off-by: John W. Linville commit 1afa6e2e1d26d0b9d96785ee1823bf11c4c5f202 Author: Roel Kluin Date: Wed Feb 11 13:53:26 2009 +0100 sound: OSS: dmabuf: too many loops loop adev->dmap_out->nbufs times Signed-off-by: Roel Kluin Signed-off-by: Takashi Iwai commit 32d2c7fa1344ddf51886eddf31e228d139501dc6 Author: Takashi Iwai Date: Wed Feb 11 11:33:13 2009 +0100 ALSA: hda - Fix a wrong pin check in snd_hda_parse_pin_def_config() Fixed a wrong pin check (a typo) for debug print of digital input pin. Signed-off-by: Takashi Iwai commit ad0b0fd554dfc126b5750d14908dccc3bbf602be Author: Arjan van de Ven Date: Tue Feb 10 11:42:26 2009 -0800 sched, latencytop: incorporate review feedback from Andrew Morton Andrew had some suggestions for the latencytop file; this patch takes care of most of these: * Add documentation * Turn account_scheduler_latency into an inline function * Don't report negative values to userspace * Make the file operations struct const * Fix a few checkpatch.pl warnings Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar commit f437e8b53eab92a5829e65781e29aed23d8ffd0c Merge: 140573d... 8e49215... Author: Ingo Molnar Date: Wed Feb 11 10:17:42 2009 +0100 Merge commit 'v2.6.29-rc4' into sched/core commit df22313637acf58a9ae9fe890e10443b9be35053 Merge: 501ca25... a57c0eb... Author: Takashi Iwai Date: Wed Feb 11 09:09:29 2009 +0100 Merge branch 'fix/hda' into topic/hda commit 9e30d7718bb7402c7bdee631ad2aae2658c324f0 Author: Takashi Iwai Date: Wed Feb 11 08:28:04 2009 +0100 ASoC: Fix forgotten replacements of socdev->codec The snd_soc_codec was moved into socdev->card, but this change wasn't applied in some places. Fixed now. Signed-off-by: Takashi Iwai commit ed850a52af971528b048812c4215cef298af0d3b Author: Mimi Zohar Date: Tue Feb 10 23:01:19 2009 -0500 integrity: shmem zero fix Based on comments from Mike Frysinger and Randy Dunlap: (http://lkml.org/lkml/2009/2/9/262) - moved ima.h include before CONFIG_SHMEM test to fix compiler error on Blackfin: mm/shmem.c: In function 'shmem_zero_setup': mm/shmem.c:2670: error: implicit declaration of function 'ima_shm_check' - added 'struct linux_binprm' in ima.h to fix compiler warning on Blackfin: In file included from mm/shmem.c:32: include/linux/ima.h:25: warning: 'struct linux_binprm' declared inside parameter list include/linux/ima.h:25: warning: its scope is only this definition or declaration, which is probably not what you want - moved fs.h include within _LINUX_IMA_H definition Signed-off-by: Mimi Zohar Signed-off-by: Mike Frysinger Signed-off-by: James Morris commit 367681f4ec9b226db201f181c4f47dd973f733a6 Author: Breno Leitão Date: Tue Feb 10 17:24:48 2009 -0800 ixgbe: Removing the unused PAGE_USE_COUNT() macro. Removing the unused PAGE_USE_COUNT() macro. Also removing the unused pages variable at ixgbe_configure_rx() function. Signed-off-by: Breno Leitão Signed-off-by: Jay Vosburgh Acked-by: Peter P Waskiewicz Jr Signed-off-by: David S. Miller commit c9523379d6000f379a84b6b970efb8782c128071 Author: dave graham Date: Tue Feb 10 12:52:28 2009 +0000 e1000e: Serdes - attempt autoneg when link restored. This patch addresses an issue where we did not restart auto-negotiation on serdes links when the link partner was disabled and re-enabled. It includes reworking the serdes link detect mechanism to be a state machine for 82571 and 82572 parts only. Signed-off-by: dave graham Acked-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 573cca8c6fdbf6bd2dae8f9e9b66931990849c83 Author: dave graham Date: Tue Feb 10 12:52:05 2009 +0000 e1000e: remove RXSEQ link monitoring for serdes RXSEQ interrupts were used to force link state interrogation of serdes links, as the Si was not guaranteed to report LSC interrupts when the link changed state. On some bladeservers this resulted in false link up reports if no link partner was connected. The RXSEQ treatment is not necessary, as the link can be monitored from the watchdog timer, and the false link indications cease. Signed-off-by: dave graham Acked-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 5df3f0eaf8b236cc785e2733a3df1e5c84e4aad8 Author: dave graham Date: Tue Feb 10 12:51:41 2009 +0000 e1000e: Disable dynamic clock gating for 82571 per si errata. 82571 and 82572 Errata #13 documents that the Si feature DMA Dynamic Clock Gating should be disabled, and identifies the workaround of disabling the feature by EEPROM setting. EEPROM versions that do not include the recommended workaround have been found in the field, and so some customers remain at risk. Because the feature DMA Dynamic clock Gating can be disabled by directly setting the appropriate bit in the E1000_CTRL_EXT register, this patch overrides the EEPROM setting, and force-disables the feature. Signed-off-by: dave graham Acked-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 111b9dc5c981ba608b4afede37237cfeb67b07f2 Author: Jesse Brandeburg Date: Tue Feb 10 12:51:20 2009 +0000 e1000e: add aer support most if not all of the devices supported by e1000e support AER (Advanced Error Reporting) so we attempt to register with the OS that we know how to reset ourselves after a fatal error. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 42fb61f02f9bdc476c7a76d3cce0400d989f44c5 Author: Steve Wise Date: Tue Feb 10 16:38:57 2009 -0800 RDMA/cxgb3: Connection termination fixes The poll and flush code needs to handle all send opcodes: SEND, SEND_WITH_SE, SEND_WITH_INV, and SEND_WITH_SE_INV. Ignore TERM indications if the connection already gone. Ignore HW receive completions if the RQ is empty. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 900f4c16c338f742b80f3aa500e12ceb017e86af Author: Steve Wise Date: Tue Feb 10 16:38:22 2009 -0800 RDMA/cxgb3: sgl/pbl offset calculation needs 64 bits The variable 'offset' in iwch_sgl2pbl_map() needs to be a u64. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 9e32ebdb3aa4e5d2366b032baa16b95f3d7788b9 Merge: 7565fc3... 272edb0... Author: Mark Brown Date: Tue Feb 10 21:37:01 2009 +0000 Merge branch 'for-2.6.29' into for-2.6.30 commit 501ca25629e997b7169f22cc72c70454f4a7dbb4 Merge: 22971e3... 44a678d... Author: Takashi Iwai Date: Tue Feb 10 17:17:17 2009 +0100 Merge branch 'fix/hda' into topic/hda commit 22971e3a77f193579be525a12f3ab91dbf241517 Author: Takashi Iwai Date: Tue Feb 10 11:56:44 2009 +0100 ALSA: hda - add digital beep support for ALC268 Added the digital beep support for ALC268. It was missing in the last patches. However, ALC268 has a strange pin use for widget 0x1d, which could be used as another purpose. So, the patch adds a check of the beep control before creating the hook for input layer. Signed-off-by: Takashi Iwai commit b4ac530fc3af02a004729043dacf6b6330b46892 Author: David S. Miller Date: Tue Feb 10 02:09:24 2009 -0800 net: Move skbuff symbol exports after each symbol's definition. net/core/skbuff.c is a hodge-podge of symbol export placement. Some of the exports are right after the definition of the symbol being exported, others are clumped together into a big group at the end of the file. Make things consistent. Signed-off-by: David S. Miller commit e4e90b210dbe8253aaf519ee6efaaab7b2b92034 Author: David S. Miller Date: Tue Feb 10 01:54:22 2009 -0800 irda: Use __netdev_alloc_skb() instead of __dev_alloc_skb(). Signed-off-by: David S. Miller commit 9034f77bad1e86c4b43e5f5739eb3b8f4878e947 Author: David S. Miller Date: Tue Feb 10 01:56:45 2009 -0800 netdev: Use __netdev_alloc_skb() instead of __dev_alloc_skb(). Signed-off-by: David S. Miller commit 149490f131ab532a3b9e8806249a0e730994cdf6 Author: Jarek Poplawski Date: Tue Feb 10 00:11:21 2009 -0800 pkt_sched: sch_multiq: Change errno on non-multiqueue devices use. Current "RTNETLINK answers: Invalid argument" warning, while trying to add multiq qdisc to non-multiqueue device, isn't very helpful and some of these devs can be changed btw., so let's use a better errno. With feedback from Stephen Hemminger Reported-by: Badalian Vyacheslav Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit d54e6d872767ae6512978f86a35d623a8ed948c5 Author: David S. Miller Date: Mon Feb 9 23:45:29 2009 -0800 net: Kill skbuff macros from the stone ages. This kills of HAVE_ALLOC_SKB and HAVE_ALIGNABLE_SKB. Nothing in-tree uses them and nothing in-tree has used them since 2.0.x times. Signed-off-by: David S. Miller commit 4b53b361e0fbb2390f1d98ed9eede8e0c9a887b6 Merge: 4cdc44a... 99e0fca... Author: David S. Miller Date: Mon Feb 9 23:30:44 2009 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 4cdc44a231f906a6ec586637e6e4c4c216679da4 Author: Scott Feldman Date: Mon Feb 9 23:25:33 2009 -0800 enic: Add api for link down count and to get firmware notification status. Signed-off-by: Scott Feldman Signed-off-by: David S. Miller commit 68f717089a62ee4c51933f4be43e4ef7b31539fd Author: Scott Feldman Date: Mon Feb 9 23:24:24 2009 -0800 enic: bug fix: tx_timeout reset path fix-ups tx_timeout reset path needs to re-init dev and re-apply nic cfg to enable vlan stripping. Signed-off-by: Scott Feldman Signed-off-by: David S. Miller commit bd9fb1a44a5c52a1c322ebacd08f6b7416a40a86 Author: Scott Feldman Date: Mon Feb 9 23:24:08 2009 -0800 enic: record all bad FCS errs as frame errors Report all bad FCS errs as frames errs. This includes frames with bad FCS on wire detected by MAC and frames which may be truncated due to ingress FIFO overruns. No longer print a driver msg on bad FCS err. Signed-off-by: Scott Feldman Signed-off-by: David S. Miller commit ed8af6b288c0643dfe0ad91f1bfc8c56c0d307cc Author: Scott Feldman Date: Mon Feb 9 23:23:50 2009 -0800 enic: bug fix: return notify intr credits Return notify intr credits after notify intr from firmware. This is especially important for legacy PCI intr mode, where not returning credits would cause PBA to remain asserted which would get us right back into the ISR. Signed-off-by: Scott Feldman Signed-off-by: David S. Miller commit 0ecc103aec454288cbaa5a33d8960ab3467e8a11 Merge: 0012985... 4906f99... Author: David S. Miller Date: Mon Feb 9 23:22:21 2009 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/gianfar.c commit 0012985d184b7b9d4513eacd35771715471e06ef Author: Alexey Dobriyan Date: Mon Feb 9 18:05:16 2009 -0800 ppp: section fixes re netns PPP is modular code so no initdata on netns hooks. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 99e0fca6740b98aed1f604fc2e0acbdbc9e7578a Author: Michael Buesch Date: Tue Feb 3 20:06:14 2009 +0100 b43: (b2062) Fix crystal frequency calculations This fixes the crystal frequency calculations in the b2062 init code. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 686aa5f2137d04f389e527f0391d65232338e599 Author: Michael Buesch Date: Tue Feb 3 19:36:45 2009 +0100 b43: Port spec bugfixes for the LP baseband init A few bugs were fixed in the LP baseband init specs. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit c9703146158c0415a60799570397e488bc982af5 Author: Michael Buesch Date: Tue Feb 3 19:23:18 2009 +0100 ssb: Add PMU support This adds support for the SSB PMU. A PMU is found on Low-Power devices. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit baf62eecfa75a26682efdfed0d74256992a47e6b Author: Roel Kluin Date: Tue Feb 3 17:15:57 2009 +0100 libertas: pos[4] tested twice, 2nd should be pos[5] pos[4] can't be both 0x43 and 0x04, 2nd should be pos[5] Signed-off-by: Roel Kluin Acked-by: Dan Williams Signed-off-by: John W. Linville commit 0c2bec96945ccfc4a58a88d73531e392972ba6c5 Author: Mike Rapoport Date: Tue Feb 3 09:04:20 2009 +0200 libertas: if_spi: add ability to call board specific setup/teardown methods In certain cases it is required to perform board specific actions before activating libertas G-SPI interface. These actions may include power up of the chip, GPIOs setup, proper pin-strapping and SPI controller config. This patch adds ability to call board specific setup/teardown methods Signed-off-by: Mike Rapoport Acked-by: Andrey Yurovsky Acked-by: Dan Williams Signed-off-by: John W. Linville commit d43e87868f67c5b52defd8d82bc3f54347ed2408 Author: Vasanthakumar Thiagarajan Date: Tue Feb 3 10:09:49 2009 +0530 mac80211: Remove bss information of the current AP when it goes out of range There is no point having the bss information of currently associated AP when the AP is detected to be out of range. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit de9f97efb2ea2a32a610932d881e4d3653e0f932 Author: Luis R. Rodriguez Date: Mon Feb 2 20:35:05 2009 -0800 ath9k: fix reg_notifier() flags used upon a country IE The nl80211 rule flags were being used. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 24b5bcc6aef46346edd69becf62d2125c0b3208e Author: Michael Buesch Date: Sat Jan 31 19:34:53 2009 +0100 b43: Add LP 2062 radio init This adds initialization code for the 2062 radio. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 6c1bb9276c492c803611e63fa6fab8276c02ee70 Author: Michael Buesch Date: Sat Jan 31 16:52:29 2009 +0100 b43: Add LP-PHY baseband init for >=rev2 This adds code for the baseband init of LP-PHY >=2. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 3302e44dcdb8aff99769921af12b916a914b6317 Author: Danny Kukawka Date: Sat Jan 31 15:52:40 2009 +0100 iwlwifi: another led naming fix Fixed led device naming for the iwlwifi (iwl-3945) driver. Due to the documentation of the led subsystem/class the naming should be "devicename:colour:function" while not applying sections should be left blank. This should lead to e.g. "iwl-%s::RX" instead of "iwl-%s:RX". Signed-off-by: Danny Kukawka Acked-by: Reinette Chatre Signed-off-by: John W. Linville commit b34196d7d031a966c70ce2ede9087be56c7dd4bc Author: Danny Kukawka Date: Sat Jan 31 15:52:20 2009 +0100 rt2x00: fix led naming Fixed led device naming for the rt2x00 driver. Due to the documentation of the led subsystem/class the naming should be "devicename:colour:function" while not applying sections should be left blank. This should lead to e.g. "%s::radio" instead of "%s:radio". Signed-off-by: Danny Kukawka Signed-off-by: John W. Linville commit b157b5e60b2e4eefa8fb13936e0d2642ccc1d02c Author: Danny Kukawka Date: Sat Jan 31 15:52:16 2009 +0100 b43legacy: fix led naming Fixed led device naming for the b43legacy driver. Due to the documentation of the led subsystem/class the naming should be "devicename:colour:function" while not applying sections should be left blank. This should lead to e.g. "b43legacy-%s::rx" instead of "b43legacy-%s:rx". Signed-off-by: Danny Kukawka Acked-by: Larry Finger Signed-off-by: John W. Linville commit 0818cb8adfedf3e5b48662056f0228576c666d9d Author: Danny Kukawka Date: Sat Jan 31 15:52:09 2009 +0100 ath9k: fix led naming Fixed led device naming for the ath9k driver. Due to the documentation of the led subsystem/class the naming should be "devicename:colour:function" while not applying sections should be left blank. This should lead to e.g. "ath9k-%s::rx" instead of "ath9k-%s:rx". Signed-off-by: Danny Kukawka Signed-off-by: John W. Linville commit a387cc7d380504bf64743789f47de35605e05596 Author: Michael Buesch Date: Sat Jan 31 14:20:44 2009 +0100 b43: Add LP-PHY register definitions This adds register definitions for the LP-PHY. This also adds a few minor empty function bodies for the LP-init. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 964d6ad935d96a002fdbbdfcac38f02a084f75d9 Author: Ivo van Doorn Date: Sat Jan 31 10:07:39 2009 +0100 Add new rt73usb USB ID Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit f130347c2dd8e7ce0757cd3cf80bedbc6ed63c4c Author: Luis R. Rodriguez Date: Fri Jan 30 09:26:42 2009 -0800 cfg80211: add get reg command This lets userspace request to get the currently set regulatory domain. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 47f4d8872ffc57ad92d0fb344e677d12acc34acd Author: Luis R. Rodriguez Date: Fri Jan 30 09:08:29 2009 -0800 mac80211: do not TX injected frames when not allowed Monitor mode is able to TX by using injected frames. We should not allow injected frames to be sent unless allowed by regulatory rules. Since AP mode uses a monitor interfaces to transmit management frames we have to take care to not break AP mode as well while resolving this. We can deal with this by allowing compliant APs solutions to inform mac80211 if their monitor interface is intended to be used for an AP by setting a cfg80211 flag for the monitor interface. hostapd, for example, currently does its own checks to ensure AP mode is not used on channels which require radar detection. Once such solutions are available it can can add this flag for monitor interfaces. Acked-by: Johannes Berg Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 7230645e329b4a9c566fefa9327eb8734c7d392c Author: Johannes Berg Date: Fri Jan 30 13:36:25 2009 +0100 mac80211: convert master interface to netdev_ops Also call our own ieee80211_master_setup routine instead of overwriting almost all the values from ether_setup; this loses a few assignments that are pointless on the master interface anyway. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 587e729ecff959482d25c73278a1fbadbc6a54fe Author: Johannes Berg Date: Fri Jan 30 13:35:22 2009 +0100 mac80211: convert to net_device_ops Convert to new net_device_ops in 2.6.28 and later. Signed-off-by: Stephen Hemminger Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 7fee5372d814c4be9546e5c28ac0058258d8df3e Author: Johannes Berg Date: Fri Jan 30 11:13:06 2009 +0100 mac80211: remove HW_SIGNAL_DB Giving the signal in dB isn't much more useful to userspace than giving the signal in unspecified units. This removes some radiotap information for zd1211 (the only driver using this flag), but it helps a lot for getting cfg80211-based scanning which won't support dB, and zd1211 being dB is a little fishy anyway. Signed-off-by: Johannes Berg Cc: Bruno Randolf Signed-off-by: John W. Linville commit 7a7dec656252a5784218a22abf76ad1cdef115d0 Author: Sujith Date: Fri Jan 30 14:32:09 2009 +0530 ath9k: Add debugfs files for printing TX rate details Signed-off-by: Sujith Signed-off-by: John W. Linville commit c89424df441ea8d794682b9c5620d8e8b0315438 Author: Sujith Date: Fri Jan 30 14:29:28 2009 +0530 ath9k: Handle mac80211's RC flags for MCS rates mac80211 notifies the RC algorithm if RTS/CTS and short preamble are needed. The RC flags for MCS rates are currently not handled by mac80211, and ath9k's RC doesn't set the flags either. Fix this. Also, set the rts_cts_rate_idx inside the RC algorithm. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 3900898c7a3d563d14a1288f483f8a589bd38299 Author: Sujith Date: Fri Jan 30 14:29:15 2009 +0530 ath9k: Cleanup get_rate() interface The interface to calculate the TX rate for a data frame was convoluted with lots of redundant arguments being passed around. Remove all of that and make it simple. Signed-off-by: Sujith Signed-off-by: John W. Linville commit a6c8d375f539d450bf8d45e8ccbb7c9e26dffbef Author: Felix Fietkau Date: Fri Jan 30 01:36:48 2009 +0100 ath5k: properly free rx dma descriptors When freeing rx dma descriptors, use the right buffer size. Fixes kernel oopses on module unload on ixp4xx and most likely other platforms as well. Signed-off-by: Felix Fietkau Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit c1b4aa3fb619782213af2af6652663c8f9cef373 Author: Harvey Harrison Date: Thu Jan 29 13:26:44 2009 -0800 wireless: replace uses of __constant_{endian} The base versions handle constant folding now. Signed-off-by: Harvey Harrison Signed-off-by: John W. Linville commit e5d24efe529b26d782b41a61a5e958c72f36f295 Author: Danny Kukawka Date: Thu Jan 29 21:58:26 2009 +0100 iwlwifi: fix led naming Fixed led device naming for the iwl driver. Due to the documentation of the led subsystem/class the naming should be "devicename:colour:function" while not applying sections should be left blank. This should lead to e.g. "iwl-phy0::RX" instead of "iwl-phy0:RX". Signed-off-by: Danny Kukawka Acked-by: Reinette Chatre Signed-off-by: John W. Linville commit 9a23e5a2268fc03a55c7e7112ce904629276d0b2 Author: Jay Sternberg Date: Thu Jan 29 11:09:17 2009 -0800 ipw2x00: correct Kconfig to prevent following entries from not indenting not defining dependencies for LIBIPW caused the following entries to not be indented. changing this entry to depend on PCI && WLAN_80211 corrects this issue Signed-off-by: Jay Sternberg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 29f35c149e887960ccb5a7d31fb5d9f813193418 Author: Jay Sternberg Date: Thu Jan 29 11:09:16 2009 -0800 iwlwifi: remove chain noise calibration functions from 6000 family redefine structures that contain function pointer for chain noise reset and chain noise gain for the 6000 family since these are not needed. Signed-off-by: Jay Sternberg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit e8c00dcb028a1b702863c3a454315c7ae5f544e7 Author: Jay Sternberg Date: Thu Jan 29 11:09:15 2009 -0800 iwlwifi: define structures and functions externally for customization defined the structures and functions as extern to alter behavior used by 5000 series for other products including 100 and 6000 series Signed-off-by: Jay Sternberg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 76a2407a5b043d0950d5657184118e89860d545c Author: Jay Sternberg Date: Thu Jan 29 11:09:14 2009 -0800 iwlwifi: correct API command overlap Correct the API commands where same command id used for two different commands. Update max api versions for affected devices. TX_ANT_CONFIGURATION_CMD was already using id 0x98, so REPLY_TX_POWER_DBM_CMD moved to 0x95 Older API interfaces may used original value so V1 defines provided. Signed-off-by: Jay Sternberg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 050681b77d10ac81bf6be5b2c61aa6c5969947e4 Author: Jay Sternberg Date: Thu Jan 29 11:09:13 2009 -0800 iwlwifi: parametrize configuration of the PLL for exclusion on 6000 added a config parameter to enable setting PLL_CFG. older hardware has this parameter set true. the 6000 family does not support this setting, so this parameter set false. Signed-off-by: Jay Sternberg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit c0bac76a22c00d0b4622b2847e0b087befb9ff25 Author: Jay Sternberg Date: Mon Feb 2 16:21:14 2009 -0800 iwlwifi: simplify parameter setting to allow support for 6000 series by parametrizing the set hw function, in addition to allowing for supporting the 6000 family significantly simplify the addition of new hardware. Signed-off-by: Jay Sternberg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 2264596d6d0a5c1e569af809625c11f8f2d89435 Author: Jay Sternberg Date: Thu Jan 29 11:09:11 2009 -0800 iwlwifi: add new HW_REV_TYPEs for Intel WiFi Link 100, 6000 and 6050 Series simply add definitions for the HW_REV_TYPEs for the new devices. Signed-off-by: Jay Sternberg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit c4e3a5844812dd5bf03282e021175d55d608f594 Author: Alina Friedrichsen Date: Thu Jan 29 13:56:20 2009 +0100 mac80211: IBSS join rework I hold back this patch for around a week to avoid confusion. This is the second step of "mac80211: Fixed BSSID handling revisited". With it, in the situation of a strange merge to the same BSSID (e.g. caused by a TSF overflow) only reset_tsf() is called. And sta_info_flush_delayed() is only called if you change the network manually, not on an automatic BSSID merge. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit f2bffa7ea012befc2230331f97bf9b002c0b62bb Author: Vasanthakumar Thiagarajan Date: Thu Jan 29 17:52:19 2009 +0530 ath9k: Fix LED blink pattern Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit c0415b547d37e8065ad4adf289d11db2f3b16dfd Author: Alina Friedrichsen Date: Thu Jan 29 09:59:43 2009 +0100 mac80211: Creating new IBSS with fixed BSSID This fixes a bug when creating a new IBSS network with a fixed BSSID. The fixed BSSID situation is now with one of my last patches handled in ieee80211_sta_find_ibss() function. It's more robust to test against (ifsta->flags & IEEE80211_STA_PREV_BSSID_SET), because ifsta->state is not seted right in every situation and so the creating of the new IBSS network sometimes hangs after the first try to scan for a network to merge. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit 547c3763765654f9a796e628692d9e7d5c1039af Author: Sujith Date: Thu Jan 29 11:50:20 2009 +0530 ath9k: Remove a bunch of unused macros RX filter masks are already defined in enum ath9k_rx_filter in ath9k.h Signed-off-by: Sujith Signed-off-by: John W. Linville commit feed029cd63ee14df85afbe1583960c0e983a0ed Author: Sujith Date: Thu Jan 29 11:37:35 2009 +0530 ath9k: Fix typo in checking for chip revision Signed-off-by: Sujith Signed-off-by: John W. Linville commit e374055afbf92c8d128d8538aafc7e765838206e Author: Sujith Date: Thu Jan 29 09:34:22 2009 +0530 mac80211: Reset assoc_scan_tries after an unsuccessful scan run Trying to associate with a non-existent SSID stops the state machine after the first run. Subsequent association requests fail to start the scan engine. Fix this by resetting assoc_scan_tries to zero after completing a scan run. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 7519a8f0778bdb14f07cf685fa5fee6ab07e734c Author: Luis R. Rodriguez Date: Wed Jan 28 12:17:49 2009 -0800 ath9k: remove passive scan on 5 GHz if country IE knows better If we have new found information about our location and the current country regulatory domain does not have passive scan flag requirements we should be able to actively scan now on those channels. Since AP functionality is not allowed where passive scan flags are set this means if you have a world regulatory domain and you get a country IE that allows that channel (with active scan) then we lift the passive-scan requirement so you can then use AP mode. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 547e4c2e64d0be5e8491abb49ee6b0f0f8272de1 Author: Luis R. Rodriguez Date: Wed Jan 28 12:17:48 2009 -0800 ath9k: move check for radar freqs into a helper This will be used later. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 8c63c46d58c9dca6d0bfacfb41958c55d9b75ea0 Author: Luis R. Rodriguez Date: Wed Jan 28 12:17:47 2009 -0800 ath9k: replace usage of internal wireless_modes for conf No need to use our internal wireless mode variable when cfg80211 already has its own. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 4e30ffa29c1388006e5d36d5ea8c5b46b38b36d5 Author: Vivek Natarajan Date: Wed Jan 28 20:53:27 2009 +0530 ath9k: Enable MIB and TIM interrupts for station mode. Enable operating mode specific interrupts in ath9k_add_interface instead of ath9k_start. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit d22b0022e75b37e5c5a995754fcf9f61b39022d2 Author: Sujith Date: Wed Jan 28 11:55:45 2009 +0530 ath9k: Fix lockdep warning This patch fixes the lockdep warning shown below, and also initializes the starting sequence number when starting a TX aggregation session. ============================================= [ INFO: possible recursive locking detected ] 2.6.29-rc2-wl #21 --------------------------------------------- swapper/0 is trying to acquire lock: (_xmit_IEEE80211#2){-+..}, at: [] __qdisc_run+0x221/0x290 but task is already holding lock: (_xmit_IEEE80211#2){-+..}, at: [] __qdisc_run+0x221/0x290 other info that might help us debug this: 7 locks held by swapper/0: #0: (rcu_read_lock){..--}, at: [] dev_queue_xmit+0x53/0x620 #1: (_xmit_ETHER#2){-+..}, at: [] __qdisc_run+0x221/0x290 #2: (rcu_read_lock){..--}, at: [] dev_queue_xmit+0x53/0x620 #3: (_xmit_IEEE80211#2){-+..}, at: [] __qdisc_run+0x221/0x290 #4: (rcu_read_lock){..--}, at: [] ieee80211_master_start_xmit+0x219/0x6c0 [mac80211] #5: (rcu_read_lock){..--}, at: [] ieee80211_start_tx_ba_session+0x66/0x4e0 [mac80211] #6: (rcu_read_lock){..--}, at: [] dev_queue_xmit+0x53/0x620 stack backtrace: Pid: 0, comm: swapper Not tainted 2.6.29-rc2-wl #21 Call Trace: [] __lock_acquire+0x1be9/0x1c40 [] dev_queue_xmit+0xe1/0x620 [] __lock_acquire+0x18c/0x1c40 [] lock_acquire+0x55/0x70 [] __qdisc_run+0x221/0x290 [] _spin_lock+0x39/0x50 [] __qdisc_run+0x221/0x290 [] _spin_unlock+0x1f/0x50 [] __qdisc_run+0x221/0x290 [] dev_queue_xmit+0x308/0x620 [] dev_queue_xmit+0x53/0x620 [] ieee80211_start_tx_ba_session+0x303/0x4e0 [mac80211] [] ieee80211_start_tx_ba_session+0x66/0x4e0 [mac80211] [] rate_control_get_rate+0xae/0xc0 [mac80211] [] invoke_tx_handlers+0x655/0x1000 [mac80211] [] mark_held_locks+0x4d/0x90 [] _spin_unlock_irqrestore+0x65/0x80 [] __ieee80211_tx_prepare+0x16a/0x310 [mac80211] [] __ieee80211_tx_prepare+0x19c/0x310 [mac80211] [] pskb_expand_head+0x112/0x190 [] ieee80211_master_start_xmit+0x286/0x6c0 [mac80211] [] ieee80211_master_start_xmit+0x219/0x6c0 [mac80211] [] __lock_acquire+0x18c/0x1c40 [] __qdisc_run+0x23e/0x290 [] dev_queue_xmit+0x308/0x620 [] dev_queue_xmit+0x53/0x620 [] ieee80211_subif_start_xmit+0x4a1/0x980 [mac80211] [] ieee80211_subif_start_xmit+0x198/0x980 [mac80211] [] __qdisc_run+0x23e/0x290 [] dev_queue_xmit+0x308/0x620 [] dev_queue_xmit+0x53/0x620 [] ip6_output+0x62d/0x1230 [ipv6] [] __mod_timer+0xb0/0xd0 [] mld_sendpack+0x3fa/0x4a0 [ipv6] [] mld_sendpack+0x0/0x4a0 [ipv6] [] mld_ifc_timer_expire+0x0/0x340 [ipv6] [] mld_ifc_timer_expire+0x289/0x340 [ipv6] [] mld_ifc_timer_expire+0x0/0x340 [ipv6] [] run_timer_softirq+0x147/0x220 [] __do_softirq+0x9b/0x180 [] tick_dev_program_event+0x36/0xb0 [] call_softirq+0x1c/0x30 [] do_softirq+0x65/0xb0 [] irq_exit+0x9d/0xc0 [] smp_apic_timer_interrupt+0x86/0xd0 [] apic_timer_interrupt+0x13/0x20 Signed-off-by: Sujith Signed-off-by: John W. Linville commit 0cbe0064614ace61e08618948f82c6d525e75017 Author: Ivo van Doorn Date: Wed Jan 28 00:33:47 2009 +0100 rt2x00: Validate firmware in driver The get_firmware_crc() callback function isn't flexible enough when dealing with multiple firmware versions. It might in some cases be possible that the firmware file contains multiple CRC checksums. Create the check_firmware() callback function where the driver has complete freedom in how to validate the firmware. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit a2c9b652a12a550d3d8509e9bae43bac396c5076 Author: Ivo van Doorn Date: Wed Jan 28 00:32:33 2009 +0100 rt2x00: Add kill_tx_queue callback function provide rt2x00lib the possibility to kill a particular TX queue. This can be useful when disabling the radio, but more importantly will allow beaconing to be disabled when mac80211 requests this (during scanning for example) Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 382fe0f2da78db7833c6a7278e33e694e6e2a6f3 Author: Ivo van Doorn Date: Wed Jan 28 00:32:13 2009 +0100 rt2x00: Move intf_work to mac82011 workqueue ieee80211_iterate_active_interfaces() no longer acquires the RTNL lock which means the intf_work handler can be safely used from the mac80211 workqueue again. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit d25aabb0a1a2f659206ba21f6ac8ec28047e5595 Author: Winkler, Tomas Date: Tue Jan 27 14:27:58 2009 -0800 iwlwifi: unify iwlagn and 3945 power save management This patch unifies 3945 and iwlagn power save management This patch also better separates system state from user setting. System state shall be removed later as this shall be shifted to user space Signed-off-by: Tomas Winkler Acked-by: Mohamed Abbas Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit e1623446bb1de1834ff1c57b3e8ed341d5d4a927 Author: Tomas Winkler Date: Tue Jan 27 14:27:56 2009 -0800 iwlwifi: don't use implicit priv in IWL_DEBUG Call IWL_DEBUG macro with explicit priv argument. Signed-off-by: Tomas Winkler Acked-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 450154e4f471248e188d18e45c2409b37a133765 Author: Winkler, Tomas Date: Tue Jan 27 14:27:55 2009 -0800 iwlwifi: check return value of pci_enable_device pci_enable_device is tagged with __must_check therefore don't ignore the return value in pci_resume handlers Signed-off-by: Tomas Winkler Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit dfb39e82957153c5748675b72bbe7eded2e2b069 Author: Winkler, Tomas Date: Tue Jan 27 14:27:54 2009 -0800 iwlwifi: iwl3945_send_tx_power must be static iwl3945_send_tx_power must be static Signed-off-by: Tomas Winkler Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 7530f85f086a5d58a5e43b1a98993801fe509c51 Author: Winkler, Tomas Date: Tue Jan 27 14:27:53 2009 -0800 iwlwifi: suppress unused variable warning when compiling w/o IWLWIFI_DEBUG This patch adds __maybe_unused attribute to priv variables used in functions that used it solely for debug printouts Signed-off-by: Tomas Winkler Cc: Helmut Schaa Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 8ccde88a87a3dc906234b281a036fee9c7371949 Author: Samuel Ortiz Date: Tue Jan 27 14:27:52 2009 -0800 iwl3945: Getting rid of the *39_rxon iwl_priv fields The iwl_rxon_cmd is really just a iwl3945_rxon_cmd structure extension. So, we can use the *_rxon fields from iwl_priv instead of the 3945 specific ones (*39_rxon). We have to then be careful when submitting REPLY_RXON host commands, since the command length as to be set according to the HW. As another precaution the reserved4 and reserved5 fields are cleared before being sent to the 3945. With the *39_rxon removal, a lot of duplicated code can be removed from the 3945 code base. Signed-off-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit d14c7c1d6aef1175625ea72938b07cee072723dc Author: Andrey Borzenkov Date: Sun Jan 25 23:08:43 2009 +0300 orinoco: checkpatch cleanup Fix errors and obvious warnings reported by checkpatch in all files except orinoco.c. Orinoco.c is part of different patch series of Dave. Signed-off-by: Andrey Borzenkov Signed-off-by: John W. Linville commit 7565fc38cc8c3a2742d63e957199d70a82d2faf1 Author: Jarkko Nikula Date: Mon Feb 9 14:27:07 2009 +0200 ASoC: TLV320AIC3X: Add TLV information for volume controls TLV320AIC3X volume controls are logarithmic. Export their dB ranges. Signed-off-by: Jarkko Nikula Signed-off-by: Mark Brown commit b93f74f604c53b546fced33d11aee722560de249 Author: Jarkko Nikula Date: Mon Feb 9 14:27:06 2009 +0200 ASoC: TLV320AIC3X: Fix volume ranges This is a minor fix but helps to define dB ranges for volume controls. Only DAC digital volume has full register value range from 0 to 127 but ADC PGA gain and output stage volume controls don't. For ADC PGA, maximum value is 119 and then it saturates to the same gain value of 59.5 dB. For output stages, value 117 corresponds to -78.3 dB and is muted for values 118 and above. Signed-off-by: Jarkko Nikula Signed-off-by: Mark Brown commit a85165c66c5640c37b67a94aa4e00fe45273bca1 Author: Takashi Iwai Date: Mon Feb 9 17:15:50 2009 +0100 ALSA: via82xx - Clean up quirk list Use SND_PCI_QUIRK_VENDOR() macro. Signed-off-by: Takashi Iwai commit d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de Merge: 2ebfb8e... 8bd4bb7... Author: Takashi Iwai Date: Mon Feb 9 17:20:13 2009 +0100 Merge branch 'topic/quirk-cleanup' into topic/misc commit dea0a5095b5e21306a81c496567043798fac7815 Author: Takashi Iwai Date: Mon Feb 9 17:14:52 2009 +0100 ALSA: hda - Clean up quirk lists Clean up quirk lists with bit masks. Also, sorted in numerical order for alc662_cfg_tbl[]. Signed-off-by: Takashi Iwai commit 2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa Merge: 23c7b52... 8bd4bb7... Author: Takashi Iwai Date: Mon Feb 9 17:19:21 2009 +0100 Merge branch 'topic/quirk-cleanup' into topic/hda commit 8bd4bb7a35e8ebb015a531218614c48e10a3c4ee Author: Takashi Iwai Date: Fri Jan 30 17:27:45 2009 +0100 ALSA: Add subdevice_mask field to quirk entries Introduced a new field, subdevice_mask, which specifies the bitmask to match with the given subdevice ID. Signed-off-by: Takashi Iwai commit 548c8933801c9ee347b6f1bad2491e4286a4f3a2 Author: Hannes Eder Date: Sun Feb 8 20:24:47 2009 +0100 kernel/irq: fix sparse warning: make symbol static While being at it make every occurrence of 'do_irq_select_affinity' have the same signature in terms of signedness of the first argument. Fix this sparse warning: kernel/irq/manage.c:112:5: warning: symbol 'do_irq_select_affinity' was not declared. Should it be static? Also rename do_irq_select_affinity() to setup_affinity() - shorter name and clearer naming. Signed-off-by: Hannes Eder Acked-by: Matthew Wilcox Signed-off-by: Ingo Molnar commit 005bf0e6fa0e9543933fe2e36322af649df7cacb Author: Yinghai Lu Date: Sun Feb 8 16:18:03 2009 -0800 irq: optimize init_kstat_irqs/init_copy_kstat_irqs Simplify and make init_kstat_irqs etc more type proof, suggested by Andrew. Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar commit 0f3c2a89c1451cdf6328f99977bd9decd4f708e1 Author: Yinghai Lu Date: Sun Feb 8 16:18:03 2009 -0800 irq: clear kstat_irqs Impact: get correct kstat_irqs [/proc/interrupts] for msi/msi-x etc need to call clear_kstat_irqs(), so when we reuse that irq_desc, we get correct kstat in /proc/interrupts. This makes /proc/interrupts not have entries. Don't need to worry about arch that doesn't support genirq, because they will not call dynamic_irq_cleanup(). v2: simplify and make clear_kstat_irqs more robust Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar commit 23c7b521c250b261dd97a7a06d5a2e74b56233d5 Author: Herton Ronaldo Krzesinski Date: Sun Feb 8 19:51:28 2009 -0200 ALSA: hda - Don't touch non-existent port f on 4-port 92hd71bxx codecs When checking for input amps on pins 0x0a, 0x0d and 0x0f, and initializing them for 92hd71xxx codec models, we must skip nid 0x0f for 4-port models too like with 5-port models, as it is unused (nid 0x0f is vendor reserved in 4-port models). Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Takashi Iwai commit 8663ae55f39e99c25242adb6242a191258a4eca1 Author: Herton Ronaldo Krzesinski Date: Sun Feb 8 19:50:34 2009 -0200 ALSA: hda - Bind new ecs mobo id (1019:2950) to model=ecs202 This adds a new sound quirk entry (model=ecs202) for an ecs motherboard with IDT STAC9221 codec (1019:2950). Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Takashi Iwai commit aa6320d336971171df1d13c1c284facf10804881 Author: Herbert Xu Date: Sun Feb 8 18:00:40 2009 +0000 gro: Optimise TCP packet reception gro: Optimise TCP packet reception As this function can be called more than half a million times for 10GbE, it's important to optimise it as much as we can. This patch uses bit ops to logical ops, as well as open coding memcmp to exploit alignment properties. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit a5ad24be728d4352b71a81fba471aa41eb71f83a Author: Herbert Xu Date: Sun Feb 8 18:00:39 2009 +0000 gro: Optimise IPv4 packet reception As this function can be called more than half a million times for 10GbE, it's important to optimise it as much as we can. This patch does some obvious changes to use 2-byte and 4-byte operations instead of byte-oriented ones where possible. Bit ops are also used to replace logical ops to reduce branching. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit aa4b9f533ed5a22952e038b9fac2447ccc682124 Author: Herbert Xu Date: Sun Feb 8 18:00:37 2009 +0000 gro: Optimise Ethernet header comparison This patch optimises the Ethernet header comparison to use 2-byte and 4-byte xors instead of memcmp. In order to facilitate this, the actual comparison is now carried out by the callers of the shared dev_gro_receive function. This has a significant impact when receiving 1500B packets through 10GbE. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 4ae5544f9a33e4ae306e337f96951eb3ff2df6d9 Author: Herbert Xu Date: Sun Feb 8 18:00:36 2009 +0000 gro: Remember number of held packets instead of counting every time This patch prepares for the move of the same_flow checks out of dev_gro_receive. As such we need to remember the number of held packets since doing a loop just to count them every time is silly. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d6301d3dd1c287b32132dda15272a50c11e92a14 Author: David S. Miller Date: Sun Feb 8 19:24:13 2009 -0800 net: Increase default NET_SKB_PAD to 32. Several devices need to insert some "pre headers" in front of the main packet data when they transmit a packet. Currently we allocate only 16 bytes of pad room and this ends up not being enough for some types of hardware (NIU, usb-net, s390 qeth, etc.) So increase this to 32. Note that drivers still need to check in their transmit routine whether enough headroom exists, and if not use skb_realloc_headroom(). Tunneling, IPSEC, and other encapsulation methods can cause the padding area to be used up. Signed-off-by: David S. Miller commit 44dd2b9168350b82a671ce71666b99208ab2d973 Author: Philipp Zabel Date: Thu Feb 5 17:48:21 2009 +0100 ASoC: pxa2xx-i2s: remove I2S pin setup This removes the calls to pxa_gpio_mode from the pxa2xx-i2s driver. Pin setup should be done during board init via pxa2xx_mfp_config instead. Signed-off-by: Philipp Zabel Acked-by: Eric Miao Signed-off-by: Mark Brown commit 772885c1dc42f1992ac4fc937f1ed4ae9d42a31e Author: Philipp Zabel Date: Thu Feb 5 17:48:20 2009 +0100 pxa/spitz: Setup I2S pins for pxa2xx-i2s The spitz has a WM8750 codec connected as I2S slave but doesn't use the PXA I2S system clock. Signed-off-by: Philipp Zabel Acked-by: Eric Miao Signed-off-by: Mark Brown commit 4e7f78f815412fd25b207b8c63a698b637c9621d Author: Philipp Zabel Date: Thu Feb 5 17:48:19 2009 +0100 pxa/h5000: Setup I2S pins for pxa2xx-i2s The iPAQ h5000 has an AK4535 codec connected as I2S slave, PXA I2S providing SYSCLK. Signed-off-by: Philipp Zabel Acked-by: Eric Miao Signed-off-by: Mark Brown commit 67137a5d46d5a7c4cbdc66f03d1e2f397fe14b2b Author: Roel Kluin Date: Sun Feb 8 18:17:37 2009 +0100 ASoC: count reaches 10001, not 10000. With a postfix increment count reaches 10001, not 10000. Signed-off-by: Mark Brown commit 8f0dc655f9efa3fc81b8cdaf5aa1f2779f8db46d Author: Robert Jarzmik Date: Sat Feb 7 14:01:58 2009 +0100 ASoC: Add initial support of Mitac mioa701 device SoC. This machine driver enables sound functions on Mitac mio a701 smartphone. Build upon ASoC v1, it handles : - rear speaker - front speaker - microphone - GSM A global "Mio Mode" switch is not yet provided to cope with audio path setup. As balance on audio chip line is no more assured, an incorrect setup can produce a lot of heat and even fry the battery behind the wm9713 and the speaker amplifier. It doesn't cope with : - headset jack - mio master mode - master volume control This driver is backported from ASoc v2, and amputated from scenario setups and master volume control. [Minor mods for terminology in comments -- broonie] Signed-off-by: Robert Jarzmik Signed-off-by: Mark Brown commit 5ba1ae92b6796b3367152ccd9baa022dde7eed4c Merge: ae1a25d... 2d68259... 42bb8cc... 6626bff... ff08f76... Author: Ingo Molnar Date: Sun Feb 8 20:14:11 2009 +0100 Merge branches 'timers/clockevents', 'timers/hpet', 'timers/hrtimers' and 'timers/urgent' into timers/core commit 140573d33b703194b7e1893711e78b7f546cca7c Merge: 34cb613... ceacc2c... 483b4ee... Author: Ingo Molnar Date: Sun Feb 8 20:12:46 2009 +0100 Merge branches 'sched/rt' and 'sched/urgent' into sched/core commit 409f0a9014fe24d906ba21aaccff80eb7f7304da Merge: 5937218... 0b492fc... Author: David S. Miller Date: Sat Feb 7 02:52:44 2009 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl3945-base.c commit 593721833d2a3987736467144ad062a709d3a72c Author: Jesse Brandeburg Date: Fri Feb 6 23:23:32 2009 +0000 igb: remove dead code in transmit routine Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 86d5d38fa1afe2c96f184482d6c6d1a59ee7e2dc Author: Alexander Duyck Date: Fri Feb 6 23:23:12 2009 +0000 igb: update version number and copyright dates Update the version number to 1.3.16 and update copyright dates for 2009. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 265de4090853e56fb152e4cb0d21e4ec568d561a Author: Alexander Duyck Date: Fri Feb 6 23:22:52 2009 +0000 igb: fix two minor items found during code review This patch addresses two minor items I found while cleaning up the igb driver for our sourceforge version. The first clears the context index if we don't flag that we need it. The second item is that eims_other should be used instead of bit defines when setting all of the EICS bits prior to reset. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 04fe63583d4648c0378a58afc0de89b640d822ef Author: Alexander Duyck Date: Fri Feb 6 23:22:32 2009 +0000 igb: update stats before doing reset in igb_down It was seen with repeated interface up/down testing that there was a large stray between the stats reported by the queues and the stats reported by the HW. It was found to be an issue in that hw stats were being reset without first being recorded. This change records the stats before wiping them from the system via the reset. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 450c87c8d28aeaf83889389ceeb01457c1a6f3e9 Author: Alexander Duyck Date: Fri Feb 6 23:22:11 2009 +0000 igb: remove redundant count set and err_hw_init Remove the setting of ring->count variables from igb_probe as they are duplicating the same configuration that is done igb_alloc_queues. Remove the err_hw_init tag as it can be replaced by err_sw_init. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 8675737a9c1bf6c295461efc64898359398e1c82 Author: Alexander Duyck Date: Fri Feb 6 23:21:51 2009 +0000 igb: remove disable_av variable from mac_info struct The disable_av variable is never used by the driver and provides no value as it is likely a leftover debugging variable. I have removed it and replaced the one spot that checked for it with a check for a valid address. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit fa4dfae0ce703976578015902025137d5e268501 Author: Alexander Duyck Date: Fri Feb 6 23:21:31 2009 +0000 igb: change pba size determination from if to switch statement As additional hardware is added to the igb driver it is easier to support the expansion via switch statements instead of using nested ifs. For this reason I am changing this to a switch statement. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit a8564f033efade1b6f027c4bb807cdf8cf5c9570 Author: Alexander Duyck Date: Fri Feb 6 23:21:10 2009 +0000 igb: move get_hw_control within igb_resume. Move igb_get_hw_control up so that it is called just after the reset in igb_resume. This notifies the HW sooner that the driver is reassuming control of the device. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 4a3c6433e48592f260278966742a99e0d77de3cc Author: Alexander Duyck Date: Fri Feb 6 23:20:49 2009 +0000 igb: don't read eicr when responding to legacy interrupts The interrupt handler was reading eicr and then doing nothing with the result. I have removed the variable and the register read since they provide no value to the legacy interrupt handler. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 28b0759c224cad4ae8f5ed47f5af862dd2d1e1ed Author: Alexander Duyck Date: Fri Feb 6 23:20:31 2009 +0000 igb: remove unnecessary adapter->hw calls when just hw-> will do. There were several spots in the code making calls to adapter->hw when they could have just been accessing hw-> directly. I cleaned up the spots where this was visibly apparent. Signed-off-by: Alexander Duyck Signed-off-by: David S. Miller commit 8a900862a2402565564ddcc3c6ecefb1c239d7e1 Author: Alexander Duyck Date: Fri Feb 6 23:20:10 2009 +0000 igb: rename igb_update_mc_addr_list_82575 to not include the 82575 There isn't much point in having the _82575 hanging off the end of this function since there aren't any other version of this function running around within this driver. This also allows for a bit of whitespace cleanup due to a shorter function name. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 4b1a9877364599fe57f263597821dab6bd86f3b9 Author: Alexander Duyck Date: Fri Feb 6 23:19:50 2009 +0000 igb: remove redundant timer updates and cleanup watchdog_task The igb watchdog task is modifying the watchdog timer twice duing a single run. It only needs to be called once to reschedule itself for 2 seconds from the last time it ran. In addition I removed the allocation of the mac_info structure since it is only called twice and is easier to access via the e1000_hw struct. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit eebbbdba5eb44406061e4dff130257b654773d3f Author: Alexander Duyck Date: Fri Feb 6 23:19:29 2009 +0000 igb: cleanup igb_netpoll to be more friendly with napi & GRO This patch cleans up igb_netpoll so that it is more friendly with both the current napi and newly introduced GRO features. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit dda0e0834c839c0e4b1717cbe9c22c35ca935809 Author: Alexander Duyck Date: Fri Feb 6 23:19:08 2009 +0000 igb: add counter for dma out of sync errors Add a counter for dma out of sync errors reported via interrupt. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 2753f4cebf034a53f87b24679f394854275dcacb Author: Alexander Duyck Date: Fri Feb 6 23:18:48 2009 +0000 igb: update testing done by ethtool Most of the code for the testing has pretty much become stale at this point and is need of update. This update just streamlines most of the code, widens the range of interrupt testing. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 7d8eb29e6eae9cc13e1975daf28d2ae789c1f110 Author: Alexander Duyck Date: Fri Feb 6 23:18:27 2009 +0000 igb: update feature flags supported in ethtool This driver is currently using HW_CSUM which is not correct. Update this to use the IP_CSUM and IPV6_CSUM flags. In addition consolidate the TSO flag setting. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 0fbe67af3ee1928f7eae273133b7112d1665d4d3 Author: Alexander Duyck Date: Fri Feb 6 23:18:06 2009 +0000 igb: remove unused rx_hdr_split statistic This statistic is not used and so it is safe to remove Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 312c75aee7606e886d91c810bc491c9f40ff5837 Author: Alexander Duyck Date: Fri Feb 6 23:17:47 2009 +0000 igb: rename nvm ops All of the nvm ops have the tag _nvm added to the end which is redundant since all of the calls to the ops have to go through the nvm ops struct anyway. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit a8d2a0c27f84bdbf54b7e1c1a52ef7b8b7196dbc Author: Alexander Duyck Date: Fri Feb 6 23:17:26 2009 +0000 igb: rename phy ops This patch renames write_phy_reg to write_reg and read_phy_reg to read_reg. It seems redundant to call out phy in an operation that is part of the phy_ops struct. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 40a70b3889ea50daa10a7f3468920c1f5483155d Author: Alexander Duyck Date: Fri Feb 6 23:17:06 2009 +0000 igb: read address from RAH/RAL instead of from EEPROM Instead of pulling the mac address from EEPROM it is easier to pull it from the RAL/RAH registers and then just copy it into the address structures. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit c1889bfe687c22f74d1333913ffe8f8da173d601 Author: Alexander Duyck Date: Fri Feb 6 23:16:45 2009 +0000 igb: make dev_spec a union and remove dynamic allocation This patch makes dev_spec a union and simplifies it so that it does not require dynamic allocation and freeing in the driver. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 4d6b725e4d8e499fad012a25381c8d9bf53fbf4b Author: Alexander Duyck Date: Fri Feb 6 23:16:24 2009 +0000 igb: add link check function Add a link check function to contain all activities related to verifying that the link is present. The current approach is a bit cludgy and needs to be cleaned up. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit aed5dec370e294233d647251ce1e5f74d70b09c9 Author: Alexander Duyck Date: Fri Feb 6 23:16:04 2009 +0000 igb: remove check for needing an io port Since igb supports only pci-e nics and there is no plan to support any legacy pci parts in the driver there isn't really much need for checking to see if an io port is needed. In the unlikely event that we do begin supporting legacy pci parts then we can see about adding this code back to the driver. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 83b7180d0da2a8ff92baa6a35f6871aeb74d9bec Author: Alexander Duyck Date: Fri Feb 6 23:15:45 2009 +0000 igb: move initialization of number of queues into set_interrupt_capability This patch moves the initialization of the number of queues into set_interrupt_capability. This allows the number of queues to increase in the unlikely event that the system initially fails to allocate enough msi-x interrupts, does a suspend/resume, and then can allocate enough interrupts on resume. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit db76176215ec5af7a67386e0eacb5ea53e040f10 Author: Alexander Duyck Date: Fri Feb 6 23:15:25 2009 +0000 igb: move setting of buffsz out of repeated path in alloc_rx_buffers buffsz is being repeatedly set when allocaing buffers. Since this value should only need to be set once in the function I am moving it out of the looped portion of the path. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 69d3ca5357bb93bb3a139c5d90077407f8828bd1 Author: Alexander Duyck Date: Fri Feb 6 23:15:04 2009 +0000 igb: optimize/refactor receive path While cleaning up the skb_over panic with small frames I found there was room for improvement in the ordering of operations within the rx receive flow. These changes will place the prefetch for the next descriptor to a point earlier in the rx path. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 3e450669cc7060d56d886f53e31182f5fef103c7 Author: Peter P Waskiewicz Jr Date: Sat Feb 7 02:16:59 2009 -0800 ixgbe: Fix a set_num_queues() bug that can result in num_(r|t)x_queues = 0 Now that our set_num_queues() routines for each feature are re-entrant, and can be called at any point, they shouldn't zero out the feature's indices or mask bits. Subsequent calls into those routines for those features can result in zero Rx and Tx queues being assigned, causing a panic later in driver reinitialization. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 2813ddd1bfd681a2fcc1d95530b399a92da89556 Author: Ayaz Abdulla Date: Sat Feb 7 00:25:18 2009 -0800 forcedeth: bump version to 63 This patch bumps the version up to 63 Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit daa91a9d2402d33b70b8685dee6fd3e517bf34a9 Author: Ayaz Abdulla Date: Sat Feb 7 00:25:00 2009 -0800 forcedeth: recover error support This patch adds another type of recoverable error to the driver. It also modifies the sequence for recovery to include a mac reset and clearing of interrupts. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit c1086cda7d46885d672d282af04d1273b001442f Author: Ayaz Abdulla Date: Sat Feb 7 00:24:39 2009 -0800 forcedeth: ethtool tx csum fix This patch fixes the ethtool tx csum "set" command. A recent patch was submitted to remove HW_CSUM and use IP_CSUM instead. Therefore, the corresponding ethtool command should also be modified. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit b6e4405bf7241ae91c497e021370066fcfb196c8 Author: Ayaz Abdulla Date: Sat Feb 7 00:24:15 2009 -0800 forcedeth: msi interrupt fix This patch fixes an issue with the suspend/resume cycle with msi interrupts. See bugzilla number 10487 for more details. The fix is to re-setup a private msi pci config offset field. Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit cac1c52c3621b46e3be49cf7887a7cfa393890de Author: Ayaz Abdulla Date: Sat Feb 7 00:23:57 2009 -0800 forcedeth: mgmt unit interface This patch updates the logic used to communicate with the mgmt unit. It also adds a version check for a newer mgmt unit firmware. * Fixed udelay to schedule_timeout_uninterruptible Signed-off-by: Ayaz Abdulla Signed-off-by: David S. Miller commit 1f0fa15432e49547c3fa915644c7e0c0975809e7 Author: Ilpo Järvinen Date: Fri Feb 6 23:48:33 2009 -0800 net/sunrpc/xprtsock.c: some common code found $ diff-funcs xs_udp_write_space net/sunrpc/xprtsock.c net/sunrpc/xprtsock.c xs_tcp_write_space --- net/sunrpc/xprtsock.c:xs_udp_write_space() +++ net/sunrpc/xprtsock.c:xs_tcp_write_space() @@ -1,4 +1,4 @@ - * xs_udp_write_space - callback invoked when socket buffer space + * xs_tcp_write_space - callback invoked when socket buffer space * becomes available * @sk: socket whose state has changed * @@ -7,12 +7,12 @@ * progress, otherwise we'll waste resources thrashing kernel_sendmsg * with a bunch of small requests. */ -static void xs_udp_write_space(struct sock *sk) +static void xs_tcp_write_space(struct sock *sk) { read_lock(&sk->sk_callback_lock); - /* from net/core/sock.c:sock_def_write_space */ - if (sock_writeable(sk)) { + /* from net/core/stream.c:sk_stream_write_space */ + if (sk_stream_wspace(sk) >= sk_stream_min_wspace(sk)) { struct socket *sock; struct rpc_xprt *xprt; $ codiff net/sunrpc/xprtsock.o net/sunrpc/xprtsock.o.new net/sunrpc/xprtsock.c: xs_tcp_write_space | -163 xs_udp_write_space | -163 2 functions changed, 326 bytes removed net/sunrpc/xprtsock.c: xs_write_space | +179 1 function changed, 179 bytes added net/sunrpc/xprtsock.o.new: 3 functions changed, 179 bytes added, 326 bytes removed, diff: -147 Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit b5f348e5a41b39543c1c5efd661d7fd296dd5281 Author: Ilpo Järvinen Date: Fri Feb 6 23:48:01 2009 -0800 ipv6/addrconf: common code located $ codiff net/ipv6/addrconf.o net/ipv6/addrconf.o.new net/ipv6/addrconf.c: addrconf_notify | -267 1 function changed, 267 bytes removed net/ipv6/addrconf.c: add_addr | +86 1 function changed, 86 bytes added net/ipv6/addrconf.o.new: 2 functions changed, 86 bytes added, 267 bytes removed, diff: -181 Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit d73f08011bc30c03a2bcb1ccd880e4be84aea269 Author: Ilpo Järvinen Date: Fri Feb 6 23:47:37 2009 -0800 ipv6/ndisc: join error paths Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 910d30b704542b49f83881a4832d8414c6c3d9c3 Author: Ilpo Järvinen Date: Fri Feb 6 23:47:14 2009 -0800 ax25: more common return path joining Signed-off-by: Ilpo Järvinen Acked-by: Ralf Baechle Signed-off-by: David S. Miller commit 69ebbf58f3dff9fb4e5240e472b5869fa869dae1 Author: Ilpo Järvinen Date: Fri Feb 6 23:46:51 2009 -0800 ipmr: use goto to common label instead of opencoding Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 12207e498b9b8f9f0c946db079ad17c7ca16cdf3 Author: Peter P Waskiewicz Jr Date: Fri Feb 6 21:47:24 2009 -0800 ixgbe: Defeature Tx Head writeback Tx Head writeback is causing multi-microsecond stalls on PCIe chipsets, due to partial cacheline writebacks. Removing this feature removes these issues. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 0ecc061d1967e9f2694502079e00d9d6e1e39072 Author: Peter P Waskiewicz Jr Date: Fri Feb 6 21:46:54 2009 -0800 ixgbe: Update flow control state machine in link setup The flow control handling is overly complicated and difficult to maintain. This patch cleans up the flow control handling and makes it much more explicit. It also adds 1G flow control autonegotiation, for 1G copper links, 1G KX links, and 1G fiber links. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit cfb9fb5517faa9e61c7e874fc89ef9c9253a0902 Author: Takashi Iwai Date: Fri Feb 6 17:34:03 2009 +0100 ALSA: hda - Fix unused variable compile warning sound/pci/hda/patch_realtek.c:12693: warning: unused variable ‘i’ Signed-off-by: Takashi Iwai commit c5a4bcd0cac546c5d776af881c5e913ba4a9922d Author: Takashi Iwai Date: Fri Feb 6 17:22:05 2009 +0100 ALSA: hda - Use digital beep for AD codecs Use digital beep instead of analog pc-beep for AD codecs. Create the beep mixer controls dynamically on demand. Signed-off-by: Takashi Iwai commit a4ddeba9c8896cba8c6ce7a98c0b5c755c15a746 Author: Takashi Iwai Date: Fri Feb 6 17:21:09 2009 +0100 ALSA: hda - Remove superfluous code in patch_realtek.c codec->spec is reset in the caller side. Signed-off-by: Takashi Iwai commit c44765b8c8bfc883c9868ab7aef37d27b5b14be8 Author: Takashi Iwai Date: Fri Feb 6 16:48:10 2009 +0100 ALSA: hda - Clear codec->beep at release Clear codec->beep field in snd_hda_detach_beep_device() to be sure. Signed-off-by: Takashi Iwai commit f6c727813e03ce0f58d73808da8c9a6bc227249e Merge: 0b86a4e... 527bdfe... Author: Ingo Molnar Date: Fri Feb 6 16:46:30 2009 +0100 Merge branch 'core/header-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip into core/header-fixes commit c8dcdf829ca1827a802eae841dd04de8c9d6653f Author: Takashi Iwai Date: Fri Feb 6 16:21:20 2009 +0100 ALSA: hda - Add missing NULL check in snd_hda_create_spdif_in_ctls() Signed-off-by: Takashi Iwai commit 527bdfee18ac6a4c026060c2c2b1144df9a5bf1f Author: Jaswinder Singh Rajput Date: Fri Feb 6 20:47:58 2009 +0530 make linux/types.h as assembly safe Signed-off-by: Jaswinder Singh Rajput commit 2678c07b07ac2076675e5d57653bdf02e9af1950 Author: Jaswinder Singh Rajput Date: Fri Feb 6 20:46:06 2009 +0530 Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h Signed-off-by: Jaswinder Singh Rajput commit d95ad4a9c04129f581fdffe01a379682e420ad9c Merge: 45bdd1c... 4a5a4c5... Author: Takashi Iwai Date: Fri Feb 6 16:13:34 2009 +0100 Merge branch 'fix/hda' into topic/hda commit 45bdd1c1bbac56876cb9c71649300013281e4b22 Author: Takashi Iwai Date: Fri Feb 6 16:11:25 2009 +0100 ALSA: hda - Create beep mixer controls dynamically for Realtek codecs Create beep mixer controls dynamically for Realtek codecs instead of static arrays. Signed-off-by: Takashi Iwai commit e255265b475824fd5291df706093705ab677c29f Merge: 85ef237... 397d5ae... Author: Mark Brown Date: Fri Feb 6 14:19:45 2009 +0000 Merge branch 'for-2.6.29' into for-2.6.30 commit 85ef2375ef2ebbb2bf660ad3a27c644d0ebf1b1a Author: Timur Tabi Date: Thu Feb 5 17:56:02 2009 -0600 ASoC: optimize init sequence of Freescale MPC8610 sound drivers In the Freescale MPC8610 sound drivers, relocate all code from the _prepare functions into the corresponding _hw_params functions. These drivers assumed that the sample size is known in the _prepare function and not in the _hw_params function, but this is not true. Move the code in fsl_dma_prepare() into fsl_dma_hw_param(). Create fsl_ssi_hw_params() and move the code from fsl_ssi_prepare() into it. Turn off snooping for DMA operations to/from I/O registers, since that's not necessary. Signed-off-by: Timur Tabi Signed-off-by: Mark Brown commit 8836c273e4d44d088157b7ccbd2c108cefe70565 Author: Mike Frysinger Date: Fri Feb 6 18:12:35 2009 +0800 ASoC: Blackfin: drop unnecessary dma casts Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Mark Brown commit 92a950ff2b7091a735c32a6e57b8136650bc7812 Author: Mike Frysinger Date: Fri Feb 6 18:12:34 2009 +0800 ASoC: Blackfin: cleanup sport handling in ASoC Blackfin AC97 code - make sport number handling more dynamic as not all Blackfins have a linear sport map starting at 0 - indexes can be macroed away too Signed-off-by: Mike Frysinger Signed-off-by: Cliff Cai Signed-off-by: Bryan Wu Signed-off-by: Mark Brown commit 394827913e371b058849349c6fc9d52c59c31a3d Author: Yinghai Lu Date: Fri Feb 6 01:31:12 2009 -0800 forcedeth: enable msix to default Impact: change default msix and napic can work again Signed-off-by: Yinghai Lu Signed-off-by: David S. Miller commit 033e97b24ad6aaeddbb0180bbd87844513171430 Author: Yinghai Lu Date: Fri Feb 6 01:30:56 2009 -0800 forcedeth: ck804 and mcp55 doesn't need timerirq Impact: cleanup so get less irq. Signed-off-by: Yinghai Lu Signed-off-by: David S. Miller commit 0335ef5d59f40931e1b8f0a8be6a09dbc623081b Author: Yinghai Lu Date: Fri Feb 6 01:30:36 2009 -0800 forcedeth: disable irq at first before schedule rx Impact: clean up schedule it later after disable it. Signed-off-by: Yinghai Lu Signed-off-by: David S. Miller commit 79d30a581fc405fc63322622cb1517d95ed8f5ce Author: Yinghai Lu Date: Fri Feb 6 01:30:01 2009 -0800 forcedeth: don't clear nic_poll_irq too early Impact: fix bug for msix, we still need that flag to enable irq respectively Signed-off-by: Yinghai Lu Signed-off-by: David S. Miller commit ddb213f0768dc8b10cab37a21b85b567f1966d4a Author: Yinghai Lu Date: Fri Feb 6 01:29:23 2009 -0800 forcedeth: make msi-x different name for rx-tx Impact: make /proc/interrupts could show more info which irq is rx or other for msi-x add three name fields for rx, tx, other Signed-off-by: Yinghai Lu Signed-off-by: David S. Miller commit ff491a7334acfd74e515c896632e37e401f52676 Author: Pablo Neira Ayuso Date: Thu Feb 5 23:56:36 2009 -0800 netlink: change return-value logic of netlink_broadcast() Currently, netlink_broadcast() reports errors to the caller if no messages at all were delivered: 1) If, at least, one message has been delivered correctly, returns 0. 2) Otherwise, if no messages at all were delivered due to skb_clone() failure, return -ENOBUFS. 3) Otherwise, if there are no listeners, return -ESRCH. With this patch, the caller knows if the delivery of any of the messages to the listeners have failed: 1) If it fails to deliver any message (for whatever reason), return -ENOBUFS. 2) Otherwise, if all messages were delivered OK, returns 0. 3) Otherwise, if no listeners, return -ESRCH. In the current ctnetlink code and in Netfilter in general, we can add reliable logging and connection tracking event delivery by dropping the packets whose events were not successfully delivered over Netlink. Of course, this option would be settable via /proc as this approach reduces performance (in terms of filtered connections per seconds by a stateful firewall) but providing reliable logging and event delivery (for conntrackd) in return. This patch also changes some clients of netlink_broadcast() that may report ENOBUFS errors via printk. This error handling is not of any help. Instead, the userspace daemons that are listening to those netlink messages should resync themselves with the kernel-side if they hit ENOBUFS. BTW, netlink_broadcast() clients include those that call cn_netlink_send(), nlmsg_multicast() and genlmsg_multicast() since they internally call netlink_broadcast() and return its error value. Signed-off-by: Pablo Neira Ayuso Signed-off-by: David S. Miller commit 612e244c12215f6f74973ea3b89bff96450dc530 Author: Alex Chiang Date: Thu Feb 5 23:55:45 2009 -0800 e1000e: normalize usage of serdes_has_link Cosmetic change to use struct e1000_mac_info.serdes_has_link consistently as the 'bool' that it's declared as. No functional change. Signed-off-by: Alex Chiang Acked-by: Jeff Kirsher Signed-off-by: David S. Miller commit 34b0368c6864321c7020ddc8cbaec9a63b4e3de8 Author: Peter P Waskiewicz Jr Date: Thu Feb 5 23:54:42 2009 -0800 ixgbe: Display EEPROM version in ethtool -i queries Currently ixgbe does not display the EEPROM version in ethtool -i, where other drivers do. The EEPROM version is located at offset 0x29. This patch adds support to display it. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 3201d3130ee3eb49ed0e905654568f02736afdcb Author: Peter P Waskiewicz Jr Date: Thu Feb 5 23:54:21 2009 -0800 ixgbe: Update link setup code to better support autonegotiation of speed The current code has some flaws in it when performing autonegotiation, especially on KX/KX4 links. This patch updates the code to better handle the autonegotiation states on link setup. The patch also removes a redundant link configuration call on driver load, and moves link configuration to the ->open() path. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit bc97114d3f998a040876695a9b2b5be0b1a5320b Author: Peter P Waskiewicz Jr Date: Thu Feb 5 23:53:59 2009 -0800 ixgbe: Refactor set_num_queues() and cache_ring_register() The current code to determine the number of queues the device will want on driver initialization is ugly and difficult to maintain. It also doesn't allow for easy expansion for future features or future hardware. This patch refactors these routines, and make them easier to deal with. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit b25c9da19889e33bb4ee2dff369fc46caa4543b0 Author: Wu Fengguang Date: Fri Feb 6 15:02:27 2009 +0800 ALSA: enable concurrent digital outputs for ALC1200 Add the SPDIF pin as slave digital out to enable concurrent HDMI/SPDIF outputs for ASUS M3A-H/HDMI with ALC1200 codec. Tested-by: Thomas Schneider Signed-off-by: Wu Fengguang Signed-off-by: Takashi Iwai commit 56035022d86fff45299288cb372a42f752ba23fa Author: Herbert Xu Date: Thu Feb 5 21:26:52 2009 -0800 gro: Fix frag_list merging on imprecisely split packets The previous fix ad0f9904444de1309dedd2b9e365cae8af77d9b1 (gro: Fix handling of imprecisely split packets) only fixed the case of frags merging, frag_list merging in the same circumstances were still broken. In particular, the packet headers end up in the data stream. This patch fixes this plus another issue where an imprecisely split packet header may be read incorrectly (this is mostly harmless since it'll simply cause the packet to not match and be rejected for GRO). Thanks to Emil Tantilov and Jeff Kirsher for helping to track this down. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit fe2918b098cdbf55b69ba8762bd3de0ae64f33ff Author: Graf Yang Date: Thu Feb 5 21:26:19 2009 -0800 net: fix some trailing whitespaces Signed-off-by: Graf Yang Signed-off-by: Bryan Wu Signed-off-by: David S. Miller commit 33dccbb050bbe35b88ca8cf1228dcf3e4d4b3554 Author: Herbert Xu Date: Thu Feb 5 21:25:32 2009 -0800 tun: Limit amount of queued packets per device Unlike a normal socket path, the tuntap device send path does not have any accounting. This means that the user-space sender may be able to pin down arbitrary amounts of kernel memory by continuing to send data to an end-point that is congested. Even when this isn't an issue because of limited queueing at most end points, this can also be a problem because its only response to congestion is packet loss. That is, when those local queues at the end-point fills up, the tuntap device will start wasting system time because it will continue to send data there which simply gets dropped straight away. Of course one could argue that everybody should do congestion control end-to-end, unfortunately there are people in this world still hooked on UDP, and they don't appear to be going away anywhere fast. In fact, we've always helped them by performing accounting in our UDP code, the sole purpose of which is to provide congestion feedback other than through packet loss. This patch attempts to apply the same bandaid to the tuntap device. It creates a pseudo-socket object which is used to account our packets just as a normal socket does for UDP. Of course things are a little complex because we're actually reinjecting traffic back into the stack rather than out of the stack. The stack complexities however should have been resolved by preceding patches. So this one can simply start using skb_set_owner_w. For now the accounting is essentially disabled by default for backwards compatibility. In particular, we set the cap to INT_MAX. This is so that existing applications don't get confused by the sudden arrival EAGAIN errors. In future we may wish (or be forced to) do this by default. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit cb5629b10d64a8006622ce3a52bc887d91057d69 Merge: 8920d5a... f01d1d5... Author: James Morris Date: Fri Feb 6 11:01:45 2009 +1100 Merge branch 'master' into next Conflicts: fs/namei.c Manually merged per: diff --cc fs/namei.c index 734f2b5,bbc15c2..0000000 --- a/fs/namei.c +++ b/fs/namei.c @@@ -860,9 -848,8 +849,10 @@@ static int __link_path_walk(const char nd->flags |= LOOKUP_CONTINUE; err = exec_permission_lite(inode); if (err == -EAGAIN) - err = vfs_permission(nd, MAY_EXEC); + err = inode_permission(nd->path.dentry->d_inode, + MAY_EXEC); + if (!err) + err = ima_path_check(&nd->path, MAY_EXEC); if (err) break; @@@ -1525,14 -1506,9 +1509,14 @@@ int may_open(struct path *path, int acc flag &= ~O_TRUNC; } - error = vfs_permission(nd, acc_mode); + error = inode_permission(inode, acc_mode); if (error) return error; + - error = ima_path_check(&nd->path, ++ error = ima_path_check(path, + acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC)); + if (error) + return error; /* * An append-only file must be opened in append mode for writing. */ Signed-off-by: James Morris commit 8920d5ad6ba74ae8ab020e90cc4d976980e68701 Author: Rajiv Andrade Date: Thu Feb 5 13:06:30 2009 -0200 TPM: integrity fix Fix to function which is called by IMA, now tpm_chip_find_get() considers the case in which the machine doesn't have a TPM or, if it has, its TPM isn't enabled. Signed-off-by: Mimi Zohar Signed-off-by: Rajiv Andrade Acked-by: Serge Hallyn Signed-off-by: James Morris commit 64c61d80a6e4c935a09ac5ff1d952967ca1268f8 Author: James Morris Date: Thu Feb 5 09:28:26 2009 +1100 IMA: fix ima_delete_rules() definition Fix ima_delete_rules() definition so sparse doesn't complain. Signed-off-by: James Morris commit aa7168f47d912459a99a01c93714f447b44bfa72 Author: Mimi Zohar Date: Wed Feb 4 09:07:03 2009 -0500 Integrity: IMA update maintainers Signed-off-by: Mimi Zohar Signed-off-by: James Morris commit 1df9f0a73178718969ae47d813b8e7aab2cf073c Author: Mimi Zohar Date: Wed Feb 4 09:07:02 2009 -0500 Integrity: IMA file free imbalance The number of calls to ima_path_check()/ima_file_free() should be balanced. An extra call to fput(), indicates the file could have been accessed without first being measured. Although f_count is incremented/decremented in places other than fget/fput, like fget_light/fput_light and get_file, the current task must already hold a file refcnt. The call to __fput() is delayed until the refcnt becomes 0, resulting in ima_file_free() flagging any changes. - add hook to increment opencount for IPC shared memory(SYSV), shmat files, and /dev/zero - moved NULL iint test in opencount_get() Signed-off-by: Mimi Zohar Acked-by: Serge Hallyn Signed-off-by: James Morris commit f4bd857bc8ed997c25ec06b56ef8064aafa6d4f3 Author: Mimi Zohar Date: Wed Feb 4 09:07:01 2009 -0500 integrity: IMA policy open Sequentialize access to the policy file - permit multiple attempts to replace default policy with a valid policy Signed-off-by: Mimi Zohar Acked-by: Serge Hallyn Signed-off-by: James Morris commit 4af4662fa4a9dc62289c580337ae2506339c4729 Author: Mimi Zohar Date: Wed Feb 4 09:07:00 2009 -0500 integrity: IMA policy Support for a user loadable policy through securityfs with support for LSM specific policy data. - free invalid rule in ima_parse_add_rule() Signed-off-by: Mimi Zohar Acked-by: Serge Hallyn Signed-off-by: James Morris commit bab739378758a1e2b2d7ddcee7bc06cf4c591c3c Author: Mimi Zohar Date: Wed Feb 4 09:06:59 2009 -0500 integrity: IMA display Make the measurement lists available through securityfs. - removed test for NULL return code from securityfs_create_file/dir Signed-off-by: Mimi Zohar Acked-by: Serge Hallyn Signed-off-by: James Morris commit 3323eec921efd815178a23107ab63588c605c0b2 Author: Mimi Zohar Date: Wed Feb 4 09:06:58 2009 -0500 integrity: IMA as an integrity service provider IMA provides hardware (TPM) based measurement and attestation for file measurements. As the Trusted Computing (TPM) model requires, IMA measures all files before they are accessed in any way (on the integrity_bprm_check, integrity_path_check and integrity_file_mmap hooks), and commits the measurements to the TPM. Once added to the TPM, measurements can not be removed. In addition, IMA maintains a list of these file measurements, which can be used to validate the aggregate value stored in the TPM. The TPM can sign these measurements, and thus the system can prove, to itself and to a third party, the system's integrity in a way that cannot be circumvented by malicious or compromised software. - alloc ima_template_entry before calling ima_store_template() - log ima_add_boot_aggregate() failure - removed unused IMA_TEMPLATE_NAME_LEN - replaced hard coded string length with #define name Signed-off-by: Mimi Zohar Signed-off-by: James Morris commit 6146f0d5e47ca4047ffded0fb79b6c25359b386c Author: Mimi Zohar Date: Wed Feb 4 09:06:57 2009 -0500 integrity: IMA hooks This patch replaces the generic integrity hooks, for which IMA registered itself, with IMA integrity hooks in the appropriate places directly in the fs directory. Signed-off-by: Mimi Zohar Acked-by: Serge Hallyn Signed-off-by: James Morris commit dd542f169aaa35f4ac0d063e04b41c648a93887c Author: Takashi Iwai Date: Thu Feb 5 16:15:39 2009 +0100 ALSA: ca0106 - Add missing KERN_* prefix to printk Signed-off-by: Takashi Iwai commit 2ebfb8eeb8f244f9d25937d31a947895cf819e26 Author: Takashi Iwai Date: Thu Feb 5 16:11:58 2009 +0100 ALSA: Add missing KERN_* prefix to printk in other sound/* Signed-off-by: Takashi Iwai commit ee419653a38de93b75a577851d9e4003cf0bbe07 Author: Takashi Iwai Date: Thu Feb 5 16:11:31 2009 +0100 ALSA: Fix missing KERN_* prefix to printk in sound/pci Signed-off-by: Takashi Iwai commit 14ab08610971eb1db572ad8ca63acd13bc4d4caf Author: Takashi Iwai Date: Thu Feb 5 16:09:57 2009 +0100 ALSA: intel8x0 - Add missing KERN_* prefix to printk Signed-off-by: Takashi Iwai commit 28a97c194cec477073ae341f15b836437d8ef8e5 Author: Takashi Iwai Date: Thu Feb 5 16:08:14 2009 +0100 ALSA: emu10k1 - Add missing KERN_* prefix to printk Signed-off-by: Takashi Iwai commit e2ea7cfc703cba3299d22db728516a0fc1a9717c Author: Takashi Iwai Date: Thu Feb 5 16:07:02 2009 +0100 ALSA: Add missing KERN_* prefix to printk in sound/pci/ice1712 Signed-off-by: Takashi Iwai commit 42b0158bdb1344b05cc1e98c363fba9e97137565 Author: Takashi Iwai Date: Thu Feb 5 16:01:46 2009 +0100 ALSA: emux - Add missing KERN_* prefix to printk Signed-off-by: Takashi Iwai commit 45203832df2fa9e94ca0a249ddb20d2b077e58cc Author: Takashi Iwai Date: Thu Feb 5 15:51:50 2009 +0100 ALSA: Add missing KERN_* prefix to printk in sound/drivers Signed-off-by: Takashi Iwai commit 006de267351aa3d836f3307370eae7ec16eac09d Author: Takashi Iwai Date: Thu Feb 5 15:51:04 2009 +0100 ALSA: Add missing KERN_* prefix to printk in sound/core Signed-off-by: Takashi Iwai commit 939778aedd9386e13051a9e1d57c14cba2b6ae13 Author: Takashi Iwai Date: Thu Feb 5 15:57:55 2009 +0100 ALSA: hda - Add missing KERN_* prefix to printk ... and disable the annoying debug message. Signed-off-by: Takashi Iwai commit 54530bded6ecf22d683423b66fc3cd6dddb249aa Author: Takashi Iwai Date: Thu Feb 5 15:55:18 2009 +0100 ALSA: usb - Add missing KERN_* prefix to printk Signed-off-by: Takashi Iwai commit 4c9f1d3ed7e5f910b66dc4d1456cfac17e58cf0e Author: Takashi Iwai Date: Thu Feb 5 15:47:51 2009 +0100 ALSA: isa/*: Add missing KERN_* prefix to printk Signed-off-by: Takashi Iwai commit 91f050604cc045a0b7aa0460d36eb6e0f0cb301a Author: Takashi Iwai Date: Thu Feb 5 15:46:48 2009 +0100 ALSA: gus - Add missing KERN_* prefix to printk Signed-off-by: Takashi Iwai commit 76d498e43fa5f9f0a148dca8915cc7e9d9b9a643 Author: Takashi Iwai Date: Thu Feb 5 15:45:05 2009 +0100 ALSA: wss - Add missing KERN_* prefix to printk Signed-off-by: Takashi Iwai commit 6c7578bb0a631d018a68e5f90554f29fbd928055 Author: Hans-Christian Egtvedt Date: Thu Feb 5 13:11:01 2009 +0100 ALSA: Add Atmel ALSA drivers directory Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Haavard Skinnemoen Signed-off-by: Takashi Iwai commit 4ede028f8716523fc31e0d3d01b81405613dfb8f Author: Hans-Christian Egtvedt Date: Thu Feb 5 13:11:00 2009 +0100 ALSA: Add ALSA driver for Atmel AC97 controller This patch adds ALSA support for the AC97 controller found on Atmel AVR32 devices. Tested on ATSTK1006 + ATSTK1000 with a development board with a AC97 codec. Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Takashi Iwai commit e4967d6016b7785edafdb871e6d3e4426cb4bd1f Author: Hans-Christian Egtvedt Date: Thu Feb 5 13:10:59 2009 +0100 ALSA: Add ALSA driver for Atmel Audio Bitstream DAC This patch adds ALSA support for the Audio Bistream DAC found on Atmel AVR32 devices. The ABDAC is an Atmel IP which might show up on AT91 devices in the future, hence making a generic driver which can be utilized by AT91 arch if needed. Datasheet describing the ABDAC peripheral is available in the AT32AP7000 datasheet, http://www.atmel.com/dyn/products/datasheets.asp?family_id=682 Tested on ATSTK1006 + ATSTK1000 with a class D amplifier stage. Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Takashi Iwai commit 6bd0dd5f0ec67f654ebf95be8ef414afae1eecb7 Merge: 18e352e... b1a0aac... Author: Takashi Iwai Date: Thu Feb 5 15:08:33 2009 +0100 Merge branch 'topic/snd_card_new-err' into topic/atmel commit e6161653094f14b1add10efe3493a2e526fe9538 Author: Tim Blechmann Date: Thu Feb 5 13:01:54 2009 +0100 ALSA: snd_pcm_new api cleanup Impact: cleanup snd_pcm_new takes a char *id argument, although it is not modifying the string. it can therefore be declared as const char *id. Signed-off-by: Tim Blechmann Signed-off-by: Takashi Iwai commit 632da7321b7e9fa5375956280f8a0f380836c22d Author: Takashi Iwai Date: Thu Feb 5 15:02:06 2009 +0100 ALSA: hda - Add quirk for another HP laptop Add model=laptop entry for another HP laptop (103c:3077) with AD1984A. Signed-off-by: Takashi Iwai commit 67f7857ab12e9f8005ef988f0b667396e07622c2 Author: Takashi Iwai Date: Thu Feb 5 12:14:52 2009 +0100 ALSA: hda - Add quirk for HP zenith laptop Added model=laptop for another HP laptop (103c:3072) with AD1984A codec. Signed-off-by: Takashi Iwai commit 238c0270baade3a542c1497712dd8e66cc9cc476 Author: Mark Hills Date: Wed Feb 4 22:34:34 2009 +0000 ALSA: snd-usb-caiaq: Increase version number to 1.3.12 Indicates fixes affecting control messages and switching of input mode on Audio 8 DJ and Audio 4 DJ. Signed-off-by: Mark Hills Acked-by: Daniel Mack Signed-off-by: Takashi Iwai commit a8564155a9cb3b5c4a18afc451679a1f02c647b5 Author: Mark Hills Date: Wed Feb 4 22:34:33 2009 +0000 ALSA: snd-usb-caiaq: Remove duplicate A8DJ control Remove a duplicate control which causes an error when it is registered, and causes later controls to not be registered. The device does not have a fourth ground lift control. Signed-off-by: Mark Hills Acked-by: Daniel Mack Signed-off-by: Takashi Iwai commit 9a9527ed49f45e75a5b005592a261ab2bd7c1b1d Author: Mark Hills Date: Wed Feb 4 22:34:32 2009 +0000 ALSA: snd-usb-caiaq: Do not expose hardware input mode 0 of A4DJ In the context of the Audio 4 DJ (when compared to Audio 8 DJ), hardware input mode 0 is not used. Expose modes 1 (line) and 2 (phono) to the user as modes 0 and 1 respectively. Signed-off-by: Mark Hills Acked-by: Daniel Mack Signed-off-by: Takashi Iwai commit e3ca4c9982e3b84da859ca20a3ca0a9d5bda8c30 Author: Mark Hills Date: Wed Feb 4 22:34:31 2009 +0000 ALSA: snd-usb-caiaq: Set default input mode of A4DJ Do not start the device with input mode undefined. Mimic the behaviour of the Audio 8 DJ and start in phono input mode. Signed-off-by: Mark Hills Acked-by: Daniel Mack Signed-off-by: Takashi Iwai commit 705350f8bd6b44fda3f0dcc3e6f4b453da4378dd Author: Mark Hills Date: Wed Feb 4 22:34:30 2009 +0000 ALSA: snd-usb-caiaq: Send the correct command when setting controls Fixes a bug where an incorrect command was sent which had no effect on the device. Signed-off-by: Mark Hills Acked-by: Daniel Mack Signed-off-by: Takashi Iwai commit 28b7e343ee63454d563a71d2d5f769fc297fd5ad Author: Takashi Iwai Date: Thu Feb 5 09:28:08 2009 +0100 ALSA: Remove superfluous hwdep ops Remove NOP hwdep ops in sound drivers. Signed-off-by: Takashi Iwai commit e0d80648c0037b8b815317a52b782d4ea0c287f0 Author: Takashi Iwai Date: Thu Feb 5 09:17:50 2009 +0100 ALSA: hwdep - Fix coding style Fix misc coding style issues in hwdep.h and add some comments. Signed-off-by: Takashi Iwai commit 345d0b1964df83a6c3fff815fabd34e37265581f Author: Takashi Iwai Date: Thu Feb 5 09:10:20 2009 +0100 ALSA: hwdep - Make open callback optional Don't require the open callback as mandatory. Now all hwdeps ops can be optional. Signed-off-by: Takashi Iwai commit 45c1d85bcc6438454d104966c30fd2497ae1cdd7 Author: Matthew Ranostay Date: Wed Feb 4 17:49:41 2009 -0500 ALSA: hda: Added stac378x digital slave out struct Added the ADATOut nid to a slave digital outs struct to allow output via the DigOut pin. Signed-off-by: Matthew Ranostay Signed-off-by: Takashi Iwai commit 29d4ab4d6e996ef4c71910c915611151c34f1c75 Author: Herton Ronaldo Krzesinski Date: Wed Feb 4 11:37:27 2009 -0500 ALSA: hda - Don't call stac92xx_parse_auto_config with wrong dig_in Don't use uneeded/wrong third parameter for stac92xx_parse_auto_config in patch_stac92hd71bxx (no SPDIF in). Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Takashi Iwai commit 6df703aefc81252447c69d24d2863007de2338e9 Author: Herton Ronaldo Krzesinski Date: Wed Feb 4 11:34:22 2009 -0500 ALSA: hda - Dynamic detection of dmics/dmuxes/smuxes in stac92hd71bxx Detect the number of connected ports and number of smuxes dynamically, looking at pin configs, using new introduced functions stac92hd71bxx_connected_ports and stac92hd71bxx_connected_smuxes. Also use proper input mux configuration for 4port and 5port models. Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Takashi Iwai commit 616f89e74cd954e04ae4f8bad6a3dc8730a4a47a Author: Herton Ronaldo Krzesinski Date: Wed Feb 4 11:23:19 2009 -0500 ALSA: hda - Additional pin nids for STAC92HD71Bx and STAC92HD75Bx codecs Current code for STAC92HD71Bx and STAC92HD75Bx doesn't consider pin complexes 0x20 and 0x27. Also for 4 port models, nids 0x0e and 0x0f are vendor reserved. This commit changes code so it'll consider the additional pin complexes for models that have it, and avoid reserved nids to be touched on 4 port models. Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Takashi Iwai commit 306f47bd639b352b29193a3b69ef1d3546003efb Merge: 8f95c10... e8c0ee5... Author: Takashi Iwai Date: Thu Feb 5 07:42:28 2009 +0100 Merge branch 'fix/hda' into topic/hda commit 4cc7f68d65558f683c702d4fe3a5aac4c5227b97 Author: Herbert Xu Date: Wed Feb 4 16:55:54 2009 -0800 net: Reexport sock_alloc_send_pskb The function sock_alloc_send_pskb is completely useless if not exported since most of the code in it won't be used as is. In fact, this code has already been duplicated in the tun driver. Now that we need accounting in the tun driver, we can in fact use this function as is. So this patch marks it for export again. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 9a279bcbe347496799711155ed41a89bc40f79c5 Author: Herbert Xu Date: Wed Feb 4 16:55:27 2009 -0800 net: Partially allow skb destructors to be used on receive path As it currently stands, skb destructors are forbidden on the receive path because the protocol end-points will overwrite any existing destructor with their own. This is the reason why we have to call skb_orphan in the loopback driver before we reinject the packet back into the stack, thus creating a period during which loopback traffic isn't charged to any socket. With virtualisation, we have a similar problem in that traffic is reinjected into the stack without being associated with any socket entity, thus providing no natural congestion push-back for those poor folks still stuck with UDP. Now had we been consistent in telling them that UDP simply has no congestion feedback, I could just fob them off. Unfortunately, we appear to have gone to some length in catering for this on the standard UDP path, with skb/socket accounting so that has created a very unhealthy dependency. Alas habits are difficult to break out of, so we may just have to allow skb destructors on the receive path. It turns out that making skb destructors useable on the receive path isn't as easy as it seems. For instance, simply adding skb_orphan to skb_set_owner_r isn't enough. This is because we assume all over the IP stack that skb->sk is an IP socket if present. The new transparent proxy code goes one step further and assumes that skb->sk is the receiving socket if present. Now all of this can be dealt with by adding simple checks such as only treating skb->sk as an IP socket if skb->sk->sk_family matches. However, it turns out that for bridging at least we don't need to do all of this work. This is of interest because most virtualisation setups use bridging so we don't actually go through the IP stack on the host (with the exception of our old nemesis the bridge netfilter, but that's easily taken care of). So this patch simply adds skb_orphan to the point just before we enter the IP stack, but after we've gone through the bridge on the receive path. It also adds an skb_orphan to the one place in netfilter that touches skb->sk/skb->destructor, that is, tproxy. One word of caution, because of the internal code structure, anyone wishing to deploy this must use skb_set_owner_w as opposed to skb_set_owner_r since many functions that create a new skb from an existing one will invoke skb_set_owner_w on the new skb. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 7870389478d3c682c79c07abe7f1fce8b8a81952 Merge: 005c79b... b98ac70... Author: David S. Miller Date: Wed Feb 4 16:52:41 2009 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5 Merge: 4d7902f... eda58a8... Author: David S. Miller Date: Wed Feb 4 16:51:58 2009 -0800 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ commit 4d7902f22b0804730b80f7a4147f676430248a3a Author: Andy Fleming Date: Wed Feb 4 16:43:44 2009 -0800 gianfar: Fix stashing support Stashing is only supported on the 85xx (e500-based) SoCs. The 83xx and 86xx chips don't have a proper cache for this. U-Boot has been updated to add stashing properties to the device tree nodes of gianfar devices on 85xx. So now we modify Linux to keep stashing off unless those properties are there. Signed-off-by: Andy Fleming Signed-off-by: David S. Miller commit 0fd56bb5be6455d0d42241e65aed057244665e5e Author: Andy Fleming Date: Wed Feb 4 16:43:16 2009 -0800 gianfar: Add support for skb recycling Signed-off-by: Andy Fleming Signed-off-by: David S. Miller commit 1577ecef766650a57fceb171acee2b13cbfaf1d3 Author: Andy Fleming Date: Wed Feb 4 16:42:12 2009 -0800 netdev: Merge UCC and gianfar MDIO bus drivers The MDIO bus drivers for the UCC and gianfar ethernet controllers are essentially the same. There's no reason to duplicate that much code. Signed-off-by: Andy Fleming Signed-off-by: David S. Miller commit 9c46f6d42f1b5627c49a5906cb5b315ad8716ff0 Author: Alex Williamson Date: Wed Feb 4 16:36:34 2009 -0800 virtio_net: Allow setting the MAC address of the NIC Many physical NICs let the OS re-program the "hardware" MAC address. Virtual NICs should allow this too. Signed-off-by: Alex Williamson Acked-by: Mark McLoughlin Signed-off-by: David S. Miller commit 0bde95690d65653e420d04856c5d5783155c747c Author: Alex Williamson Date: Wed Feb 4 09:02:50 2009 +0000 virtio_net: Add support for VLAN filtering in the hypervisor VLAN filtering allows the hypervisor to drop packets from VLANs that we're not a part of, further reducing the number of extraneous packets recieved. This makes use of the VLAN virtqueue command class. The CTRL_VLAN feature bit tells us whether the backend supports VLAN filtering. Signed-off-by: Alex Williamson Acked-by: Rusty Russell Signed-off-by: David S. Miller commit f565a7c259d71cc186753653d978c646d2354b36 Author: Alex Williamson Date: Wed Feb 4 09:02:45 2009 +0000 virtio_net: Add a MAC filter table Make use of the MAC control virtqueue class to support a MAC filter table. The filter table is managed by the hypervisor. We consider the table to be available if the CTRL_RX feature bit is set. We leave it to the hypervisor to manage the table and enable promiscuous or all-multi mode as necessary depending on the resources available to it. Signed-off-by: Alex Williamson Acked-by: Rusty Russell Signed-off-by: David S. Miller commit 2af7698e2dd698d452ab9d63a9ca5956bbe8fc3b Author: Alex Williamson Date: Wed Feb 4 09:02:40 2009 +0000 virtio_net: Add a set_rx_mode interface Make use of the RX_MODE control virtqueue class to enable the set_rx_mode netdev interface. This allows us to selectively enable/disable promiscuous and allmulti mode so we don't see packets we don't want. For now, we automatically enable these as needed if additional unicast or multicast addresses are requested. Signed-off-by: Alex Williamson Acked-by: Rusty Russell Signed-off-by: David S. Miller commit 2a41f71d3bd97dde3305b4e1c43ab0eca46e7c71 Author: Alex Williamson Date: Wed Feb 4 09:02:34 2009 +0000 virtio_net: Add a virtqueue for outbound control commands This will be used for RX mode, MAC filter table, VLAN filtering, etc... The control transaction consists of one or more "out" sg entries and one or more "in" sg entries. The first out entry contains a header defining the class and command. Additional out entries may provide data for the command. The last in entry provides a status response back from the command. Virtqueues typically run asynchronous, running a callback function when there's data in the channel. We can't readily make use of this in the command paths where we need to use this. Instead, we kick the virtqueue and spin. The kick causes an I/O write, triggering an immediate trap into the hypervisor. Signed-off-by: Alex Williamson Acked-by: Rusty Russell Signed-off-by: David S. Miller commit 8f95c102c562851d8789fe813569db233d3f5378 Merge: 680cd53... f67d817... Author: Takashi Iwai Date: Wed Feb 4 23:32:03 2009 +0100 Merge branch 'fix/hda' into topic/hda commit 5e7476243ad755fa1d8be2b1774d0aeb16bb48df Author: Takashi Iwai Date: Wed Feb 4 18:28:42 2009 +0100 ALSA: msnd - Fix build error with CONFIG_PNP=n sound/isa/msnd/msnd_pinnacle.c:891: error: 'isapnp' undeclared (first use in this function) Signed-off-by: Takashi Iwai commit 453e37b37521b613f0927fcf53ccd93ad3a8b3ae Author: Krzysztof Helt Date: Wed Feb 4 17:41:32 2009 +0100 ALSA: sscape: drop redundant fields from soundscape struct The wss_base is disuised parameter for one function. It is converted to function parameter. The code_type is only set but never read. It is removed. The midi_vol is set only to 0 so it does not work as detection of change in midi volume. It is fixed. The xport variable is alias to the port[dev]. Use the port[dev] directly to increase readability. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 680cd53652d8bfb2b97d8c0248d1afb82de6b61d Author: Kusanagi Kouichi Date: Thu Feb 5 00:00:58 2009 +0900 ALSA: hda: Add digital beep generator support for Realtek codecs. A digital beep generator can be used via input layer. Signed-off-by: Kusanagi Kouichi Signed-off-by: Takashi Iwai commit 0664678a84c653bde844c7d91646259a25c6188b Author: Philipp Zabel Date: Tue Feb 3 21:18:26 2009 +0100 ASoC: pxa-ssp: fix SSP port request PXA2xx/3xx SSP ports start from 1, not 0. Thus, the probe function requested the wrong SSP port. Correcting this unveiled another bug where ssp_init tries to request the already-requested SSP port again. So this patch replaces the ssp_init/exit calls with their internals from mach-pxa/ssp.c, leaving out the redundant ssp_request and the unneeded IRQ request. Effectively, that leaves us with not much more than enabling/disabling the SSP clock. Signed-off-by: Philipp Zabel Signed-off-by: Mark Brown commit 5b2474425ed2a625b75dcd8d648701e473b7d764 Author: Philipp Zabel Date: Tue Feb 3 17:19:40 2009 +0100 ASoC: uda1380: split set_dai_fmt into _both, _playback and _capture variants This patch splits set_dai_fmt into three variants (single interface, dual interface playback only, dual interface capture only) so that data input and output formats can be configured separately for dual interface setups. Signed-off-by: Philipp Zabel Tested-by: Vasily Khoruzhick Signed-off-by: Mark Brown commit 508eb2ce222053e51e2243b7add8eeac85b1d250 Author: Paul Mundt Date: Wed Feb 4 15:28:06 2009 +0900 sh: Restrict old CMT timer code to SH-2/SH-2A. None of the other platforms use this, and need individual porting. Restrict it back to the supported set of CPU subtypes. Signed-off-by: Paul Mundt commit 073a24364fe6de7eef0a3dec0ec7d48e56624092 Author: Breno Leitao Date: Tue Feb 3 15:15:15 2009 -0800 s2io: Formatting log message S2IO driver is printing dev->name before the name being allocated, which display eth%d instead of eth0, eth1, etc. Example: eth%d: Enabling MSIX failed eth%d: MSI-X requested but failed to enable This patch just change eth%d to s2io. Signed-off-by: Breno Leitao Signed-off-by: David S. Miller commit 3834507d0c5480a0f05486c2fb57ed18fd179a83 Author: Stephen Hemminger Date: Tue Feb 3 11:27:30 2009 +0000 sky2: set VPD size Read configuration register during probe and use it to size the available VPD. Move existing code using same register slightly earlier in probe handling. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit e4c2abe29e1ec5d68908848ffa77b39f61a83f7c Author: Stephen Hemminger Date: Tue Feb 3 11:27:29 2009 +0000 sky2: move VPD display into debug interface The VPD stuff has more data and isn't generally that useful, so move it into the existing debugfs display and use the new PCI VPD accessor routines. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 454e6cb6868dd5c88d8bcdab407caa3738d30c2b Author: Stephen Hemminger Date: Tue Feb 3 11:27:28 2009 +0000 sky2: handle dma mapping errors On non-x86 platforms it is possible to run out of DMA mapping resources. The driver was ignoring this and could cause corruptions. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 1bd68c04850b9e73f1c7022b9a8c38cd14ceb37d Author: Stephen Hemminger Date: Tue Feb 3 11:27:27 2009 +0000 sky2: remove unneede workaround This workaround is not needed. It was inherited from sk98lin driver but only applies to an early development version of the chip that is not supported by sky2. The workaround required an unnecessary pci read which hurts performance Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 1725d409caba16ea5fc694bd50e95e79e8ced11a Merge: b3ff29d... b8abde4... Author: David S. Miller Date: Tue Feb 3 12:41:58 2009 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 111f6fbeb73fc350fe3a08c4ecd0ccdf3e13bef0 Author: Vasily Khoruzhick Date: Tue Feb 3 15:52:56 2009 +0200 ASoC: Don't unconditionally use the PLL in UDA1380 Without this fix driver switches to WSPLL in uda1380_pcm_prepare even if SYSCLK was chosen (uda1380_pcm_prepare modifies UDA1380_CLK register to disable R00_DAC_CLK before flushing reg cache) Signed-off-by: Vasily Khoruzhick Signed-off-by: Mark Brown commit 0b86a4e34d885e734a4c4e46293376f3f1c639eb Merge: 87fe851... 750e1c1... Author: Ingo Molnar Date: Tue Feb 3 16:13:37 2009 +0100 Merge branch 'core/header-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip into core/header-fixes commit 750e1c18251345e662bb7e7062b5fd5c1ade36de Author: Jaswinder Singh Rajput Date: Tue Feb 3 19:40:03 2009 +0530 headers_check fix cleanup: linux/reiserfs_fs.h Only REISERFS_IOC_* definitions are required for user space rest should be in #ifdef __KERNEL__ as pointed by Arnd Bergmann. Signed-off-by: Jaswinder Singh Rajput commit 5007b1fc4ef2c1b496536b2f026353c1d44d92ef Author: Jaswinder Singh Rajput Date: Tue Feb 3 19:28:24 2009 +0530 headers_check fix cleanup: linux/nubus.h These are only for kernel internals as pointed by Arnd Bergmann: struct nubus_board struct nubus_dev Signed-off-by: Jaswinder Singh Rajput commit f2cddb29ebfc02dfd2c4b439aa0433393ad15575 Author: Jaswinder Singh Rajput Date: Tue Feb 3 19:21:38 2009 +0530 headers_check fix cleanup: linux/coda_psdev.h These are only for kernel internals as pointed by Arnd Bergmann: struct kstatfs struct venus_comm coda_vcp() Signed-off-by: Jaswinder Singh Rajput commit 87fe85133fa7f33c2bc9882826666a7f117c62bd Merge: 1ff8f73... 15c5544... Author: Ingo Molnar Date: Tue Feb 3 13:55:06 2009 +0100 Merge branch 'core/header-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tipclean into core/header-fixes commit 123848e77623b9996288e85433985439c157fcd0 Author: Tony Vroon Date: Tue Feb 3 11:13:34 2009 +0000 ALSA: Document tyan model for Realtek ALC262 As just pointed out to me, the new tyan model for ALC262 was implemented but not documented. This adds the board to the list, using both its marketing name (Thunder n6650W) and its model number (S2915-E). Signed-off-by: Tony Vroon Signed-off-by: Takashi Iwai commit ba340e825f4b892782779abd0f93bcff7e763567 Author: Tony Vroon Date: Mon Feb 2 19:01:30 2009 +0000 ALSA: hda - Add tyan model for Realtek ALC262 The Realtek ALC262 on the Tyan Thunder n6650W (S2915-E) mainboard has a rather odd configuration template. As a result, the white AUX connector can not be used. This rewrites the default config to more accurately reflect the connector layout, colour and function. Unfortunately the black CD_IN connector, which is suspected to be widget 0x1c refuses to switch into input (0x20), instead opting to remain on 0x0. As such, no mixer controls are exposed for it. Autoswitching is implemented between the front headphone output and back line output. Signed-off-by: Tony Vroon Signed-off-by: Takashi Iwai commit b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 Merge: 1bded71... fb53fde... Author: David S. Miller Date: Tue Feb 3 00:15:35 2009 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/Kconfig commit 1bded710a574f20d41bc9e7fb531301db282d623 Author: Michael Tokarev Date: Mon Feb 2 23:34:56 2009 -0800 tun: Check supplemental groups in TUN/TAP driver. Michael Tokarev wrote: [] > 2, and this is the main one: How about supplementary groups? > > Here I have a valid usage case: a group of testers running various > versions of windows using KVM (kernel virtual machine), 1 at a time, > to test some software. kvm is set up to use bridge with a tap device > (there should be a way to connect to the machine). Anyone on that group > has to be able to start/stop the virtual machines. > > My first attempt - pretty obvious when I saw -g option of tunctl - is > to add group ownership for the tun device and add a supplementary group > to each user (their primary group should be different). But that fails, > since kernel only checks for egid, not any other group ids. > > What's the reasoning to not allow supplementary groups and to only check > for egid? Signed-off-by: Michael Tokarev Signed-off-by: David S. Miller commit 1a5645bc901aea6f3f446888061b2b084bbf1ba6 Author: Frederic Weisbecker Date: Mon Feb 2 23:22:04 2009 -0800 connector: create connector workqueue only while needed once The netlink connector uses its own workqueue to relay the datas sent from userspace to the appropriate callback. If you launch the test from Documentation/connector and change it a bit to send a high flow of data, you will see thousands of events coming to the "cqueue" workqueue by looking at the workqueue tracer. This flow of events can be sent very quickly. So, to not encumber the kevent workqueue and delay other jobs, the "cqueue" workqueue should remain. But this workqueue is pointless most of the time, it will always be created (assuming you have built it of course) although only developpers with specific needs will use it. So avoid this "most of the time useless task", this patch proposes to create this workqueue only when needed once. The first jobs to be sent to connector callbacks will be sent to kevent while the "cqueue" thread creation will be scheduled to kevent too. The following jobs will continue to be scheduled to keventd until the cqueue workqueue is created, and then the rest of the jobs will continue to perform as usual, through this dedicated workqueue. Each time I tested this patch, only the first event was sent to keventd, the rest has been sent to cqueue which have been created quickly. Also, this patch fixes some trailing whitespaces on the connector files. Signed-off-by: Frederic Weisbecker Acked-by: Evgeniy Polyakov Signed-off-by: David S. Miller commit 395707212a53999427bd160abd6541bffe062033 Merge: a6c255e... 64ca040... Author: Takashi Iwai Date: Tue Feb 3 07:07:15 2009 +0100 Merge branch 'fix/asoc' into topic/asoc commit 659aaf2bb5496a425ba14036b5b5900f593e4484 Author: Rajiv Andrade Date: Mon Feb 2 15:23:44 2009 -0200 TPM: integrity interface This patch adds internal kernel support for: - reading/extending a pcr value - looking up the tpm_chip for a given chip number Signed-off-by: Rajiv Andrade Signed-off-by: Mimi Zohar Signed-off-by: James Morris commit 0883743825e34b81f3ff78aaee3a97cba57586c5 Author: Rajiv Andrade Date: Mon Feb 2 15:23:43 2009 -0200 TPM: sysfs functions consolidation According to Dave Hansen's comments on the tpm_show_*, some of these functions present a pattern when allocating data[] memory space and also when setting its content. A new function was created so that this pattern could be consolidated. Also, replaced the data[] command vectors and its indexes by meaningful structures as pointed out by Matt Helsley too. Signed-off-by: Rajiv Andrade Signed-off-by: James Morris commit faa3aad75a959f55e7783f4dc7840253c7506571 Author: Serge E. Hallyn Date: Mon Feb 2 15:07:33 2009 -0800 securityfs: fix long-broken securityfs_create_file comment If there is an error creating a file through securityfs_create_file, NULL is not returned, rather the error is propagated. Signed-off-by: Serge E. Hallyn Signed-off-by: James Morris commit a6c255e0945160b76eabe983f59e2129e0c66246 Author: Timur Tabi Date: Mon Feb 2 15:08:29 2009 -0600 ASoC: fix message display in CS4270 codec driver Replace printk calls with dev_xxx calls. Set the 'dev' field of the codec and codec_dai structures so that these calls work. Signed-off-by: Timur Tabi Signed-off-by: Mark Brown commit d9fb7fbddc9a14569aad517984c1a5b0b07002ea Author: Timur Tabi Date: Mon Feb 2 14:50:45 2009 -0600 ASoC: fix build break in CS4270 codec driver Fix a oversight in the CS4270 codec driver that caused a build break. Signed-off-by: Timur Tabi Signed-off-by: Mark Brown commit 15c554439faedfa490389b31db893dc764245e88 Author: Jaswinder Singh Rajput Date: Mon Feb 2 21:59:19 2009 +0530 headers_check fix: x86, setup.h fix the following 'make headers_check' warning: usr/include/asm/setup.h:16: extern's make no sense in userspace usr/include/asm/setup.h:17: extern's make no sense in userspace usr/include/asm/setup.h:23: extern's make no sense in userspace usr/include/asm/setup.h:24: extern's make no sense in userspace usr/include/asm/setup.h:51: extern's make no sense in userspace usr/include/asm/setup.h:52: extern's make no sense in userspace Signed-off-by: Jaswinder Singh Rajput commit 8d4b4981195849dd50ed94be33ede926c6f41dcd Author: Jaswinder Singh Rajput Date: Mon Feb 2 21:48:33 2009 +0530 headers_check fix: x86, prctl.h fix the following 'make headers_check' warning: usr/include/asm/prctl.h:10: extern's make no sense in userspace Signed-off-by: Jaswinder Singh Rajput commit e683ec4697c74c7d04ff8e90ec625ac34e25a7d8 Author: Takashi Iwai Date: Wed Nov 12 16:42:44 2008 +0100 ALSA: ice1724 - Dynamic MIDI TX irq control MIDI_TX IRQ seems always pending when any bytes on FIFO is available. Thus, it's better to enable MPU_TX only when any bytres are really stored in the substream, and disables immediately when the queue becomes empty. Signed-off-by: Takashi Iwai commit 11d9f653aff1d445b4300ae1d2e2d675a0e9172f Author: Jaswinder Singh Rajput Date: Mon Feb 2 21:45:41 2009 +0530 headers_check fix: linux/reinserfs_fs.h fix the following 'make headers_check' warnings: usr/include/linux/reiserfs_fs.h:687: extern's make no sense in userspace usr/include/linux/reiserfs_fs.h:995: extern's make no sense in userspace usr/include/linux/reiserfs_fs.h:997: extern's make no sense in userspace usr/include/linux/reiserfs_fs.h:1467: extern's make no sense in userspace usr/include/linux/reiserfs_fs.h:1760: extern's make no sense in userspace usr/include/linux/reiserfs_fs.h:1764: extern's make no sense in userspace usr/include/linux/reiserfs_fs.h:1766: extern's make no sense in userspace usr/include/linux/reiserfs_fs.h:1769: extern's make no sense in userspace usr/include/linux/reiserfs_fs.h:1771: extern's make no sense in userspace usr/include/linux/reiserfs_fs.h:1805: extern's make no sense in userspace usr/include/linux/reiserfs_fs.h:1948: extern's make no sense in userspace usr/include/linux/reiserfs_fs.h:1949: extern's make no sense in userspace usr/include/linux/reiserfs_fs.h:1950: extern's make no sense in userspace usr/include/linux/reiserfs_fs.h:1951: extern's make no sense in userspace usr/include/linux/reiserfs_fs.h:1962: extern's make no sense in userspace usr/include/linux/reiserfs_fs.h:1963: extern's make no sense in userspace usr/include/linux/reiserfs_fs.h:1964: extern's make no sense in userspace Signed-off-by: Jaswinder Singh Rajput commit 7d7dc0d6b0565484e0623cb08b5dcdd56424697b Author: Jaswinder Singh Rajput Date: Mon Feb 2 21:44:09 2009 +0530 headers_check fix: linux/socket.h fix the following 'make headers_check' warning: usr/include/linux/socket.h:29: extern's make no sense in userspace Signed-off-by: Jaswinder Singh Rajput commit 9fe03bc3139503fbad66016bf714f4575babf651 Author: Jaswinder Singh Rajput Date: Mon Feb 2 21:41:41 2009 +0530 headers_check fix: linux/nubus.h fix the following 'make headers_check' warnings: usr/include/linux/nubus.h:297: extern's make no sense in userspace usr/include/linux/nubus.h:299: extern's make no sense in userspace usr/include/linux/nubus.h:303: extern's make no sense in userspace Signed-off-by: Jaswinder Singh Rajput commit 25d00fddf8d23234da2d45c051a14450939496d6 Author: Jaswinder Singh Rajput Date: Mon Feb 2 21:40:58 2009 +0530 headers_check fix: linux/in6.h fix the following 'make headers_check' warnings: usr/include/linux/in6.h:47: extern's make no sense in userspace usr/include/linux/in6.h:49: extern's make no sense in userspace Signed-off-by: Jaswinder Singh Rajput commit 7e7f4eae28711fbb7f4d5e4b0aa3195776194bc1 Author: Jaswinder Singh Rajput Date: Mon Feb 2 21:40:10 2009 +0530 headers_check fix: linux/coda_psdev.h fix the following 'make headers_check' warning: usr/include/linux/coda_psdev.h:90: extern's make no sense in userspace Signed-off-by: Jaswinder Singh Rajput commit e50a7ea0eba4f336b78b737e5ce48fba691c4919 Merge: 8f00806... 21dff43... Author: Mark Brown Date: Mon Feb 2 12:46:51 2009 +0000 Merge branch 'for-2.6.29' into for-2.6.30 commit 51408e8a3221a9cd1a23d5363f57bcd43516c05e Merge: b98b7b3... 516a1ce... Author: Takashi Iwai Date: Mon Feb 2 11:43:36 2009 +0100 Merge branch 'fix/hda' into topic/hda commit 5aa13a94098ef5fc1bb0a7f531fdda8864ae67ff Author: Krzysztof Helt Date: Sun Feb 1 21:13:15 2009 +0100 ALSA: msnd: add module description and license for the snd-msnd-lib The missing module license generates warning during module loading. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit f15fbcd7d857ca2ea20b57ba6dfe63aab89d0b8b Author: Herbert Xu Date: Sun Feb 1 22:24:43 2009 -0800 ipv4: Delete redundant sk_family assignment sk_alloc now sets sk_family so this is redundant. In fact it caught my eye because sock_init_data already uses sk_family so this is too late anyway. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 5626d3e86141390c8efc7bcb929b6a4b58b00480 Author: James Morris Date: Fri Jan 30 10:05:06 2009 +1100 selinux: remove hooks which simply defer to capabilities Remove SELinux hooks which do nothing except defer to the capabilites hooks (or in one case, replicates the function). Signed-off-by: James Morris Acked-by: Stephen Smalley commit 24dd1fa184595ff095a92de807fdf029b2632673 Author: Eric Dumazet Date: Sun Feb 1 12:31:33 2009 -0800 net: move bsockets outside of read only beginning of struct inet_hashinfo And switch bsockets to atomic_t since it might be changed in parallel. Signed-off-by: Eric Dumazet Acked-by: Evgeniy Polyakov Signed-off-by: David S. Miller commit 5add300975cf36b1bd30c461105bb938da260f14 Author: Stephen Hemminger Date: Sun Feb 1 01:40:17 2009 -0800 inet: Fix virt-manager regression due to bind(0) changes. From: Stephen Hemminger Fix regression introduced by a9d8f9110d7e953c2f2b521087a4179677843c2a ("inet: Allowing more than 64k connections and heavily optimize bind(0) time.") Based upon initial patches and feedback from Evegniy Polyakov and Eric Dumazet. From Eric Dumazet: -------------------- Also there might be a problem at line 175 if (sk->sk_reuse && sk->sk_state != TCP_LISTEN && --attempts >= 0) { spin_unlock(&head->lock); goto again; If we entered inet_csk_get_port() with a non null snum, we can "goto again" while it was not expected. -------------------- Signed-off-by: David S. Miller commit ad0f9904444de1309dedd2b9e365cae8af77d9b1 Author: Herbert Xu Date: Sun Feb 1 01:24:55 2009 -0800 gro: Fix handling of imprecisely split packets The commit 89a1b249edcf9be884e71f92df84d48355c576aa (gro: Avoid copying headers of unmerged packets) only worked for packets which are either completely linear, completely non-linear, or packets which exactly split at the boundary between headers and payload. Anything else would cause bits in the header to go missing if the packet is held by GRO. This may have broken drivers such as ixgbe. This patch fixes the places that assumed or only worked with the above cases. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 3efac5a0012979ae236fe1247b773317ef5f1c88 Author: Peter P Waskiewicz Jr Date: Sun Feb 1 01:19:20 2009 -0800 ixgbe: Update copyright dates, bump the driver version number New year, new copyright date ranges. Also bump the driver version number to reflect many of the recent changes. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit eb7f139ce523bfe03b1628c66d3e1d50f3c07196 Author: Peter P Waskiewicz Jr Date: Sun Feb 1 01:18:58 2009 -0800 ixgbe: Refactor MSI-X allocation mechanism Our current MSI-X allocation mechanism does not support new hardware at all. It also isn't getting the actual number of supported MSI-X vectors from the device. This patch allows the number of MSI-X vectors to be specific to a device, plus it gets the number of MSI-X vectors available from PCIe configuration space. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 2f21bdd3542838dc5513a585a32aa13f01b019e7 Author: Don Skidmore Date: Sun Feb 1 01:18:23 2009 -0800 ixgbe: Add 82598 support for BX mezzanine devices Add the device ID for BX devices using the 82598 MAC. Signed-off-by: Don Skidmore Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 1224736d97e83367bb66e29c2bee0f570f09db3e Author: Jarek Poplawski Date: Sun Feb 1 01:13:22 2009 -0800 pkt_sched: sch_htb: Use workqueue to schedule after too many events. Patrick McHardy suggested using a workqueue instead of hrtimers to trigger netif_schedule() when there is a problem with setting exact time of this event: 'The differnce - yeah, it shouldn't make much, mainly wake up the qdisc earlier (but not too early) after "too many events" occured _and_ no further enqueue events wake up the qdisc anyways.' Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit e82181de5ef4648074765912d2d82d6bd60115eb Author: Jarek Poplawski Date: Sun Feb 1 01:13:05 2009 -0800 pkt_sched: sch_htb: Warn on too many events. Let's get some info on possible config problems. This patch brings back an old warning, but is printed only once now. With feedback from Patrick McHardy Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit b00355db3f88d96810a60011a30cfb2c3469409d Author: Jarek Poplawski Date: Sun Feb 1 01:12:42 2009 -0800 pkt_sched: sch_hfsc: sch_htb: Add non-work-conserving warning handler. Patrick McHardy suggested: > How about making this flag and the warning message (in a out-of-line > function) globally available? Other qdiscs (f.i. HFSC) can't deal with > inner non-work-conserving qdiscs as well. This patch uses qdisc->flags field of "suspected" child qdisc. Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit eefef1cf7653cd4e0aaf743c00ae8345086cdc01 Author: Stephen Hemminger Date: Sun Feb 1 01:04:33 2009 -0800 net: add ARP notify option for devices This adds another inet device option to enable gratuitous ARP when device is brought up or address change. This is handy for clusters or virtualization. Signed-off-by: Stephen Hemminger Signed-off-by: Jeremy Fitzhardinge Signed-off-by: David S. Miller commit ead731837d142b103eab9870105f50bc40b69255 Author: Sascha Hauer Date: Wed Jan 28 23:03:11 2009 +0000 FEC: Turn FEC driver into platform device driver This turns the fec driver into a platform device driver for new platforms. Old platforms are still supported through a FEC_LEGACY define till they are also ported. Signed-off-by: Sascha Hauer Acked-by: Greg Ungerer Signed-off-by: David S. Miller commit 196719ecec0c526de273dcb902f0be956a193232 Author: Sascha Hauer Date: Wed Jan 28 23:03:10 2009 +0000 fec: Add support for Freescale MX27 Signed-off-by: Sascha Hauer Acked-by: Greg Ungerer Signed-off-by: David S. Miller commit ccdc4f198193eb4956b8dbc00745270525c4cd6e Author: Sascha Hauer Date: Wed Jan 28 23:03:09 2009 +0000 fec: replace flush_dcache_range with dma_sync_single flush_dcache_range is not portable across architectures. Use dma_sync_single instead. Also, the memory must be synchronised in the receive path aswell. Signed-off-by: Sascha Hauer Acked-by: Greg Ungerer Signed-off-by: David S. Miller commit 43268dcea7512cc10bc2542f20ce37971ecfeb48 Author: Sascha Hauer Date: Wed Jan 28 23:03:08 2009 +0000 fec: Fix KS8721BL_ICSR phy register offset According to the datasheet the ICSR register is at offset 27, not 22. Signed-off-by: Sascha Hauer Acked-by: Greg Ungerer Signed-off-by: David S. Miller commit 4661e75b9d7bb12bcbe9be8bbf40ebf0845879a9 Author: Sascha Hauer Date: Wed Jan 28 23:03:07 2009 +0000 fec: use dma_alloc_coherent for descriptor ring Signed-off-by: Sascha Hauer Acked-by: Greg Ungerer Signed-off-by: David S. Miller commit 6989f5122f84046ba286efe8ce8be2fec42a1b7c Author: Sascha Hauer Date: Wed Jan 28 23:03:06 2009 +0000 fec: do not use memcpy on physical addresses Signed-off-by: Sascha Hauer Acked-by: Greg Ungerer Signed-off-by: David S. Miller commit 6f501b173f2d69973497599f5358fb4c30922d67 Author: Sascha Hauer Date: Wed Jan 28 23:03:05 2009 +0000 fec: use linux/*.h instead of asm/*.h Signed-off-by: Sascha Hauer Acked-by: Greg Ungerer Signed-off-by: David S. Miller commit 6a8ea2c6f5521096b9972c75f7ad7b5303bce29c Author: Sascha Hauer Date: Wed Jan 28 23:03:04 2009 +0000 fec: remove empty functions There are some architecture specific functions which are all empty. Remove them. Signed-off-by: Sascha Hauer Acked-by: Greg Ungerer Signed-off-by: David S. Miller commit 51bbc3e31cb59d94b0c9c1ca3f1851b7f1787169 Author: Sascha Hauer Date: Wed Jan 28 23:03:03 2009 +0000 fec: remove unused #else branches The #else branches throughout this driver belong to a PowerPC 8xx for which this driver is not used. Signed-off-by: Sascha Hauer Acked-by: Greg Ungerer Signed-off-by: David S. Miller commit b2f66d183966114fcc91591191ec9af14a252ac5 Author: Anton Vorontsov Date: Sun Feb 1 00:54:16 2009 -0800 gianfar: Fix sparse warnings This patch fixes following sparse warnings: CHECK gianfar_ethtool.c gianfar_ethtool.c:610:26: warning: symbol 'gfar_ethtool_ops' was not declared. Should it be static? CHECK gianfar_mii.c gianfar_mii.c:108:35: warning: cast adds address space to expression () gianfar_mii.c:119:35: warning: cast adds address space to expression () gianfar_mii.c:128:35: warning: cast adds address space to expression () gianfar_mii.c:272:5: warning: cast removes address space of expression gianfar_mii.c:271:15: warning: cast adds address space to expression () gianfar_mii.c:340:11: warning: cast adds address space to expression () CHECK gianfar_sysfs.c gianfar_sysfs.c:84:1: warning: symbol 'dev_attr_bd_stash' was not declared. Should it be static? gianfar_sysfs.c:133:1: warning: symbol 'dev_attr_rx_stash_size' was not declared. Should it be static? gianfar_sysfs.c:175:1: warning: symbol 'dev_attr_rx_stash_index' was not declared. Should it be static? gianfar_sysfs.c:213:1: warning: symbol 'dev_attr_fifo_threshold' was not declared. Should it be static? gianfar_sysfs.c:250:1: warning: symbol 'dev_attr_fifo_starve' was not declared. Should it be static? gianfar_sysfs.c:287:1: warning: symbol 'dev_attr_fifo_starve_off' was not declared. Should it be static? Signed-off-by: Anton Vorontsov Signed-off-by: David S. Miller commit 3d1e4db2b0698785f4e4dd139d88257e855e53b8 Author: Anton Vorontsov Date: Sun Feb 1 00:53:34 2009 -0800 phylib: Rework suspend/resume code to check netdev wakeup capability In most cases (e.g. PCI drivers) MDIO and MAC controllers are represented by the same device. But for SOC ethernets we have separate devices. So, in SOC case, checking whether MDIO controller may wakeup is not only makes little sense, but also prevents us from doing per-netdevice wakeup management. This patch reworks suspend/resume code so that now it checks for net device's wakeup flags, not MDIO controller's ones. Each netdevice should manage its wakeup flags, and phylib will decide whether suspend an attached PHY or not. Signed-off-by: Anton Vorontsov Signed-off-by: David S. Miller commit 2884e5cc9283d541977bdf5dc344849af94cd639 Author: Anton Vorontsov Date: Sun Feb 1 00:52:34 2009 -0800 gianfar: Implement proper, per netdevice wakeup management This patch implements wakeup management for the gianfar driver. The driver should set wakeup enable if WOL is enabled, so that phylib won't power off an attached PHY. Signed-off-by: Anton Vorontsov Signed-off-by: David S. Miller commit 09640e6365c679b5642b1c41b6d7078f51689ddf Author: Harvey Harrison Date: Sun Feb 1 00:45:17 2009 -0800 net: replace uses of __constant_{endian} Base versions handle constant folding now. Signed-off-by: Harvey Harrison Signed-off-by: David S. Miller commit ee437770c42088b9b653e8b3bf28a61fa647f84e Author: Harvey Harrison Date: Sun Feb 1 00:43:54 2009 -0800 wimax: replace uses of __constant_{endian} Base versions handle constant folding now. Signed-off-by: Harvey Harrison Acked-by: Inaky Perez-Gonzalez Signed-off-by: David S. Miller commit 4fb669948116d928ae44262ab7743732c574630d Author: Jarek Poplawski Date: Sun Feb 1 00:41:42 2009 -0800 net: Optimize memory usage when splicing from sockets. The recent fix of data corruption when splicing from sockets uses memory very inefficiently allocating a new page to copy each chunk of linear part of skb. This patch uses the same page until it's full (almost) by caching the page in sk_sndmsg_page field. With changes from David S. Miller Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit 31f4574774e98aa275aeeee94f41ce042285ed8e Author: Steve Glendinning Date: Tue Jan 27 06:51:12 2009 +0000 smsc911x: allow mac address to be saved before device reset Some platforms (for example pcm037) do not have an EEPROM fitted, instead storing their mac address somewhere else. The bootloader fetches this and configures the ethernet adapter before the kernel is started. This patch allows a platform to indicate to the driver via the SMSC911X_SAVE_MAC_ADDRESS flag that the mac address has already been configured via such a mechanism, and should be saved before resetting the chip. Signed-off-by: Steve Glendinning Acked-by: Sascha Hauer Tested-by: Sascha Hauer Signed-off-by: David S. Miller commit d23f028a4ddce8b783c212bfe911d1d307ff3617 Author: Steve Glendinning Date: Tue Jan 27 06:51:11 2009 +0000 smsc911x: add external phy detection overrides On LAN9115/LAN9117/LAN9215/LAN9217, external phys are supported. These are usually indicated by a hardware strap which sets an "external PHY detected" bit in the HW_CFG register. In some cases it is desirable to override this hardware strap and force use of either the internal phy or an external PHY. This patch adds SMSC911X_FORCE_INTERNAL_PHY and SMSC911X_FORCE_EXTERNAL_PHY flags so a platform can indicate this preference via its platform_data. Signed-off-by: Steve Glendinning Acked-by: Sascha Hauer Tested-by: Sascha Hauer Signed-off-by: David S. Miller commit e81259b4f7c69a71d92216ba551731fb7027bcbe Author: Steve Glendinning Date: Tue Jan 27 06:51:10 2009 +0000 smsc911x: register isr as IRQF_SHARED The isr supports shared operation, so register it with the IRQF_SHARED flag to indicate this. This patch also removes the IRQF_DISABLED flag. This driver doesn't need it, and IRQF_DISABLED isn't guaranteed when using shared interrupts. Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit 61307ed85dbf0ee232e354721a5a0a2011da7996 Author: Steve Glendinning Date: Tue Jan 27 06:51:09 2009 +0000 smsc911x: add support for platform-specific irq flags this patch adds support for the platform_device's resources to indicate additional flags to use when registering the irq, for example IORESOURCE_IRQ_LOWLEVEL (which corresponds to IRQF_TRIGGER_LOW). These should be set in the irq resource flags field. Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit 1ff8f739c7cc4eaa89b6ba986494f458ff7bdbef Author: Jaswinder Singh Rajput Date: Sat Jan 31 12:02:14 2009 +0530 headers_check fix: xtensa, swab.h fix the following 'make headers_check' warnings: usr/include/asm-xtensa/swab.h:14: include of is preferred over usr/include/asm-xtensa/swab.h:19: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 48109870bab7e66f30f933cd218258368024cd9f Author: Jaswinder Singh Rajput Date: Sat Jan 31 11:54:05 2009 +0530 headers_check fix: powerpc, swab.h fix the following 'make headers_check' warning: usr/include/asm-powerpc/swab.h:11: include of is preferred over Signed-off-by: Jaswinder Singh Rajput commit 1a16bc4590fcc94630571c541c8fef7a0845c2c0 Author: Jaswinder Singh Rajput Date: Sat Jan 31 11:52:05 2009 +0530 headers_check fix: powerpc, spu_info.h fix the following 'make headers_check' warning: usr/include/asm-powerpc/spu_info.h:27: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 122bb2207b8107ce117d10fcfd3a2f6c3804a362 Author: Jaswinder Singh Rajput Date: Sat Jan 31 11:46:23 2009 +0530 headers_check fix: powerpc, ps3fb.h fix the following 'make headers_check' warning: usr/include/asm-powerpc/ps3fb.h:33: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 9f2cd967b7f029ebe2c74969709ff9c745344dba Author: Jaswinder Singh Rajput Date: Sat Jan 31 11:44:45 2009 +0530 headers_check fix: powerpc, kvm.h fix the following 'make headers_check' warnings: usr/include/asm-powerpc/kvm.h:23: include of is preferred over usr/include/asm-powerpc/kvm.h:26: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 785857f5f0b7fbeed934e39af24edec471637375 Author: Jaswinder Singh Rajput Date: Sat Jan 31 11:42:29 2009 +0530 headers_check fix: powerpc, elf.h fix the following 'make headers_check' warning: usr/include/asm-powerpc/elf.h:5: include of is preferred over Signed-off-by: Jaswinder Singh Rajput commit 4be2c7ff4f362e41706e84a3d6726bdcda9ab65f Author: Jaswinder Singh Rajput Date: Sat Jan 31 11:41:04 2009 +0530 headers_check fix: powerpc, bootx.h fix the following 'make headers_check' warnings: usr/include/asm-powerpc/bootx.h:12: include of is preferred over usr/include/asm-powerpc/bootx.h:57: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 726da1e3408caae6af8372f93380f18986f1003b Author: Jaswinder Singh Rajput Date: Sat Jan 31 11:39:01 2009 +0530 headers_check fix: parisc, swab.h fix the following 'make headers_check' warnings: usr/include/asm-parisc/swab.h:4: include of is preferred over usr/include/asm-parisc/swab.h:9: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 79f95ac2412c993e52f02cfde1f71d141b2e530d Author: Jaswinder Singh Rajput Date: Sat Jan 31 11:36:07 2009 +0530 headers_check fix: parisc, pdc.h fix the following 'make headers_check' warning: usr/include/asm-parisc/pdc.h:420: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit bef53ca086e069a3fb8e6bf4ecf06221de9b445f Author: Jaswinder Singh Rajput Date: Sat Jan 31 11:29:28 2009 +0530 headers_check fix: mn10300, swab.h fix the following 'make headers_check' warnings: usr/include/asm-mn10300/swab.h:14: include of is preferred over usr/include/asm-mn10300/swab.h:19: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit a9f6acc5ab36c7533c9b3e224f7c209d8da4048d Author: Jaswinder Singh Rajput Date: Sat Jan 31 11:23:37 2009 +0530 headers_check fix: mips, swab.h fix the following 'make headers_check' warnings: usr/include/asm-mips/swab.h:12: include of is preferred over usr/include/asm-mips/swab.h:18: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit ae612fb05b0f60ff58e2a86eea46dc99532d62c5 Author: Jaswinder Singh Rajput Date: Sat Jan 31 11:22:18 2009 +0530 headers_check fix: mips, sigcontext.h fix the following 'make headers_check' warning: usr/include/asm-mips/sigcontext.h:57: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit d8cbec15af88e067f33cb78efad15d581fa79b12 Author: Jaswinder Singh Rajput Date: Sat Jan 31 11:18:19 2009 +0530 headers_check fix: m32r, swab.h fix the following 'make headers_check' warning: usr/include/asm-m32r/swab.h:4: include of is preferred over Signed-off-by: Jaswinder Singh Rajput commit 040c92b8e5f080e1f5a610bf0e10c683328dce75 Author: Jaswinder Singh Rajput Date: Sat Jan 31 11:12:29 2009 +0530 headers_check fix: ia64, swab.h fix the following 'make headers_check' warnings: usr/include/asm-ia64/swab.h:9: include of is preferred over usr/include/asm-ia64/swab.h:13: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 6ce795065bdd2bfeebd97fa91a95918dcff7d0ec Author: Jaswinder Singh Rajput Date: Sat Jan 31 11:10:22 2009 +0530 headers_check fix: ia64, kvm.h fix the following 'make headers_check' warnings: usr/include/asm-ia64/kvm.h:24: include of is preferred over usr/include/asm-ia64/kvm.h:34: found __[us]{8,16,32,64} type without #include commit 1ecbb7fcfd20803bdd403de0c9c514da7d6c8843 Author: Jaswinder Singh Rajput Date: Sat Jan 31 11:07:06 2009 +0530 headers_check fix: ia64, intrinsics.h fix the following 'make headers_check' warning: usr/include/asm-ia64/intrinsics.h:57: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit a812a9170c5db5390280eb4fa075f1555e6ae53c Author: Jaswinder Singh Rajput Date: Sat Jan 31 11:03:28 2009 +0530 headers_check fix: ia64, gcc_intrin.h fix the following 'make headers_check' warning: usr/include/asm-ia64/gcc_intrin.h:63: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit fa9ea6c7abd94482ecd84e130676b6a1b3e61c2c Author: Jaswinder Singh Rajput Date: Sat Jan 31 10:59:12 2009 +0530 headers_check fix: ia64, fpu.h fix the following 'make headers_check' warning: usr/include/asm-ia64/fpu.h:9: include of is preferred over Signed-off-by: Jaswinder Singh Rajput commit 295803eea178d777cf3813b16696c54b0b2bcd23 Author: Jaswinder Singh Rajput Date: Sat Jan 31 10:55:12 2009 +0530 headers_check fix: h8300, swab.h fix the following 'make headers_check' warning: usr/include/asm-h8300/swab.h:4: include of is preferred over Signed-off-by: Jaswinder Singh Rajput commit dacd762eabf69e32f0e9181f99fd19b6f96ea5c5 Author: Jaswinder Singh Rajput Date: Sat Jan 31 10:53:32 2009 +0530 headers_check fix: frv, swab.h fix the following 'make headers_check' warning: usr/include/asm-frv/swab.h:4: include of is preferred over Signed-off-by: Jaswinder Singh Rajput commit 350eb8b3cb5e4860a4c8352f2cca00e6eb4a16b2 Author: Jaswinder Singh Rajput Date: Sat Jan 31 10:48:44 2009 +0530 headers_check fix: blackfin, swab.h fix the following 'make headers_check' warnings: usr/include/asm-blackfin/swab.h:4: include of is preferred over usr/include/asm-blackfin/swab.h:13: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 1c6ce704f1e965f64ad0b017842854ceec5b9cc7 Author: Jaswinder Singh Rajput Date: Sat Jan 31 10:46:26 2009 +0530 headers_check fix: avr32, swab.h fix the following 'make headers_check' warnings: usr/include/asm-avr32/swab.h:7: include of is preferred over usr/include/asm-avr32/swab.h:22: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit e42ec2418fa96f98ed8d4e6d8a572a7200156df6 Author: Jaswinder Singh Rajput Date: Sat Jan 31 10:43:44 2009 +0530 headers_check fix: arm, swab.h fix the following 'make headers_check' warnings: usr/include/asm-arm/swab.h:19: include of is preferred over usr/include/asm-arm/swab.h:25: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 4af3bf6b393a2cec947cd42cc10fc03f5b782484 Author: Jaswinder Singh Rajput Date: Sat Jan 31 10:41:59 2009 +0530 headers_check fix: arm, setup.h fix the following 'make headers_check' warnings: usr/include/asm-arm/setup.h:17: include of is preferred over usr/include/asm-arm/setup.h:25: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit f100e6d0368742ddb8b6b9be986536e63117c05a Author: Jaswinder Singh Rajput Date: Sat Jan 31 10:38:16 2009 +0530 headers_check fix: arm, a.out.h fix the following 'make headers_check' warnings: usr/include/asm-arm/a.out.h:5: include of is preferred over usr/include/asm-arm/a.out.h:9: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 3fd59061b7b16dd0bb7bf779ba297daa5f0bf0f5 Author: Jaswinder Singh Rajput Date: Sat Jan 31 10:36:04 2009 +0530 headers_check fix: alpha, swab.h fix the following 'make headers_check' warnings: usr/include/asm-alpha/swab.h:4: include of is preferred over usr/include/asm-alpha/swab.h:10: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 0fc2eb3bade59365ed0b28b8ea3b5c448b2f4a26 Author: Jaswinder Singh Rajput Date: Sat Jan 31 10:34:04 2009 +0530 headers_check fix: alpha, statfs.h fix the following 'make headers_check' warning: usr/include/asm-alpha/statfs.h:6: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit d563ffa6b319a4e401d096db9014a947590ca081 Author: Tim Blechmann Date: Sat Jan 31 18:01:13 2009 +0100 ALSA: pcxhr: fix trivial typo Signed-off-by: Tim Blechmann Signed-off-by: Takashi Iwai commit 8f008062943c8565e855dda8a6681f641d7e71f9 Author: Grazvydas Ignotas Date: Sat Jan 31 16:29:24 2009 +0200 ASoC: Update OMAP3 pandora board file Update pandora board file for recent TWL4030 codec changes. Also move output related snd_soc_dapm_nc_pin() calls to omap3pandora_out_init(), where they belong. Signed-off-by: Grazvydas Ignotas Signed-off-by: Mark Brown commit ff7bf02f630ae93cad4feda0f6a5a19b25a5019a Author: Timur Tabi Date: Fri Jan 30 11:14:49 2009 -0600 ASoC: fix documentation in CS4270 codec driver Spruce up the documentation in the CS4270 codec. Use kerneldoc where appropriate. Fix incorrect comments. Signed-off-by: Timur Tabi Signed-off-by: Mark Brown commit 7e3fa56141175026136b392fd026d5d07c49720e Author: Sam Ravnborg Date: Fri Jan 30 23:56:42 2009 +0100 kbuild: drop check for CONFIG_ in headers_check The check for references to CONFIG_ symbols in exported headers turned out to be too agressive with the current state of affairs. After the work of Jaswinder to clean up all relevant cases we are down to almost pure noise. So lets drop the check for now - we can always add it back later should our headers be ready for that. Signed-off-by: Sam Ravnborg Signed-off-by: Ingo Molnar commit 05bee4737774881e027bfd9a8b5c40a7d68f6325 Merge: 80595d5... 905db44... Author: David S. Miller Date: Fri Jan 30 14:31:07 2009 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/e1000/e1000_main.c commit 504a06d8b05cb5b214c9b97752d8451e88d9ef81 Author: Takashi Iwai Date: Fri Jan 30 19:59:10 2009 +0100 ALSA: Add description of new fm_port option for snd-es1688 driver Signed-off-by: Takashi Iwai commit 880abd42d0891635e988b0a2cfb0942cf79fa2c3 Author: Krzysztof Helt Date: Fri Jan 30 19:20:29 2009 +0100 ALSA: ess1688: fix OPL3 port setting The ess1688 driver uses the same port for PCM audio (SB compatible) and OPL3 synthesis. It is not always right so allow to choose a different port for OPL3 synthesis. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit b8abde45d7d6ab9e8ceced9b5990eeb1149d0b97 Author: Vivek Natarajan Date: Tue Jan 27 19:26:28 2009 +0530 mac80211: Cancel the dynamic ps timer in ioctl_siwpower. If the dynamic power save timer has been started before the power save is disabled using iwconfig, we fail to cancel the timer. Hence cancel it while disabling power save. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 94ff91d4afd8ae14e8bb7012ba17cf6984130e44 Author: Sujith Date: Tue Jan 27 15:06:38 2009 +0530 ath9k: Fix bug in TX DMA termination Removing the module was slow because ath9k_hw_stopdma() was looping for a long time quantum. Use reasonable values now to fix this issue. Signed-off-by: Sujith Signed-off-by: John W. Linville commit f46730d13f23b4578dca1c0f7663ea3093ff4f0e Author: Sujith Date: Tue Jan 27 13:51:03 2009 +0530 ath9k: Setup short preamble properly in rate registration This patch fixes an issue where hw_value_short was not being filled with the proper ratecode during rate registration, but was being used in the RX path for decoding the packet rate. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 1286ec6d63c557aa203ab5af56962a3d37181771 Author: Sujith Date: Tue Jan 27 13:30:37 2009 +0530 ath9k: Fix station access in aggregation completion The ieee80211_sta pointer in the SKB's TX control info area is not guaranteed to be valid after returning from the tx() callback. Use ieee80211_find_sta() instead and return early if the station is no longer present. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 1f7d6cbfa2a993ea0d714e8552c784eea75a046b Author: Sujith Date: Tue Jan 27 10:55:54 2009 +0530 ath9k: Reconfigure beacons on getting a notification from mac80211 Signed-off-by: Sujith Signed-off-by: John W. Linville commit 3c4572657656117c1f9cf1df42e681ea71abb2db Author: Sujith Date: Tue Jan 27 10:55:31 2009 +0530 ath9k: Handle chainmask for A9280 The default chainmask for AR9280 is 3, so handle that when setting the supported MCS rates. Also, check for the HW supported chainmask when choosing single/dual stream. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 4d87c5bec5389625d80b71108795aecf82cd670d Author: Andrew Morton Date: Thu Jan 29 14:29:10 2009 -0800 fix "sparseirq: use kstat_irqs_cpu on non-x86 architectures too" Repair 0b0f0b1c2c87de299df6f92a8ffc0a73bd1bb960 arch/alpha/kernel/irq.c: In function 'show_interrupts': arch/alpha/kernel/irq.c:93: error: 'i' undeclared (first use in this function) arch/alpha/kernel/irq.c:93: error: (Each undeclared identifier is reported only once arch/alpha/kernel/irq.c:93: error: for each function it appears in.) Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar commit 04eb093c7c81d118efeb96228f69bc0179f71897 Author: Timur Tabi Date: Thu Jan 29 14:28:37 2009 -0600 ASoC: fix initialization order of the CS4270 codec driver ASoC codec drivers typically serve two masters: the I2C bus and ASoC itself. When a codec driver registers with ASoC, a probe function is called. Most codec drivers call ASoC first, and then register with the I2C bus in the ASoC probe function. However, in order to support multiple codecs on one board, it's easier if the codec driver is probed via the I2C bus first. This is because the call to i2c_add_driver() can result in the I2C probe function being called multiple times - once for each codec. In the current design, the driver registers once with ASoC, and in the ASoC probe function, it calls i2c_add_driver(). The results in the I2C probe function being called multiple times before the driver can register with ASoC again. The new design has the driver call i2c_add_driver() first. In the I2C probe function, the driver registers with ASoC. This allows the ASoC probe function to be called once per I2C device. Also add code to check if the I2C probe function is called more than once, since that is not supported with the current ASoC design. Signed-off-by: Timur Tabi Signed-off-by: Mark Brown commit f87b2ed225c002ea1b1b9994c6608d8b202f865e Author: David Woodhouse Date: Fri Jan 30 14:31:36 2009 +1100 solos: Swap upstream/downstream rates in status packet, clean up some more Signed-off-by: David Woodhouse commit eab50f73ca51384d8f17886edc7bbc9969b91c0e Author: David Woodhouse Date: Fri Jan 30 14:27:26 2009 +1100 solos: Set RX empty flag at startup only for !dma mode Signed-off-by: David Woodhouse commit cd5549e0f4b5129cdb7b02fbb6a559f78eda7f4c Author: David Woodhouse Date: Fri Jan 30 14:26:37 2009 +1100 solos: Don't clear config registers at startup Signed-off-by: David Woodhouse commit 95852f48c2b78ee6b211a38039ccca2c889a7010 Author: David Woodhouse Date: Fri Jan 30 14:23:52 2009 +1100 solos: Tidy up status interrupt handling, cope with 'ERROR' status Signed-off-by: David Woodhouse commit cc3657e1f6d552a88307af62f53380503ba0130b Author: David Woodhouse Date: Fri Jan 30 14:23:22 2009 +1100 solos: Add 'reset' module parameter to reset the DSL chips on load Signed-off-by: David Woodhouse commit 80595d59ba9917227856e663da249c2276a8628d Author: Herbert Xu Date: Thu Jan 29 14:19:52 2009 +0000 gro: Open-code memcpy in napi_fraginfo_skb This patch optimises napi_fraginfo_skb to only copy the bits necessary. We also open-code the memcpy so that the alignment information is always available to gcc. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 81705ad1b2f926d2ef15ed95074a9c1fa9fb4dc4 Author: Herbert Xu Date: Thu Jan 29 14:19:51 2009 +0000 gro: Do not merge paged packets into frag_list gro: Do not merge paged packets into frag_list Bigger is not always better :) It was easy to continue to merged packets into frag_list after the page array is full. However, this turns out to be worse than LRO because frag_list is a much less efficient form of storage than the page array. So we're better off stopping the merge and starting a new entry with an empty page array. In future we can optimise this further by doing frag_list merging but making sure that we continue to fill in the page array. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 86911732d3996a9da07914b280621450111bb6da Author: Herbert Xu Date: Thu Jan 29 14:19:50 2009 +0000 gro: Avoid copying headers of unmerged packets Unfortunately simplicity isn't always the best. The fraginfo interface turned out to be suboptimal. The problem was quite obvious. For every packet, we have to copy the headers from the frags structure into skb->head, even though for 99% of the packets this part is immediately thrown away after the merge. LRO didn't have this problem because it directly read the headers from the frags structure. This patch attempts to address this by creating an interface that allows GRO to access the headers in the first frag without having to copy it. Because all drivers that use frags place the headers in the first frag this optimisation should be enough. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 5d0d9be8ef456afc6c3fb5f8aad06ef19b704b05 Author: Herbert Xu Date: Thu Jan 29 14:19:48 2009 +0000 gro: Move common completion code into helpers Currently VLAN still has a bit of common code handling the aftermath of GRO that's shared with the common path. This patch moves them into shared helpers to reduce code duplication. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 95c14904b6f6f8a35365f0c58d530c85b4fb96b4 Author: James Morris Date: Thu Jan 29 12:37:58 2009 +1100 selinux: remove secondary ops call to shm_shmat Remove secondary ops call to shm_shmat, which is a noop in capabilities. Acked-by: Serge Hallyn Acked-by: Eric Paris Signed-off-by: James Morris commit 5c4054ccfafb6a446e9b65c524af1741656c6c60 Author: James Morris Date: Thu Jan 29 12:34:53 2009 +1100 selinux: remove secondary ops call to unix_stream_connect Remove secondary ops call to unix_stream_connect, which is a noop in capabilities. Acked-by: Serge Hallyn Acked-by: Eric Paris Signed-off-by: James Morris commit 2cbbd19812b7636c1c37bcf50c403e7af5278d73 Author: James Morris Date: Thu Jan 29 12:32:50 2009 +1100 selinux: remove secondary ops call to task_kill Remove secondary ops call to task_kill, which is a noop in capabilities. Acked-by: Serge Hallyn Acked-by: Eric Paris Signed-off-by: James Morris commit ef76e748faa823a738d632ee4c8ed9adaabc8a40 Author: James Morris Date: Thu Jan 29 12:30:28 2009 +1100 selinux: remove secondary ops call to task_setrlimit Remove secondary ops call to task_setrlimit, which is a noop in capabilities. Acked-by: Serge Hallyn Acked-by: Eric Paris Signed-off-by: James Morris commit ca5143d3ff3c7a4e1c2c8bdcf0f53aea227a7722 Author: James Morris Date: Thu Jan 29 12:26:14 2009 +1100 selinux: remove unused cred_commit hook Remove unused cred_commit hook from SELinux. This currently calls into the capabilities hook, which is a noop. Acked-by: Serge Hallyn Acked-by: Eric Paris Signed-off-by: James Morris commit af294e41d0c95a291cc821a1b43ec2cd13976a8b Author: James Morris Date: Thu Jan 29 12:23:36 2009 +1100 selinux: remove secondary ops call to task_create Remove secondary ops call to task_create, which is a noop in capabilities. Acked-by: Serge Hallyn Acked-by: Eric Paris Signed-off-by: James Morris commit d541bbee6902d5ffb8a03d63ac8f4b1364c2ff93 Author: James Morris Date: Thu Jan 29 12:19:51 2009 +1100 selinux: remove secondary ops call to file_mprotect Remove secondary ops call to file_mprotect, which is a noop in capabilities. Acked-by: Serge Hallyn Acked-by: Eric Paris Signed-off-by: James Morris commit 438add6b32d9295db6e3ecd4d9e137086ec5b5d9 Author: James Morris Date: Thu Jan 29 12:15:59 2009 +1100 selinux: remove secondary ops call to inode_setattr Remove secondary ops call to inode_setattr, which is a noop in capabilities. Acked-by: Serge Hallyn Acked-by: Eric Paris Signed-off-by: James Morris commit 188fbcca9dd02f15dcf45cfc51ce0dd6c13993f6 Author: James Morris Date: Thu Jan 29 12:14:03 2009 +1100 selinux: remove secondary ops call to inode_permission Remove secondary ops call to inode_permission, which is a noop in capabilities. Acked-by: Serge Hallyn Acked-by: Eric Paris Signed-off-by: James Morris commit f51115b9ab5b9cfd0b7be1cce75afbf3ffbcdd87 Author: James Morris Date: Thu Jan 29 12:10:56 2009 +1100 selinux: remove secondary ops call to inode_follow_link Remove secondary ops call to inode_follow_link, which is a noop in capabilities. Acked-by: Serge Hallyn Signed-off-by: James Morris commit dd4907a6d4e038dc65839fcd4030ebefe2f5f439 Author: James Morris Date: Thu Jan 29 12:08:34 2009 +1100 selinux: remove secondary ops call to inode_mknod Remove secondary ops call to inode_mknod, which is a noop in capabilities. Acked-by: Serge Hallyn Acked-by: Eric Paris Signed-off-by: James Morris commit e4737250b751b4e0e802adae9a4d3ae0227b580b Author: James Morris Date: Thu Jan 29 12:00:08 2009 +1100 selinux: remove secondary ops call to inode_unlink Remove secondary ops call to inode_unlink, which is a noop in capabilities. Acked-by: Serge Hallyn Acked-by: Eric Paris Signed-off-by: James Morris commit efdfac437607e4acfed66c383091a376525eaec4 Author: James Morris Date: Thu Jan 29 11:57:34 2009 +1100 selinux: remove secondary ops call to inode_link Remove secondary ops call to inode_link, which is a noop in capabilities. Acked-by: Serge Hallyn Acked-by: Eric Paris Signed-off-by: James Morris commit 97422ab9ef45118cb7418d799dc69040f17108ce Author: James Morris Date: Thu Jan 29 11:55:02 2009 +1100 selinux: remove secondary ops call to sb_umount Remove secondary ops call to sb_umount, which is a noop in capabilities. Acked-by: Serge Hallyn Acked-by: Eric Paris Signed-off-by: James Morris commit ef935b9136eeaa203f75bf0b4d6e398c29f44d27 Author: James Morris Date: Thu Jan 29 11:51:11 2009 +1100 selinux: remove secondary ops call to sb_mount Remove secondary ops call to sb_mount, which is a noop in capabilities. Acked-by: Serge Hallyn Acked-by: Eric Paris Signed-off-by: James Morris commit 5565b0b865f672e3d7e31936ad1d40710ab7bfc4 Author: James Morris Date: Thu Jan 29 11:47:49 2009 +1100 selinux: remove secondary ops call to bprm_committed_creds Remove secondary ops call to bprm_committed_creds, which is a noop in capabilities. Acked-by: Serge Hallyn Acked-by: Eric Paris Signed-off-by: James Morris commit 2ec5dbe23d68bddc043a85d1226bfc499a724b1c Author: James Morris Date: Thu Jan 29 11:46:14 2009 +1100 selinux: remove secondary ops call to bprm_committing_creds Remove secondary ops call to bprm_committing_creds, which is a noop in capabilities. Acked-by: Serge Hallyn Acked-by: Eric Paris Signed-off-by: James Morris commit bc05595845f58c065adc0763a678187647ec040f Author: James Morris Date: Thu Jan 29 11:28:33 2009 +1100 selinux: remove unused bprm_check_security hook Remove unused bprm_check_security hook from SELinux. This currently calls into the capabilities hook, which is a noop. Acked-by: Eric Paris Acked-by: Serge Hallyn Signed-off-by: James Morris commit fb9ddbf086591ab4c90c44d10468f84d465b3fdf Author: Johannes Berg Date: Mon Jan 26 19:11:57 2009 +0100 mac80211: don't try to powersave/config disabled interfaces Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit d81c2d9c909e95ee8a5745da95bbb35f8ded3d17 Author: Luis R. Rodriguez Date: Mon Jan 26 09:00:51 2009 -0800 cfg80211: do not pass -EALREADY to userspace on regdomain change request If the regulatory domain is already set it is technically not an error so do not pass an errno to userspace. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit b51bb3cd6c8078b8b8cc1d1725b100267eaa726e Author: Luis R. Rodriguez Date: Mon Jan 26 07:30:03 2009 -0800 ath9k: remove useless ath9k driver version information Versioning for ath9k is pointless we have kept it at 0.1 since the initial release so its meaningless. We put more emphasis on kernel release or dated wireless-testing master tag as per John's tagging. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 793c592995b841667fa6d1a36a98880430dcc8f4 Author: Senthil Balasubramanian Date: Mon Jan 26 20:28:14 2009 +0530 ath9k: Fix AR9285 specific noise floor eeprom reads. Fix AR9285 specific noise floor reads and initialize tx and rx chainmask during reset. This along with the following earlier patches of ath9k fixes an issue with association noticed in noisy environment. ath9k: Fix typo in chip version check ath9k: Remove unnecessary gpio configuration in ath9k_hw_reset() ath9k: Fix bug in NF calibration Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit 0c6666e4c43a10a224c63e3270c963d97f7e8cc8 Author: Luis R. Rodriguez Date: Mon Jan 26 06:48:10 2009 -0800 ath9k: fix debug print on regd With debugging enabled and with ATH_DBG_REGULATORY selected we wouldn't get the full print out of one line, reason is we used "," instead of nothing to separate two lines. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit f677d7702d48b7b3dfcce3b2c0db601dbee0aa24 Author: Tulio Magno Quites Machado Filho Date: Sun Jan 25 23:54:25 2009 +0100 ath5k: support LED's on emachines E510 notebook Add vendor ID for AMBIT and use it to set the ath5k LED gpio. base.c: Changes-licensed-under: 3-Clause-BSD Signed-off-by: Tulio Magno Quites Machado Filho Acked-by: Bob Copeland Signed-off-by: John W. Linville commit 060210f938d8aa0b9d795588a2274cd67ba9d6a4 Author: Michael Buesch Date: Sun Jan 25 15:49:59 2009 +0100 b43: Dynamically control log verbosity Dynamically control the log verbosity with a module parameter. This enables us to dynamically enable debugging messages (or disable info, warn, error messages) via module parameter or /sys/module/b43/parameters/verbose. This increases the module size by about 3k. But in practice it reduces the module size for the user, because some distributions ship the b43 module with CONFIG_B43_DEBUG set, which increases the module by about 15k. So with this patch applied, distributions should really _disable_ CONFIG_B43_DEBUG. There is no reason to keep it in a production-release kernel. So we have a net reduction in size by about 12k. This patch also adds a printk of the wireless core revision, so people don't have to enable SSB debugging to get the wireless core revision. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 08e87a833f5e77ff33b64c9ac27cb7fb9ecd4a48 Author: Alina Friedrichsen Date: Sun Jan 25 15:28:28 2009 +0100 b43: Accessing the TSF via mac80211 This allows the mac80211 high level code to access the TSF. This is e.g. needed for BSSID merges in the IBSS mode. The second version adds locking and removes the now unnecessary debugfs entries. Thanks to Michael Buesch! :) Signed-off-by: Alina Friedrichsen Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 3b5d665b51cda73ef1a774b515afd879a38e3674 Author: Alina Friedrichsen Date: Sat Jan 24 07:09:59 2009 +0100 mac80211: Generic TSF debugging This patch enables low-level driver independent debugging of the TSF and remove the driver specific things of ath5k and ath9k from the debugfs. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit 3978e5bce63484789891c67413372da3915bcbd6 Author: Winkler, Tomas Date: Fri Jan 23 13:45:23 2009 -0800 iwlwifi: iwl_tx_queue_alloc : fix warning in printk formatting This patch fix compilation warning in printk formatting iwl_tx_queue_alloc function. Cleanup the code a bit on the way. Signed-off-by: Tomas Winkler Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit c771c9d8da1e8292ef8bf7fd4ce135dacc650130 Author: Johannes Berg Date: Fri Jan 23 22:54:03 2009 +0100 mac80211: add interface list lock Using only the RTNL has a number of problems, most notably that ieee80211_iterate_active_interfaces() and other interface list traversals cannot be done from the internal workqueue because it needs to be flushed under the RTNL. This patch introduces a new mutex that protects the interface list against modifications. A more detailed explanation is part of the code change. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 506d03f97d10e54fd27c58c872a98242326d6419 Author: Dan Williams Date: Sat Jan 24 09:13:58 2009 -0500 airo: remove useless #defines Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 018697d178717d63f668b9e5f3b473f4e37f6304 Author: Dan Williams Date: Sat Jan 24 09:13:32 2009 -0500 airo: clean up and clarify micinit() Fix some endian issues too. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 99590ffefc803caaf6ba923da092cde739269c06 Author: Dan Williams Date: Sat Jan 24 09:12:58 2009 -0500 airo: use __attribute__ ((packed)) not #pragma Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit dff8ccd9f5ff76b7449bf833f4646f70036b2256 Author: Michael Buesch Date: Sat Jan 24 22:36:57 2009 +0100 b43: Fix phy_g.c compiler warning Fix compile warning for non-debug builds: drivers/net/wireless/b43/phy_g.c: In function ‘b43_gphy_op_recalc_txpower’: drivers/net/wireless/b43/phy_g.c:3195: warning: unused variable ‘dbm’ Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit e874e6585539f6706b8e5f96125c9fca89cce716 Author: Bob Copeland Date: Sat Jan 24 13:21:14 2009 -0500 mac80211: flush workqueue a second time in suspend() Drivers can theoretically queue more work in one of their callbacks from mac80211 suspend, so let's flush it once more to be on the safe side, just before calling ->stop(). Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit 30d3ef41b4395d9bee5f481395eef2d3b8b6ee50 Author: Bob Copeland Date: Fri Jan 23 23:09:35 2009 -0500 mac80211: change workqueue back to non-freezeable "mac80211: make workqueue freezable" made the mac80211 workqueue freezeable to prevent us from doing any work after the driver went away. This was fine before mac80211 had any suspend support. However, now we want to flush this workqueue in suspend(). Because the thread for a freezeable workqueue is stopped before the device class suspend() is called, flush_workqueue() will hang in the suspend-to-disk case. Converting it back to a non-freezeable queue will keep suspend from hanging. Moreover, since we flush the workqueue under RTNL and userspace is stopped, there won't be any new work in the workqueue until after resume. Thus we still don't have to worry about pinging the AP without hardware. Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit dfe670121a2719be6ead12eb5306d4d2714c09cb Author: Alina Friedrichsen Date: Sat Jan 24 01:19:04 2009 +0100 mac80211: Fixed BSSID handling revisited This patch cleanup the fixed BSSID handling, that ieee80211_sta_set_bssid() works like ieee80211_sta_set_ssid(). So that the BSSID is only a second selection criterion besides the SSID. This allows us to create new IBSS networks with fixed BSSIDs, which was broken before. In the second version of this patch the handling of the stupid merges to the same BSSID is moved out to get reworked into an other patch. And this version hopefully solves the problems with some low-level drivers and re-adds the config BSSID warning to help debugging the low-level drivers. Much thanks to all who have helped testing! :) Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit c0380693520b1a1e4f756799a0edc379378b462a Author: Dan Williams Date: Sat Jan 24 09:12:15 2009 -0500 airo: clean up WEP key operations get_wep_key() and set_wep_key() combind both get/set of the actual WEP key and get/set of the transmit index into the same functions. Split those out so it's clearer what is going one where. Add error checking to WEP key hardware operations too. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 138c0c688262b7f4ed07cdc6d0592299c4f12998 Author: Dan Williams Date: Sat Jan 24 09:11:35 2009 -0500 airo: simplify WEP index and capability checks Do the computation once at init time; don't ask the hardware every time. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit f65b56d67b48eec7ffe174f223e98db58c3bf2b5 Author: Dan Williams Date: Sat Jan 24 09:10:42 2009 -0500 airo: re-arrange WPA capability checks The capability register has to be read for other (upcoming) stuff, so fold the WPA test function back into _init_airo_card() and move the netdevice registration stuff above it so that the netdevice has a name by the time the card's capabilities are printed out. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit f55d4517ebdd6de627d42a24baefaeb689978087 Author: Dan Williams Date: Sat Jan 24 09:04:12 2009 -0500 airo: clean up and clarify interrupt-time task handling Split each specific interrupt-time task out into its own function to make airo_interrupt() actually readable. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 0d21044effa10044930419c6f837f75191229c3a Author: Winkler, Tomas Date: Fri Jan 23 13:45:21 2009 -0800 iwlwifi: fix probe mask for 39 scan API This pach make use of 39 own scan probe mask the variables or of different types Signed-off-by: Tomas Winkler Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 17f841cd6cb0837ba0599ad18a746c30ddd83e08 Author: Samuel Ortiz Date: Fri Jan 23 13:45:20 2009 -0800 iwl3945: Remaining host command cleanups With the recent host command routines merge, we can now look at the various host command helpers and get rid of the duplicated ones. Signed-off-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit af48d048ac5f10981df093c7566ae0fea9ba1967 Author: Samuel Ortiz Date: Fri Jan 23 13:45:19 2009 -0800 iwl3945: Add restart_fw module parameter In order to be in sync with the agn code, we're ading a fw_restart3945 module parameter to iwl3945. Signed-off-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 7e4bca5e5b8dffd9373470693e20f43b0aee566c Author: Samuel Ortiz Date: Fri Jan 23 13:45:18 2009 -0800 iwl3945: Getting rid of priv->antenna The iwl_priv antenna field is useless as we can simply use the corresponding mod_params antenna field. Signed-off-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit d08853a3995cfc2985307da7400fb57bfa5773e2 Author: Samuel Ortiz Date: Fri Jan 23 13:45:17 2009 -0800 iwlwifi: Remove IWL3945_DEBUG IWL3945_DEBUG is pointless and obsolete. We already have an IWLWIFI_DEBUG symbol, that needs to be set if we actually want to get 3945 debug (see iwl-debug.h). Thus, we can simply get rid of this symbol. Signed-off-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 534166dedaa9a660c7221b145b5e4088a2d9ac69 Author: Samuel Ortiz Date: Fri Jan 23 13:45:16 2009 -0800 iwl3945: Use the iwlcore geos routines By removing the init_rates() routine outside of the init_geos() one, we can share the geos routines between 3945 and agn. Signed-off-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit e6148917db2c223fa7edd3dfb64d99756a86b452 Author: Samuel Ortiz Date: Fri Jan 23 13:45:15 2009 -0800 iwl3945: Use iwl-eeprom.c routines By adding the eeprom ops to the 3945 code, we can now use the iwlcore eeprom routines (defined in iwl-eeprom.c). We also removed the heavy eeprom39 reference from iwl_priv and use the eeprom pointer instead. Signed-off-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit a8e74e2774cd1aecfef0460de07e6e178df89232 Author: Samuel Ortiz Date: Fri Jan 23 13:45:14 2009 -0800 iwl3945: Use iwlcore TX queue management routines By adding an additional hw_params (tfd_size) and a new iwl_lib ops (txq_init), we can now use the iwlcore TX queue management routines. We had to add a new hw_params because we need to allocate the right DMA buffer for TFDs, and those have a different sizes depending if you're on 3945 or agn. Signed-off-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 59606ffa9146538b73bbe1ca1285321cd7474bc0 Author: Samuel Ortiz Date: Fri Jan 23 13:45:13 2009 -0800 iwlwifi: make iwl_tx_queue->tfds void* Instead of having both tfds and tfds39, we can just have a void *tfds. It makes the tx_queue structure nicer, and the code cleaner. It also helps with further TX queues management code merging. Signed-off-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 77fecfb88f8ad64420e06a96f1bd3b38498bfb4f Author: Samuel Ortiz Date: Fri Jan 23 13:45:12 2009 -0800 iwl3945: Use iwlcore scan code A lot of the scanning related code is duplicated between 3945 and agn. Let's use the iwlcore one and get rid of the 3945. Signed-off-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 75bcfae97d71756263ccbffc2dcdd8b3020a1a0f Author: Samuel Ortiz Date: Fri Jan 23 13:45:11 2009 -0800 iwl3945: Define send_tx_power We can define this iwl_lib ops for 3945, as this would help us cleaning the scanning code. Signed-off-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 7b841727d2715d97592f46164804b34d6241644f Author: Rick Farrington Date: Fri Jan 23 13:45:10 2009 -0800 iwlagn: reduce off channel reception for 4965 Force use of chains B and C (0x6) for Rx for 4965 Avoid A (0x1) because of its off-channel reception on A-band. Signed-off-by: Rick Farrington Signed-off-by: Ben Cahill Signed-off-by: Reinette Chatre Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville commit 4c4df78f5e224fd59fe337773878eca681ed02a9 Author: Chatre, Reinette Date: Fri Jan 23 13:45:09 2009 -0800 iwlwifi: add test to determine if interface in monitor mode mac80211 sets driver in monitor mode through configuring the RX filters. We cannot trust priv->iw_mode to be accurate regarding monitor mode as iw_mode is only set in add_interface, which is not called by mac80211 when in monitor mode. Signed-off-by: Reinette Chatre Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville commit 1a9f509368ceb24fc66be961be15c69966f5eb5d Author: Michael Buesch Date: Fri Jan 23 21:21:51 2009 +0100 b43: Automatically probe for opensource firmware First probe for proprietary firmware and then probe for opensource firmware. This way around it's a win-win situation. 1) If proprietary fw is available, it will work. 2) If opensource firmware is available, but no proprietary (Distros can only ship open fw) it might work. 3) If both open and proprietary are available, it will work, because it selects the proprietary. We currently don't prefer the open fw in this case, because it doesn't work on all devices. It would introduce a regression otherwise. The remaining FIXMEs in this patch are harmless, because they only matter on multiband devices, which are not implemented yet anyway. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 2f47690ed42a85820783dee7f16ae47edadf8fad Author: Larry Finger Date: Fri Jan 23 11:40:22 2009 -0600 rtl8187: Fix driver to return TX retry info for RTL8187L Current code for the RTL8187 is not returning valid retry information, thus the rate-setting mechanism is not functioning. As a further complication, this info is only obtained by reading a register, which cannot be read while in interrupt context. This patch implements the TX status return to mac80211 through the use of a work queue. One additional problem is that the driver currently enables the rate fallback mechanism of the device, which conflicts with the mac80211 rate-setting algorithm. This version of the patch disables rate fallback. Signed-off-by: Larry Finger Tested-by: Herton Ronaldo Krzesinski Tested-by: Martín Ernesto Barreyro Acked-by: Hin-Tak Leung Signed-off-by: John W. Linville commit 2a57cf3e83f89150f2ac9b6f01caf3fcdbb36486 Author: Larry Finger Date: Fri Jan 23 11:30:54 2009 -0600 rtl8187: Increase receive queue depth The receive queue depth in rtl8187 may not be long enough to keep the pipe full. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 66aafd9a3108da465a73bd755366416e75fb9d3d Author: Larry Finger Date: Fri Jan 23 11:30:11 2009 -0600 rtl8187: Fix locking of private data In rtl8187_add_interface(), the mutex that protects the data in struct rtl8187_priv does not include all references to that structure. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 1fac36ee7d5a0611e1216b02b485b154c8aa6dad Author: Dan Williams Date: Fri Jan 23 11:55:33 2009 -0500 libertas: fix CF firmware loading for some cards if_cs_poll_while_fw_download() returned the number of iterations remaining on success, which in turn got returned as the value from if_cs_prog_real() and if_cs_prog_helper(). But since if_cs_probe() interprets non-zero return values from firmware load functions as an error, this sometimes caused spurious firmware load failures. Signed-off-by: Dan Williams Tested-by: Ryan Mallon Acked-by: Ryan Mallon Signed-off-by: John W. Linville commit 0712612741e1dccf10353c70ebe90ba8cc60d5fb Author: Ivo van Doorn Date: Fri Jan 23 17:04:05 2009 +0100 rt2x00: Simplify suspend/resume handling With mac80211 handling all open interfaces during suspend and resume we can simplify suspend/resume within rt2x00lib. The only thing rt2x00 needs to do is free up memory during suspend and bring back the minimal required components during resume. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 9752a7bd7f36557f34283f5d75dfa32578437f08 Author: Ivo van Doorn Date: Fri Jan 23 17:03:24 2009 +0100 rt2x00: Restrict firmware file lengths Add extra security to the drivers for firmware loading, check the firmware file length before uploading it to the hardware. Incorrect lengths might indicate a firmware upgrade (which is not yet supported by the driver) or otherwise incorrect firmware. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 6ba265e9cc764bc401cda284954cf2bdd4408c38 Author: Ivo van Doorn Date: Fri Jan 23 17:03:06 2009 +0100 rt2x00: rt2x00_rev() should return u32 The "rev" field in chipset definition is an u32, which means that rt2x00_rev() which returns that field should be of the same type. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 81b1e19ac2cadc2f8a05c82ffb1abe20a0594d1f Author: Vasanthakumar Thiagarajan Date: Fri Jan 23 14:40:37 2009 +0530 ath9k: Clean up the way the eeprom antenna configuration is read Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 3aa24e6031a0ca7a8803a103f5c183cd94e5ac98 Author: Vasanthakumar Thiagarajan Date: Fri Jan 23 14:40:36 2009 +0530 ath9k: Remove unused ath9k_hw_select_antconfig() from hw.c Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 5dad40c13e7753e7b62eb7c2fca9b4034679882a Author: Sujith Date: Fri Jan 23 11:20:55 2009 +0530 ath9k: Fix bug in NF calibration The number of chainmasks for AR9285 weren't being setup when running NF calibration. Signed-off-by: Sujith Signed-off-by: John W. Linville commit f8206e053498174ef4b5f994e2a7091a74f7da30 Author: Sujith Date: Fri Jan 23 11:20:51 2009 +0530 ath9k: Fix bug in rate control capability registration Dual stream capability must be registered only when the hardware supports it. Signed-off-by: Sujith Signed-off-by: John W. Linville commit eb2599ca25be212bd37dd3e90ef13ea45758e838 Author: Sujith Date: Fri Jan 23 11:20:44 2009 +0530 ath9k: Fix MCS rates registration bug for AR9285 AR9285 based devices support only single stream MCS rates. This patch fixes a bug where dual stream stream rates were also being registered. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 27abe060aa9d3410545ef663676c7183fc2512c6 Author: Alina Friedrichsen Date: Fri Jan 23 05:44:21 2009 +0100 ath9k: Read and write the TSF via debugfs This patch adds an ath9k specific entry to read, write and reset the TSF into the debugfs, like in ath5k. This makes debugging the IBSS handling of wifi drivers _much_ easier. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit 8cab7581dba90b0519e25784e08feb5dedde737f Author: Alina Friedrichsen Date: Fri Jan 23 05:39:13 2009 +0100 ath5k: Read and write the TSF via debugfs This patch updates the ath5k specific entry in the debugfs to read and reset the TSF value, to allowing write it, too. This makes debugging the IBSS handling of wifi drivers _much_ easier. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit ae54c985cc7daa502da6e7eb3b223a30fbbf4cfb Author: Alina Friedrichsen Date: Fri Jan 23 05:33:37 2009 +0100 mac80211: Read the TSF via debugfs This patch adds an low-level driver independent entry to read the TSF value into the debugfs of mac80211. This makes debugging the IBSS handling of wifi drivers easier. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit 5f8e077c0adc0dc7cfad64cdc05276e1961a1394 Author: Luis R. Rodriguez Date: Thu Jan 22 15:16:48 2009 -0800 ath9k: simplify regulatory code Now that cfg80211 has its own regulatory infrastructure we can condense ath9k's regulatory code considerably. We only keep data we need to provide our own regulatory_hint(), reg_notifier() and information necessary for calibration. Atheros hardware supports 12 world regulatory domains, since these are custom we apply them through the the new wiphy_apply_custom_regulatory(). Although we have 12 we can consolidate these into 5 structures based on frequency and apply a different set of flags that differentiate them on a case by case basis through the reg_notifier(). If CRDA is not found our own custom world regulatory domain is applied, this is identical to cfg80211's except we enable passive scan on most frequencies. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 24ed1da1337b92e3b0a89f2c2b7cd33b9a8fcb62 Author: Luis R. Rodriguez Date: Thu Jan 22 15:05:54 2009 -0800 cfg80211: allow users to help a driver's compliance Let users be more compliant if so desired. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 9a95371aa26e3cb9fb1340362912000088ff3c3e Author: Luis R. Rodriguez Date: Thu Jan 22 15:05:53 2009 -0800 mac80211: allow mac80211 drivers to get to struct ieee80211_hw from wiphy If a driver is given a wiphy and it wants to get to its private mac80211 driver area it can use wiphy_to_ieee80211_hw() to get first to its ieee80211_hw and then access the private structure via hw->priv. The wiphy_priv() is already being used internally by mac80211 and drivers should not use this. This can be helpful in a drivers reg_notifier(). Signed-off-by: Luis R. Rodriguez Acked-by: Johannes Berg Signed-off-by: John W. Linville commit f976376de0d6a9697fb635369f12ae00251f4566 Author: Luis R. Rodriguez Date: Thu Jan 22 15:05:52 2009 -0800 cfg80211: Allow for strict regulatory settings This allows drivers to request strict regulatory settings to be applied to its devices. This is desirable for devices where proper calibration and compliance can only be gauranteed for for the device's programmed regulatory domain. Regulatory domain settings will be ignored until the device's own regulatory domain is properly configured. If no regulatory domain is received only the world regulatory domain will be applied -- if OLD_REG (default to "US") is not enabled. If OLD_REG behaviour is not acceptable to drivers they must update their wiphy with a custom reuglatory prior to wiphy registration. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 716f9392e2b84cacc18cc11f7427cb98adeb1c3d Author: Luis R. Rodriguez Date: Thu Jan 22 15:05:51 2009 -0800 cfg80211: pass more detailed regulatory request information on reg_notifier() Drivers may need more information than just who set the last regulatory domain, as such lets just pass the last regulatory_request receipt. To do this we need to move out to headers struct regulatory_request, and enum environment_cap. While at it lets add documentation for enum environment_cap. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit d46e5b1d0c617a2a46353812d7f02115c17b5e72 Author: Luis R. Rodriguez Date: Thu Jan 22 15:05:50 2009 -0800 cfg80211: move check for ignore_reg_update() on wiphy_update_regulatory() This ensures that the initial REGDOM_SET_BY_CORE upon wiphy registration respects the wiphy->custom_regulatory setting. Without this and if OLD_REG is disabled (which will be default soon as we remove it) the wiphy->custom_regulatory is simply ignored. Signed-off-by: Luis R. Rodriguez Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 2a44f911d8bac3e6c97a25cc612e4324dfbdfdc4 Author: Luis R. Rodriguez Date: Thu Jan 22 15:05:49 2009 -0800 cfg80211: rename fw_handles_regulatory to custom_regulatory Drivers without firmware can also have custom regulatory maps which do not map to a specific ISO / IEC alpha2 country code. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit e74b1e7fb2f12db36f25af2158ee6e2940e4f138 Author: Luis R. Rodriguez Date: Thu Jan 22 15:05:48 2009 -0800 cfg80211: ignore consecutive equal regulatory hints We ignore regulatory hints for the same alpha2 if we already have processed the same alpha2 on the current regulatory domain. For a driver regulatory_hint() this means we copy onto its wiphy->regd the previously procesed regulatory domain from CRDA without having to call CRDA again. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 5eebade608d695e30e89d4c5ca6136a58f24ed14 Author: Luis R. Rodriguez Date: Thu Jan 22 15:05:47 2009 -0800 cfg80211: process user requests only after previous user/driver/core requests This prevents user regulatory changes to be considered prior to previous pending user, core or driver requests which have not be applied. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 34f573473a659f8c2727d8d408e17b241900c28e Author: Luis R. Rodriguez Date: Thu Jan 22 15:05:45 2009 -0800 cfg80211: export freq_reg_info() This can be used by drivers on the reg_notifier() Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 1fa25e413659f943dfec65da2abe713d566c7fdf Author: Luis R. Rodriguez Date: Thu Jan 22 15:05:44 2009 -0800 cfg80211: add wiphy_apply_custom_regulatory() This adds wiphy_apply_custom_regulatory() to be used by drivers prior to wiphy registration to apply a custom regulatory domain. This can be used by drivers that do not have a direct 1-1 mapping between a regulatory domain and a country. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 078e1e60dd6c6b0d4bc8d58ccb80c008e8efc9ff Author: Johannes Berg Date: Thu Jan 22 18:07:31 2009 +0100 mac80211: Add capability to enable/disable beaconing This patch adds a flag to notify drivers to start and stop beaconing when needed, for example, during a scan run. Based on Sujith's first patch to do the same, but now disables beaconing for all virtual interfaces while scanning, has a separate change flag and tracks user-space requests. Signed-off-by: Sujith Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 07c1e852514e862e246b9f2962ce8fc0d7ac8ed1 Author: Bob Copeland Date: Thu Jan 22 08:44:21 2009 -0500 ath5k: honor the RTS/CTS bits The ath5k driver didn't use set_rts_threshold or use_cts_prot, and also didn't check the IEEE80211_TX_RC_USE_{RTS_CTS,CTS_PROTECT} RC flags. Tell the hardware about these so RTS/CTS will work, and so the device will work better in mixed b/g environments. Changes-licensed-under: 3-Clause-BSD Signed-off-by: Bob Copeland Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 8902ff4e5666c04ca5829c9fd7fc28d73e81ee90 Author: Bob Copeland Date: Thu Jan 22 08:44:20 2009 -0500 ath5k: use short preamble when possible ath5k previously ignored TX_RC_SHORT_PREAMBLE and did not use config->use_short_preamble, so the long preamble was always used for transmitted packets. Changes-licensed-under: 3-Clause-BSD Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit 5ef4017a72f77f0bc07d8efb35c140b42e064f70 Author: Bob Copeland Date: Thu Jan 22 08:44:19 2009 -0500 ath5k: remove unused led_off parameter ath5k_softc->led_off hasn't been used since commit 3a078876caee9634dbb9b41e6269262e30e8b535, "convert LED code to use mac80211 triggers." Changes-licensed-under: 3-Clause-BSD Reported-by: Tobias Doerffel Signed-off-by: Bob Copeland Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 2134e7e724798cf8d54ae822afe235abb607d9b2 Author: Sujith Date: Thu Jan 22 09:00:52 2009 +0530 mac80211: Add documentation bits for mac80211_rate_control_flags Signed-off-by: Sujith Acked-by: Johannes Berg Signed-off-by: John W. Linville commit e129a948c906200db87727822559c09b62278824 Author: Andrey Borzenkov Date: Wed Jan 21 21:55:29 2009 +0300 orinoco: trivial cleanup in alloc_orinocodev Remove extra space; remove redundant cast Signed-off-by: Andrey Borzenkov Acked-by: Pavel Roskin Signed-off-by: John W. Linville commit 89ea40905fb48e2bf92211b57ab6be51c0797657 Author: Andrey Borzenkov Date: Wed Jan 21 20:46:46 2009 +0300 orinoco: convert to struct net_device_ops No functional changes; use new kernel interface for netdev methods. Signed-off-by: Andrey Borzenkov Acked-by: Pavel Roskin Signed-off-by: John W. Linville commit 881d948c23442173a011f1adcfe4c95bf7f27515 Author: Johannes Berg Date: Wed Jan 21 15:13:48 2009 +0100 wireless: restrict to 32 legacy rates Since the standards only define 12 legacy rates, 32 is certainly a sane upper limit and we don't need to use u64 everywhere. Add sanity checking that no more than 32 rates are registered and change the variables to u32 throughout. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 369391db1aabd089cefaadaabb6d9fc82e78b0a7 Author: Vasanthakumar Thiagarajan Date: Wed Jan 21 19:24:13 2009 +0530 ath9k: Remove unnecessary gpio configuration in ath9k_hw_reset() Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit e6799cc2e8c755a0317e664f29de0b08ddd0eb35 Author: Vasanthakumar Thiagarajan Date: Wed Jan 21 17:18:48 2009 +0530 ath9k: Fix typo in chip version check Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 5f936f11613c32ca7f8ed5fa333bb38a4501deeb Author: Johannes Berg Date: Wed Jan 21 12:47:05 2009 +0100 mac80211: constify ieee80211_if_conf.bssid Then one place can be a static const. Signed-off-by: Johannes Berg Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit e9414b6b3f34dcc3683e66dffa4f5f167d49df51 Author: Abbas, Mohamed Date: Tue Jan 20 21:33:55 2009 -0800 iwl3945: fix deep sleep when removing the driver. A warning message "MAC is in deep sleep" sometimes happen when user removes the driver. This warning is related to card not being ready. In __iwl3945_down function some of the going down steps are in wrong order, to fix this this patch do the following: 1- make sure we are calling iwl3945_apm_reset and iwl3945_apm_stop in the right order. 2- make sure we set CSR_GP_CNTRL_REG_FLAG_INIT_DONE in apm_reset before poll on CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY. 3- set correct polling counter. This fixes bug http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=1834 Signed-off-by: mohamed abbas Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit c0af96a6e63ef93c605ce495fff79c692d4b8c4d Author: Samuel Ortiz Date: Wed Jan 21 18:27:54 2009 +0100 iwl3945: Use iwl-rfkill Here again, the rfkill routines are duplicated between agn and 3945. Let's move the agn one to iwlcore, and so we can get rid of the 3945 ones. Signed-off-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 7d049e5abe77c82d6f11a4e5869203f7b2838380 Author: Abbas, Mohamed Date: Tue Jan 20 21:33:53 2009 -0800 iwlagn: fix agn rate scaling Sometime Tx reply rate different than what rate scale expecting causing rate scale to bail out. This could cause failing to commit LQ cmd. This patch will try to solve this instead of just bail out. It also make sure we start with a valid rate. Signed-off-by: mohamed abbas Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit c6ec7a9b17875e3a5a9cdd23f7914d74069316c8 Author: Abbas, Mohamed Date: Tue Jan 20 21:33:52 2009 -0800 iwlwifi: allow user to set max rate allow user to set max rate through #iwconfig rate XXX. mac80211 will try to force this if user set it, but driver is not in sync which cause mac80211 to report wrong current rate. This patch will check if max rate is set and force it in rate scaling Signed-off-by: mohamed abbas Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 3cbb5dd73697b3f1c677daffe29f00ace22b71e9 Author: Vivek Natarajan Date: Tue Jan 20 11:17:08 2009 +0530 ath9k: Enable dynamic power save in ath9k. This patch implements dynamic power save feature for ath9k. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit c5d0569882b9c264be31dcb0758961bfc479deea Author: Jay Sternberg Date: Mon Jan 19 15:30:35 2009 -0800 iwlwifi: add recognition of Intel WiFi Link 100 Series add configuration for new Intel WiFi Link 100 series as part of the iwlagn driver under the umbrella of 5000 family of devices. Signed-off-by: Jay Sternberg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit e1228374d648efe451973bc5f3d1f9a8e943ec0b Author: Jay Sternberg Date: Mon Jan 19 15:30:34 2009 -0800 iwlwifi: add recognition of Intel WiFi Link 6000 and 6050 Series add configuration for new Intel WiFi Link Series as part of the iwlagn driver under the umbrella of 5000 family of devices. Signed-off-by: Jay Sternberg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit cec2d3f38c11f4c7e28ec2a065698653dbccfbb7 Author: Jay Sternberg Date: Mon Jan 19 15:30:33 2009 -0800 iwlwifi: remove static from 5000 structures remove static from config structures which will be used by new hardware that is similar to 5000. This way the new devices can use them without the new structures having to be stored in the already overloaded iwl-5000.c file. Signed-off-by: Jay Sternberg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit f82d8d9724b6054b63fb3a0108937064029b2c00 Author: Jay Sternberg Date: Mon Jan 19 15:30:31 2009 -0800 iwlwifi: correct Kconfig to prevent following entries from not indenting defining configurations that are not visible caused the following entries to not be indented. changing the tree structure to name the top level selection and have all others reference IWLWIFI directly corrects this issue. Signed-off-by: Jay Sternberg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 3dae0c42ba1d51ae49bf149d1dcc38ffbb357409 Author: Winkler, Tomas Date: Mon Jan 19 15:30:30 2009 -0800 iwlwifi: eliminate power_data_39. This patch eliminates 3945 power_data structure and make use of of iwl_power_data. Signed-off-by: Tomas Winkler Acked-by: Mohamed Abbas Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 62ea9c5b9e531dbf6b2601e6c9e2705a56983b6e Author: Winkler, Tomas Date: Mon Jan 19 15:30:29 2009 -0800 iwlwifi: remove unused or twice defined members in iwl_priv This patch removes user_txpower_limit and max_channel_txpower_limit and use tx_power_user_lmt and tx_power_channel_lmt instead call_post_assoc_from_beacon is not used Signed-off-by: Tomas Winkler Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 805cee5b81f1e493820601fe7990aef935c2c621 Author: Winkler, Tomas Date: Mon Jan 19 15:30:28 2009 -0800 iwlwifi: kill scan39 scan and scan39 can be represented by void * in iwl_priv Signed-off-by: Tomas Winkler Acked-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 518099a870ef3f5f97d96aa0c284ce1b403436fa Author: Samuel Ortiz Date: Mon Jan 19 15:30:27 2009 -0800 iwl3945: Use iwl-hcmd host command routines With the previously added tfd related ops, we can now use the iwl-tx.c host command enqueue routine. Since the 3945 host command specific routines are identical to the agn ones, we can just remove them from the 3945 code. Signed-off-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 7aaa1d79e3a2d573ac469744506f17b1c9386840 Author: Samuel Ortiz Date: Mon Jan 19 15:30:26 2009 -0800 iwlwifi: Add TFD library operations The TFD structures for 3945 and agn HWs are fundamentally different. We thus need to define operations for attaching and freeing them. This will allow us to share a fair amount of code (cmd and tx queue related) between both drivers. Signed-off-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 4f3602c8a3cf8d31e8b08b82d7ea9b0c30f28965 Author: Samuel Ortiz Date: Mon Jan 19 15:30:25 2009 -0800 iwl3945: Use iwl_txq_update_write_ptr The iwl3945 and the iwl versions are identical. Signed-off-by: Samuel Ortiz Acked-by: Tomas Winkler Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 638d0eb9197d1e285451f6594184fcfc9c2a5d44 Author: Chatre, Reinette Date: Mon Jan 19 15:30:24 2009 -0800 iwl3945: add debugging for wrong command queue We encountered a problem related to this BUG and need to obtain more debugging information. See bug report at http://marc.info/?l=linux-wireless&m=123147215829854&w=2 Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit af0053d660f7c330ed1a5c6538938283fd79662f Author: Winkler, Tomas Date: Mon Jan 19 15:30:23 2009 -0800 iwlwifi: kill iwl3945_scan_cancel and iwl3945_scan_cancel_timeout This patch removes iwl3945_scan_cancel and iwl3945_scan_cancel_timeout because iwl_scan_cancel iwl_scan_cancel_timeout are just same. Signed-off-by: Tomas Winkler Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 42986796409a6293351207150edb7b4689b6013d Author: Winkler, Tomas Date: Mon Jan 19 15:30:22 2009 -0800 iwlwifi: fix iwl_mac_set_key and iwl3945_mac_set_key This patch fix iwl_mac_set_key function changed in patch "mac80211: clean up set_key callback" 1. removing 'static' const u8 *addr' that can possible cause conflict when two or more NICs are present in the system. 2. simplifying functions Signed-off-by: Tomas Winkler Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 5cd19c5f15f4bd3354cc7f8f8b1125018a84a25c Author: Winkler, Tomas Date: Mon Jan 19 15:30:21 2009 -0800 iwlwifi: make iwl-power.c more readable This patch rearrange code in iwl-power.c function to make it a little more readable. No functional changes. Signed-off-by: Tomas Winkler Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit f797eb7e2903571e9c0e7e5d64113f51209f8dc4 Author: Jouni Malinen Date: Mon Jan 19 18:48:46 2009 +0200 mac80211: Fix MFP Association Comeback to use Timeout Interval IE The separate Association Comeback Time IE was removed from IEEE 802.11w and the Timeout Interval IE (from IEEE 802.11r) is used instead. The editing on this is still somewhat incomplete in IEEE 802.11w/D7.0, but still, the use of Timeout Interval IE is the expected mechanism. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit bb2becac91f13e862d4601a8c5364bc758c35b8e Author: Bob Copeland Date: Mon Jan 19 11:20:54 2009 -0500 ath5k: remove stop/start calls from within suspend/resume mac80211 now takes down interfaces automatically during suspend so doing it in the driver is unnecessary. Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit 665af4fc8979734d8f73c9a6732be07e545ce4cc Author: Bob Copeland Date: Mon Jan 19 11:20:53 2009 -0500 mac80211: add suspend/resume callbacks This patch introduces suspend and resume callbacks to mac80211, allowing mac80211 to quiesce its state (bringing down interfaces, removing keys, etc) in preparation for suspend. cfg80211 will call the suspend hook before the device suspend, and resume hook after the device resume. Signed-off-by: Bob Copeland Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 0378b3f1c49d48ed524eabda7e4340163d9483c9 Author: Johannes Berg Date: Mon Jan 19 11:20:52 2009 -0500 cfg80211: add PM hooks This should help implement suspend/resume in mac80211, these hooks will be run before the device is suspended and after it resumes. Therefore, they can touch the hardware as much as they want to. Signed-off-by: Johannes Berg Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit e0463f501fb945c1fde536d98eefc5ba156ff497 Author: Jouni Malinen Date: Mon Jan 19 16:52:00 2009 +0200 mac80211: Fix drop-unencrypted for management frames ADDBA request Action frame was sent out before 4-way handshake was completed and the initial 802.11w code ended up dropping the frame even if MFP was not enabled. While the sending of Action frames this early is not really a good idea (will break with MFP enabled), we should not break this for the MFP disabled case. This patch fixes ieee80211_tx_h_select_key() not to drop management frames if MFP is disabled. If MFP is enabled, Action frames will be dropped before keys are set per IEEE 802.11w/D7.0. Other robust management frames (i.e., Deauthentication and Disassociation frames) are allowed unprotected prior to key configuration. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 6cd0b1cb872b3bf9fc5de4536404206ab74bafdd Author: Helmut Schaa Date: Mon Jan 19 13:10:07 2009 +0100 iwlagn: fix hw-rfkill while the interface is down Currently iwlagn is not able to report hw-killswitch events while the interface is down. This has implications on user space tools (like NetworkManager) relying on rfkill notifications to bring the interface up once the wireless gets enabled through a hw killswitch. Thus, enable the device already in iwl_pci_probe instead of iwl_up and enable interrups while the interface is down in order to get notified about killswitch state changes. The firmware loading is still done in iwl_up. Signed-off-by: Helmut Schaa Acked-by: Reinette Chatre Signed-off-by: John W. Linville commit c7e035a95d68819491b5250c6854f144c941e305 Author: Helmut Schaa Date: Mon Jan 19 13:02:15 2009 +0100 iwl3945: fix some warnings when compiled without debug Fix the following warnings if compiled without CONFIG_IWLWIFI_DEBUG. drivers/net/wireless/iwlwifi/iwl3945-base.c: In function ‘iwl3945_rx_reply_add_sta’: drivers/net/wireless/iwlwifi/iwl3945-base.c:2748: warning: unused variable ‘pkt’ drivers/net/wireless/iwlwifi/iwl3945-base.c: In function ‘iwl3945_rx_scan_results_notif’: drivers/net/wireless/iwlwifi/iwl3945-base.c:2903: warning: unused variable ‘notif’ drivers/net/wireless/iwlwifi/iwl3945-base.c: In function ‘iwl3945_rx_scan_complete_notif’: drivers/net/wireless/iwlwifi/iwl3945-base.c:2928: warning: unused variable ‘scan_notif’ Signed-off-by: Helmut Schaa Acked-by: Samuel Ortiz Signed-off-by: John W. Linville commit 2182b830fe0258477d469429d2dfb5702b84587e Author: Rami Rosen Date: Mon Jan 19 13:50:37 2009 +0200 mac80211: trivial documentation fix (mesh_nexthop_lookup()). This patch fixes the documentation of mesh_nexthop_lookup() in mesh_hwmp.c. Signed-off-by: Rami Rosen Signed-off-by: John W. Linville commit eb80ed8d1fc0f3005ab356fbd8d61d870e3038e6 Author: Rami Rosen Date: Mon Jan 19 13:50:32 2009 +0200 mac80211: trivial documentation fixes (enum mesh_path_flags). This patch fixes documentation of enum mesh_path_flags in mesh.h. Signed-off-by: Rami Rosen Signed-off-by: John W. Linville commit 9cf2d186e4c52308cad8ecd893924e22ed020605 Author: Rami Rosen Date: Mon Jan 19 13:50:27 2009 +0200 mac80211: remove mesh_plink_close() method. This patch removes mesh_plink_close() method as it is unused. Signed-off-by: Rami Rosen Signed-off-by: John W. Linville commit e9648179706448d50884f172711b00a6e5ab9e42 Author: Wei Yongjun Date: Thu Jan 15 17:41:16 2009 +0800 mac80211: cleanup kmalloc/memset -> kcalloc Transform calls kmalloc/memset to a single kcalloc. Signed-off-by: Wei Yongjun Signed-off-by: John W. Linville commit 672cf3cefe5f686637dec72b9f3d21fe1cdc8c94 Author: Roel Kluin Date: Sun Jan 18 23:50:27 2009 +0100 ath5k: notice a negative keytype To notice a negative keytype Signed-off-by: Roel Kluin Acked-by: Bob Copeland Signed-off-by: John W. Linville commit 3d3e451ff71b4e951d4b522b460a94f36fb5b276 Author: Ivo van Doorn Date: Sat Jan 17 20:44:08 2009 +0100 rt2x00: Add LED_MODE_ASUS support When the led mode is asus, the activity led mode must be registered otherwise the second LED will not be enabled. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 5e790023620ee02486fd64c7e5a6115ce004495d Author: Ivo van Doorn Date: Sat Jan 17 20:42:58 2009 +0100 rt2x00: conf_tx() only need register access for WMM queues conf_tx() in rt61pci and rt73usb only have to check once if the queue_idx indicates a non-WMM queue and break of the function immediately if that is the case. Only the WMM queues need to have the TX configuration written to the registers. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 4e54c711b42c3cc8da8a3fdcde3407b86d67ebcc Author: Ivo van Doorn Date: Sat Jan 17 20:42:32 2009 +0100 rt2x00: Update copyright year to 2009 Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 49c1d2085b92a392189d44a06840cbd9ec147da2 Author: Andrey Borzenkov Date: Sat Jan 17 15:53:45 2009 +0300 Move orinoco Kconfig entries into drivers/net/wireless/orinoco/Kconfig Since driver now lives in separate subdirectory, move Kconfig entries in own file so they can be tweaked indepndently. It complements "orinoco: Move sources to a subdirectory". Signed-off-by: Andrey Borzenkov Acked-by: Pavel Roskin Signed-off-by: John W. Linville commit a2116993c172bbb0c62f83d25cc3fe5dc7fece0d Author: Christian Lamparter Date: Fri Jan 16 22:34:15 2009 +0100 p54spi: remove arch specific dependencies On Friday 16 January 2009 20:33:43 Kalle Valo wrote: > N800 and N810 support is not on mainline yet, for stlc45xx I decided > to add module parameters for the gpio numbers. Here's the commit from > stlc45xx repo: > > http://gitorious.org/projects/stlc45xx/repos/mainline/commits/35afc5df0027d02d49e6f5bf986dcc4deb4ee6cf This is the same patch for p54spi. It removes all N800/N810 specific code from p54spi, so the driver can be used on other architectures, or configurations as well. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit c88a768d7ed1bc38eedf18d16419ef2f01cd2d0d Author: Christian Lamparter Date: Fri Jan 16 20:24:31 2009 +0100 p54usb: fix conflict with recent usb changes A recent change in the usb core "USB: change interface to usb_lock_device_for_reset()" conflicts with "p54usb: utilize usb_reset_device for 3887". Sadly, we have to call usb_reset_device before we can upload the firmware on 3887. Unless someone figures out how to reliably stop the 3887 so the hardware is still usable next time we want to start it. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit c656bbb582cebd988d8c39c4912722dc47578eab Author: Sujith Date: Fri Jan 16 21:38:56 2009 +0530 ath9k: Cleanup buffer type assignment The buffer state is already cleared in ATH_TXBUF_RESET. Remove redundant code clearing the type variable. Signed-off-by: Sujith Signed-off-by: John W. Linville commit d43f301520aa64bb331736a4568d435762f980b0 Author: Sujith Date: Fri Jan 16 21:38:53 2009 +0530 ath9k: Revamp TX aggregation This patch cleans up the convoluted buffer management logic for TX aggregation. Both aggregation creation and completion are addressed. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 6ef9b13db24757a9856f2feb1e571f34938567c9 Author: Sujith Date: Fri Jan 16 21:38:51 2009 +0530 ath9k: Handle holding descriptor in TX completion properly If the current holding descriptor is the last one in the TX queue, *and* it has been marked as STALE, then move it to the free list and bail out, as it has already been processed. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 059d806cdcad3848582519f0546cf8b3bfede7a3 Author: Sujith Date: Fri Jan 16 21:38:49 2009 +0530 ath9k: Add a helper function to wake mac80211 queues Signed-off-by: Sujith Signed-off-by: John W. Linville commit 043a040503b0d0c21bf3fba971813eba3322267d Author: Sujith Date: Fri Jan 16 21:38:47 2009 +0530 ath9k: Merge queue draining functions The TX queue draining routines have confusing names, rename them approprately and merge ath_drain_txdataq() with ath_drain_all_txq(). Signed-off-by: Sujith Signed-off-by: John W. Linville commit 55f5e4a9800ae6e6e052380a8b3c9c4996d5cd05 Author: Sujith Date: Fri Jan 16 21:38:45 2009 +0530 ath9k: Remove ath_tx_stopdma and call ath9k_hw_stoptxdma directly Signed-off-by: Sujith Signed-off-by: John W. Linville commit e8324357902698ffb7615d128d612c85d8e21912 Author: Sujith Date: Fri Jan 16 21:38:42 2009 +0530 ath9k: Reorganize code in xmit.c This patch starts cleaning up all the crufty code in transmission path, grouping functions into logical blocks. Signed-off-by: Sujith Signed-off-by: John W. Linville commit dd006395688cd3ce6c92de288d8db090d98dc2c7 Author: Sujith Date: Fri Jan 16 21:38:40 2009 +0530 ath9k: Update short guard interval in rate control The rate control algorithm needs to know if a STA allows short guard interval, fixing this allows RC to use the correct table. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 6642fe6f5d033128086c8b64737780454e53625e Author: Sujith Date: Fri Jan 16 21:38:28 2009 +0530 ath9k: rateCodeToIndex is not used, remove it Calculation of rate indices from ratecode is done in recv.c in a straightforward manner for both HT and legacy rates. This variable is not needed anymore. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 9aed3cc124343d92be6697e9af3928bdfe8eb03e Author: Jouni Malinen Date: Tue Jan 13 16:03:29 2009 +0200 nl80211: New command for adding extra IE(s) into management frames A new nl80211 command, NL80211_CMD_SET_MGMT_EXTRA_IE, can be used to add arbitrary IE data into the end of management frames. The interface allows extra IEs to be configured for each management frame subtype, but only some of them (ProbeReq, ProbeResp, Auth, (Re)AssocReq, Deauth, Disassoc) are currently accepted in mac80211 implementation. This makes it easier to implement IEEE 802.11 extensions like WPS and FT that add IE(s) into some management frames. In addition, this can be useful for testing and experimentation purposes. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 0c1aa495961f03c964b3287cf5800217cf6f2cee Author: Gabor Juhos Date: Wed Jan 14 20:17:12 2009 +0100 ath9k: enable support for AR9100 Because we have support for the AR9100 devices now, we can enable them. Changes-licensed-under: ISC Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Tested-by: Pavel Roskin Signed-off-by: John W. Linville commit 9950688263dcd74560582f590d270728f4e92ed0 Author: Gabor Juhos Date: Wed Jan 14 20:17:11 2009 +0100 ath9k: fix null pointer dereference in ani monitor code In 'ath9k_ani_reset' the 'ahp->ah_curani' will be initialized only if 'DO_ANI(ah)' true. In 'ath9k_hw_ani_monitor' we are using 'ahp->ah_curani' unconditionally, and it will cause a NULL pointer dereference on AR9100. Changes-licensed-under: ISC Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Tested-by: Pavel Roskin Signed-off-by: John W. Linville commit 1975ef2039c63f58e6c80861a24236bcd0483aa9 Author: Gabor Juhos Date: Wed Jan 14 20:17:10 2009 +0100 ath9k: fix ar5416Addac_9100 values Writing the register at offset 0x98c4 causes a deadlock on the AR913x SoCs. Although i don't have detailed knowledge about these registers, but if i change the register offset according to the 'ar5416Addac' table, it works. Additionally there is no reference to the 0x98c4 elsewhere. Changes-licensed-under: ISC Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Tested-by: Pavel Roskin Signed-off-by: John W. Linville commit d03a66c17ab94f7cfec9b343d415111386216847 Author: Gabor Juhos Date: Wed Jan 14 20:17:09 2009 +0100 ath9k: remove (u16) casts from rtc register access The RTC register offsets don't fit into 'u16' on the AR913x, so we have to remove the existing casts. Changes-licensed-under: ISC Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Tested-by: Pavel Roskin Signed-off-by: John W. Linville commit 9dbeb91a8b97e2892c04461e28d2bdd0198b719d Author: Gabor Juhos Date: Wed Jan 14 20:17:08 2009 +0100 ath9k: get EEPROM contents from platform data on AHB bus On the AR913x SOCs we have to provide EEPROM contents via platform_data, because accessing the flash via MMIO is not safe. Additionally different boards may store the radio calibration data at different locations. Changes-licensed-under: ISC Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Tested-by: Pavel Roskin Signed-off-by: John W. Linville commit 09329d371e57ff9fcb645b8e2cdee1ec8b9b539f Author: Gabor Juhos Date: Wed Jan 14 20:17:07 2009 +0100 ath9k: introduce platform driver for AHB bus support This patch adds the platform_driver itself, and modifies the main driver to register it. Changes-licensed-under: ISC Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Tested-by: Pavel Roskin Signed-off-by: John W. Linville commit 6baff7f9a6c571dcd9a59820e3c094f7490cb0fd Author: Gabor Juhos Date: Wed Jan 14 20:17:06 2009 +0100 ath9k: move PCI code into separate file Now that we have converted all bus specific routines to replaceable, we can move the PCI specific codes into a separate file. Changes-licensed-under: ISC Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Tested-by: Pavel Roskin Signed-off-by: John W. Linville commit 39c3c2f2de6bccf698bfb5b9c4f56ddf99de0dbc Author: Gabor Juhos Date: Wed Jan 14 20:17:05 2009 +0100 ath9k: introduce bus specific cleanup routine We have left only some PCI specific cleanup code. We have to convert them as well. Changes-licensed-under: ISC Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Tested-by: Pavel Roskin Signed-off-by: John W. Linville commit 88d15707644fad1a137af7a17b00da6135f1c1a8 Author: Gabor Juhos Date: Wed Jan 14 20:17:04 2009 +0100 ath9k: introduce bus specific cache size routine The PCI specific bus_read_cachesize routine won't work on the AHB bus, we have to replace it with a suitable one later. Changes-licensed-under: ISC Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Tested-by: Pavel Roskin Signed-off-by: John W. Linville commit 7da3c55ce849e17fd9017c7bf770a03fa083d95b Author: Gabor Juhos Date: Wed Jan 14 20:17:03 2009 +0100 ath9k: convert to use bus-agnostic DMA routines Convert to use bus-agnostic DMA routines to make it usable on AHB bus as well. Changes-licensed-under: ISC Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Tested-by: Pavel Roskin Signed-off-by: John W. Linville commit f5870acb3a8e2cad57b6c5ffd3157a7dfbb47942 Author: Gabor Juhos Date: Wed Jan 14 20:17:02 2009 +0100 ath9k: convert to struct device Convert 'struct pci_dev' to 'struct device' to make it usable on the AHB bus as well. Changes-licensed-under: ISC Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Tested-by: Pavel Roskin Signed-off-by: John W. Linville commit 2663516d8fb896430bf42dce41b3e2f141d63bd5 Author: Helmut Schaa Date: Thu Jan 15 09:38:44 2009 +0100 iwl3945: report killswitch changes even if the interface is down Currently iwl3945 is not able to report hw-killswitch events while the interface is down. This has implications on user space tools (like NetworkManager) relying on rfkill notifications to bring the interface up once the wireless gets enabled through a hw killswitch. Thus, enable the device already in iwl3945_pci_probe instead of iwl3945_up and poll the CSR_GP_CNTRL register to update the killswitch state every two seconds. The polling is only needed on 3945 hardware as this adapter does not use interrupts to signal rfkill changes to the driver (in case no firmware is loaded). The firmware loading is still done in iwl3945_up. Signed-off-by: Helmut Schaa Acked-by: Samuel Ortiz Signed-off-by: John W. Linville commit c95741deef31d14c3a3d58397f9a3d2126d452e5 Author: Harvey Harrison Date: Wed Jan 14 23:10:55 2009 -0800 prism54: remove private implementation of le32_add_cpu Signed-off-by: Harvey Harrison Signed-off-by: John W. Linville commit a1d88210955e56f7a0d54ac72747075b683b0850 Author: Larry Finger Date: Wed Jan 14 11:15:25 2009 -0600 b43: Eliminate compilation warning in b43_op_set_key A recent pull from wireless testing generates the following warning: CC [M] drivers/net/wireless/b43/main.o drivers/net/wireless/b43/main.c: In function ‘b43_op_set_key’: drivers/net/wireless/b43/main.c:3636: warning: pointer type mismatch in conditional expression This fix was suggested by Johannes Berg . Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 07e74348c76368c3d694a06677c200dc8d9b00e8 Author: Jouni Malinen Date: Tue Jan 13 14:32:37 2009 +0200 ath9k: Use a defined value for pci_set_power_state() Silence sparse by using a defined value PCI_D3hot instead of a magic constant in a pci_set_power_state() call. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit d03415e6771cd709b2b2ec64d3e6315cc3ebfa74 Author: Jouni Malinen Date: Mon Jan 12 14:24:40 2009 +0200 nl80211: Fix documentation errors Couple of '_ATTR's were missing and SEC_CHAN_OFFSET to CHANNEL_TYPE rename was missed in couple of places. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 81094888bfbb759ea395f1857a7c38982acb99a9 Author: Helmut Schaa Date: Mon Jan 12 13:04:06 2009 +0100 ath5k: discard 11g caps if reported by an ar5211 eeprom At least one ar5211 card (GIGABYTE GN-WLMA101, 168c:0012 subsystem 1458:e800) reports itself as 11g capable which seems to be a bug in the eeprom. initvals.c assumes that ar5211 is only 11b capable and thus refuses to initialize this card. Hence this patch changes the probing for 11g capabilities to discard 11g capabilities for ar5211 cards which allows this specific card to work fine in 11b and 11a modes. Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit cd8d3d321285a34b4e29cb7b04e552c49cc0f018 Author: Christian Lamparter Date: Sun Jan 11 01:18:38 2009 +0100 p54spi: p54spi driver This patch adds the p54spi driver. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 4628ae75583311fcbbd02f4eebcfc08514dfbd65 Author: Christian Lamparter Date: Sun Jan 11 01:16:09 2009 +0100 p54spi: stlc45xx eeprom blob Usually every prism54 design hardware has a tiny eeprom chip in which all device specific data for calibration and link-tuning is stored. The stlc45xx chips are the only exception. They are made for embedded devices, where space is scarce. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 6917f506a03b6bd7389683e8a8e08a1ad977b33e Author: Christian Lamparter Date: Sun Jan 11 01:14:18 2009 +0100 p54: longbow frontend support This patch adds support for longbow RF chip. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 83cf1b6edba6bde87c8cf852b182d44b12ae7f88 Author: Christian Lamparter Date: Sun Jan 11 01:10:33 2009 +0100 p54: prepare the eeprom parser routines for longbow This patch adds support to upload pre-calculated calibration data to the firmware. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit b6ea03562f04382776ad825624daefe27f5d3f9c Author: Bob Copeland Date: Sat Jan 10 14:42:54 2009 -0500 ath5k: fix bf->skb==NULL panic in ath5k_tasklet_rx Under memory pressure, we may not be able to allocate a new skb for new packets. If the allocation fails, ath5k_tasklet_rx will exit but will leave a buffer in the list with a NULL skb, eventually triggering a BUG_ON. Extract the skb allocation from ath5k_rxbuf_setup() and change the tasklet to allocate the next skb before accepting a packet. Changes-licensed-under: 3-Clause-BSD Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit 138ab2e44e99a9544aad60cf137b8ac1f54131c5 Author: Vasanthakumar Thiagarajan Date: Sat Jan 10 17:07:09 2009 +0530 ath9k: Fix basic connectivity issue This patch temporarily fixes a regression introduced by BT coexistence support. There is an instability in connection when BT coexistence is enabled on some h/w. This interim fix introduces a module parameter for BT coexistence configuration. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 217875a37d4db3354c4c297d07b359abbf52e5e1 Author: Andrew Price Date: Sat Jan 10 19:38:05 2009 +0000 rt2400,rt2500: init led_qual for LED_MODE_DEFAULT Add a check for LED_MODE_DEFAULT so that we use the link LED for rt2400 and rt2500 devices. Signed-off-by: Andrew Price Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit ebe6c7ba9b63539d3b1daba1a8ef4cc9ed0f6941 Author: Jouni Malinen Date: Sat Jan 10 11:47:33 2009 +0200 mac80211: Fix radiotap header it_present on big endian CPUs When the IEEE80211_RADIOTAP_RATE flag was moved to be conditional, it was mistakenly left without cpu_to_le32(). Fix that. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit f4f727a6c84a6ba8f099b84b2a9f0b2ceddc1c8a Author: Jouni Malinen Date: Sat Jan 10 11:46:53 2009 +0200 mac80211: Mark ieee80211_process_sa_query_req() static This function is only used within rx.c, so mark it static. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit d2b21f191753abd12c4063776cb1a3d635397509 Author: Colin McCabe Date: Fri Jan 9 14:58:09 2009 -0800 libertas: if_spi, driver for libertas GSPI devices Add initial support for libertas devices using a GSPI interface. This has been tested with the 8686. GSPI is intended to be used on embedded systems. Board-specific parameters are required (see libertas_spi.h). Thanks to everyone who took a look at the earlier versions of the patch. Signed-off-by: Colin McCabe Signed-off-by: Andrey Yurovsky Acked-by: Dan Williams Signed-off-by: John W. Linville commit 3cd08b383b2efe163272045afc415c75afc9e9c5 Author: Christian Lamparter Date: Fri Jan 9 21:06:06 2009 +0100 p54: upgrade memrecord to p54_tx_info mac80211 reserves 24 bytes in skb->cb for the driver. So far, we only used them to keep track of used and free device memory. But p54spi will need a slice of it, as well as the stuck frame detection. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 63f2dc9f2fd63c8b66f49c53cd26236f3f0785fd Author: Christian Lamparter Date: Fri Jan 9 21:05:31 2009 +0100 p54: refactor p54_alloc_skb Old firmwares had no problems processing frames which filled eighth of the memory window. However we have to be a bit more careful with fat frames when we talk to new firmwares. Apart from that, I confess the old logic was a bit weird and not very sophisticated. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 6dd1bf3118b62a3ce241dc2b7e05e3d4a28c9eb1 Author: Bob Copeland Date: Thu Jan 8 21:00:34 2009 -0500 mac80211: document return codes from ops callbacks For any callbacks in ieee80211_ops, specify what values the return codes represent. While at it, fix a couple of capitalization and punctuation differences. Signed-off-by: Bob Copeland Reviewed-by: Kalle Valo Signed-off-by: John W. Linville commit e724b8fef6088e5dd240b53a38443e48fbcc8e93 Author: Jiri Slaby Date: Mon Jan 5 17:06:06 2009 +0100 IWL: fix WARN typo new kew -> a new key Signed-off-by: Jiri Slaby Cc: Tomas Winkler Signed-off-by: John W. Linville commit b48365994b1b5cce8078c0707a06cf9897007fb5 Author: Colin McCabe Date: Fri Jan 2 19:00:22 2009 -0800 libertas: Update libertas core with GSPI constants Add GSPI constants to libertas core. Fix misleading comment in lbs_setup_firmware. Signed-off-by: Colin McCabe Signed-off-by: Andrey Yurovsky Acked-by: Dan Williams Signed-off-by: John W. Linville commit c7a7c8ecd43b4bc796a8e79c46305e2a677b55f3 Author: Samuel Ortiz Date: Thu Jan 8 10:20:01 2009 -0800 iwl3945: Fix iwl3945_init_drv() iwl3945_init_drv() initialises the wrong lock, and sets the wrong power saving default level. With this power saving mode, we are losing a lot of frames in Ad-Hoc mode. This is a bug fix for bug #1873. ( http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=1873 ) Signed-off-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit a8302de934b5d1897ff146cd0c7ab87d1417c092 Author: Vasanthakumar Thiagarajan Date: Fri Jan 9 18:14:15 2009 +0530 mac80211: Handle power constraint level advertised in 11d+h beacon This patch uses power constraint level while determining the maximum transmit power, there by it makes sure that any power mitigation requirement for the channel in the current regulatory domain is met. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 01f8162a854df7f9c259c839ad3c1168ac13b7b8 Author: Reinette Chatre Date: Thu Jan 8 10:20:02 2009 -0800 iwlwifi: update copyright year to 2009 Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 9c74d9fbd59f3a69cbe08a6bd66479c190effe5f Author: Samuel Ortiz Date: Thu Jan 8 10:19:59 2009 -0800 iwl3945: Change crypto parameter name Now that we're using iwl_mod_params, we want our module parameters names to be in sync with the structure. So, to set iwl_mod_params.sw_crypto, we'd better use a "swcrypto" parameter name instead of the "hwcrypto" current one. Moreover, by setting the decrypted flag properly, this patch also fixes the HW crypto path for 3945 (the current code is not setting it when running HW crypto). This is a bug fix for bug #1872 ( http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=1872 ) Signed-off-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 1e33dc64475790c10a7cda3ca23d2eb678760d85 Author: Winkler, Tomas Date: Thu Jan 8 10:19:57 2009 -0800 iwl3945: use hw_params.rx_buf_size This patch makes 3945 use of hw_params.rx_buf_size instead of IWL_RX_BUF_SIZE. It also renames IWL_RX_BUF_SIZE to IWL_RX_BUF_SIZE_3K and moves rx buffer defines into iwl-fh.h. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit d45aadd04b60c6d4f846e7ec2564654567065e5f Author: Winkler, Tomas Date: Thu Jan 8 10:19:56 2009 -0800 iwl3945: remove double defined 3945 tfd structures This patch removes doubly defined struct iwl3945_tfd_frame_data and struct iwl3945_tfd_frame. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 625a381ab870b190c1899c08467c0e6dcc5d94d4 Author: Winkler, Tomas Date: Thu Jan 8 10:19:55 2009 -0800 iwl3945: kill iwl3945_x2_queue_used This patch replaces iwl3945_x2_queue_used with iwl_queue_used. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 37d68317add2b769ad232a5d199bece41c59e13f Author: Winkler, Tomas Date: Thu Jan 8 10:19:54 2009 -0800 iwl3945: kill iwl3945_rx_queue_space This patch replaces iwl3945_rx_queue_space with iwl_rx_queue_space. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 141c43a3e4c7e8543fea982284765fda5e73837e Author: Winkler, Tomas Date: Thu Jan 8 10:19:53 2009 -0800 iwl3945: kill iwl3945_rx_queue_restock This patch kills iwl3945_rx_queue_restock function on prise of new hw_params.rx_wrt_ptr_reg which holds per NIC RX write pointer register. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit f5965955e0107b116b379cccb94de612281bdf55 Author: Winkler, Tomas Date: Thu Jan 8 10:19:52 2009 -0800 iwl3945: kill hw_params.tx_ant_num This patch removes tx_ant_num for hw_params structure. It is not used. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit fa77533e2e1e5c7d9d80618db21266b9eac1b205 Author: Jouni Malinen Date: Thu Jan 8 13:32:14 2009 +0200 mac80211_hwsim: Report driver as MFP capable mac80211_hwsim has no problems with MFP, so report it as MFP capable. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 0ced0e176ab854df15bd307188decba9c06650e5 Author: Jouni Malinen Date: Thu Jan 8 13:32:13 2009 +0200 ath9k: Setup MFP options for CCMP Configure hardware CCMP for management frame protection and use software crypto when needed. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit ca470b29027f093d8d63abc0fa401cf4f72e427b Author: Jouni Malinen Date: Thu Jan 8 13:32:12 2009 +0200 ath9k: Fix set_key error codes Return -EOPNOTSUPP if the algorithm is not supported and -ENOSPC if there is no room in the key cache. This avoids KERN_ERR printk in mac80211 for "errors" that are actually expected to happen in normal operating conditions. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 4375d08350e3661d5e8860d33eea084e47ba01cf Author: Jouni Malinen Date: Thu Jan 8 13:32:11 2009 +0200 mac80211: 802.11w - Add driver capability flag for MFP This allows user space to determine whether a driver supports MFP and behave properly without having to ask user to configure this in MFP-optional mode. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 1f7d77ab69789980dad44e1af7afd3a68cd48276 Author: Jouni Malinen Date: Thu Jan 8 13:32:10 2009 +0200 mac80211: 802.11w - Optional software CCMP for management frames If driver/firmware/hardware does not support CCMP for management frames, it can now request mac80211 to take care of encrypting and decrypting management frames (when MFP is enabled) in software. The will need to add this new IEEE80211_KEY_FLAG_SW_MGMT flag when a CCMP key is being configured for TX side and return the undecrypted frames on RX side without RX_FLAG_DECRYPTED flag to use software CCMP for management frames (but hardware for data frames). Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 63a5ab82255a4ff5d0783f16427210f1d45d7ec8 Author: Jouni Malinen Date: Thu Jan 8 13:32:09 2009 +0200 mac80211: 802.11w - Implement Association Comeback processing When MFP is enabled, the AP does not allow a STA to associate if an existing security association exists without first going through SA Query process. When this happens, the association request is denied with a new status code ("temporarily rejected") ans Association Comeback IE is used to notify when the association may be tried again (i.e., when the SA Query procedure has timed out). Use the comeback time to update the mac80211 client MLME timer for next association attempt to minimize waiting time if association is temporarily rejected. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 97ebe12a035e11f8af7a06a34f4d848f9b2f0b49 Author: Jouni Malinen Date: Thu Jan 8 13:32:08 2009 +0200 mac80211: 802.11w - Drop unprotected robust management frames if MFP is used Use ieee80211_drop_unencrypted() to decide whether a received frame should be dropped with management frames, too. If MFP is negotiated, unprotected robust management frames will be dropped. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 1acc97b63a3f32481ebbb4e831323e9aa8834f66 Author: Jouni Malinen Date: Thu Jan 8 13:32:07 2009 +0200 mac80211: 802.11w - Do not force Action frames to disable encryption When sending out Action frames, allow ieee80211_tx_skb() to send them without enforcing do_not_encrypt. These frames will be encrypted if MFP has been negotiated. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit fea147328908b7e2bfcaf9dc4377909d5507ca35 Author: Jouni Malinen Date: Thu Jan 8 13:32:06 2009 +0200 mac80211: 802.11w - SA Query processing Process SA Query Requests for client mode in mac80211. AP side processing of SA Query Response frames is in user space (hostapd). Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit fdfacf0ae2e8339098b1164d2317b792d7662c0a Author: Jouni Malinen Date: Thu Jan 8 13:32:05 2009 +0200 mac80211: 802.11w - Configuration of MFP disabled/optional/required Add new WEXT IW_AUTH_* parameter for setting MFP disabled/optional/required. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 22787dbaa3b952602542506e0426ea6d5f104042 Author: Jouni Malinen Date: Thu Jan 8 13:32:04 2009 +0200 mac80211: 802.11w - WEXT configuration for IGTK Added new SIOCSIWENCODEEXT algorithm for configuring BIP (AES-CMAC) keys (IGTK). Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 54604d3a827b37525ef017adba313c7112e0f484 Author: Jouni Malinen Date: Thu Jan 8 13:32:03 2009 +0200 mac80211: 802.11w - WEXT parameter for setting mgmt cipher Add a new IW_AUTH parameter for setting cipher suite for multicast/broadcast management frames. This is for full-mac drivers that take care of RSN IE generation for (re)association request frames. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 3cfcf6ac6d69dc290e96416731eea5c88ac7d426 Author: Jouni Malinen Date: Thu Jan 8 13:32:02 2009 +0200 mac80211: 802.11w - Use BIP (AES-128-CMAC) Add mechanism for managing BIP keys (IGTK) and integrate BIP into the TX/RX paths. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 765cb46a3fc856245ea68a7c961ac87c77e4ae2d Author: Jouni Malinen Date: Thu Jan 8 13:32:01 2009 +0200 mac80211: 802.11w - Add BIP (AES-128-CMAC) Implement Broadcast/Multicast Integrity Protocol for management frame protection. This patch adds the needed definitions for the new information element (MMIE) and implementation for the new "encryption" type (though, BIP is actually not encrypting data, it provides only integrity protection). These routines will be used by a follow-on patch that enables BIP for multicast/broadcast robust management frames. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit fb7333367632c67d8b6b06fb8d906cdabb11b02a Author: Jouni Malinen Date: Thu Jan 8 13:32:00 2009 +0200 mac80211: 802.11w - CCMP for management frames Extend CCMP to support encryption and decryption of unicast management frames. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 5394af4d86ae51b369ff243c3f75b6f9a74e164b Author: Jouni Malinen Date: Thu Jan 8 13:31:59 2009 +0200 mac80211: 802.11w - STA flag for MFP Add flags for setting STA entries and struct ieee80211_if_sta to indicate whether management frame protection (MFP) is used. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 039498c6ec67bd718ac1c8e7f6b4e2cfe2146773 Author: Luis R. Rodriguez Date: Wed Jan 7 17:43:35 2009 -0800 cfg80211: fix typo on message after intersection Signed-off-by: Luis R. Rodriguez Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 3e0c3ff36c4c7b9e39af7d600e399664ca04e817 Author: Luis R. Rodriguez Date: Wed Jan 7 17:43:34 2009 -0800 cfg80211: allow multiple driver regulatory_hints() We add support for multiple drivers to provide a regulatory_hint() on a system by adding a wiphy specific regulatory domain cache. This allows drivers to keep around cache their own regulatory domain structure queried from CRDA. We handle conflicts by intersecting multiple regulatory domains, each driver will stick to its own regulatory domain though unless a country IE has been received and processed. If the user already requested a regulatory domain and a driver requests the same regulatory domain then simply copy to the driver's regd the same regulatory domain and do not call CRDA, do not collect $200. Signed-off-by: Luis R. Rodriguez Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 560e28e14f69ad3440a6e8c283dcfd37e1e41c2d Author: Luis R. Rodriguez Date: Wed Jan 7 17:43:32 2009 -0800 cfg80211: call reg_notifier() once We are calling the reg_notifier() callback per band, this is not necessary, just call it once. Signed-off-by: Luis R. Rodriguez Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 4be8c3873e0b88397866d3ede578503e188f9ad2 Author: Johannes Berg Date: Wed Jan 7 18:28:20 2009 +0100 mac80211: extend/document powersave API This modifies hardware flags for powersave to support three different flags: * IEEE80211_HW_SUPPORTS_PS - indicates general PS support * IEEE80211_HW_PS_NULLFUNC_STACK - indicates nullfunc sending in software * IEEE80211_HW_SUPPORTS_DYNAMIC_PS - indicates dynamic PS on the device It also adds documentation for all this which explains how to set the various flags. Additionally, it fixes a few things: * a spot where && was used to test flags * enable CONF_PS only when associated again Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit acbaf32e94cb70218792cac68e5149e482e77441 Author: Christian Lamparter Date: Wed Jan 7 16:40:08 2009 +0100 p54: return NETDEV_TX_OK in p54_tx and fix sparse warnings This patch addresses all recent comments from Johannes Berg: 1st: (reference http://marc.info/?l=linux-wireless&m=123124685019631 ) >First off: all those should return NETDEV_TX_OK/BUSY. >iwl-agn: returns 0 (== NETDEV_TX_OK, but still should be changed) >[...] >p54: same (some paths) 2nd: > due to your PS patch ("p54: power save management"), please run sparse: > make C=2 CF=-D__CHECK_ENDIAN__ M=... > +drivers/net/wireless/p54/p54common.c:1753:8: warning: incorrect type in assignment (different base types) > +drivers/net/wireless/p54/p54common.c:1769:29: warning: incorrect type in assignment (different base types) The cpu_to_le16 ended up in the wrong line... Sorry! Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 64d74681433415855da02d2516f28d2ed859cde9 Author: Ivo van Doorn Date: Wed Jan 7 14:51:41 2009 +0100 rt2x00: Only register rfkill input when key is present rt2x00 should only register the RFKILL input device when the hardware indicated the key was present. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 46f2c4bd7e2ba2cfedbcd4fe15d316eebc608cba Author: Johannes Berg Date: Tue Jan 6 18:13:18 2009 +0100 mac80211: move dynamic PS timeout to hardware config This will be needed for drivers that set the IEEE80211_HW_NO_STACK_DYNAMIC_PS flag and still want to handle dynamic PS. Signed-off-by: Johannes Berg Reviewed-by: Kalle Valo Signed-off-by: John W. Linville commit e9aeabaeb9a0bece50100dc74bbd720a68cb8f5c Author: Johannes Berg Date: Tue Jan 6 18:12:35 2009 +0100 mac80211: validate SIOCSIWPOWER arguments better Don't accept any arguments we don't handle, and return error codes instead of using an uninitialised stack value. Signed-off-by: Johannes Berg Reviewed-by: Kalle Valo Signed-off-by: John W. Linville commit 4797938c5dfa22af30fd16679192972f878419a1 Author: Johannes Berg Date: Wed Jan 7 10:13:27 2009 +0100 mac80211: clean up channel type config The channel_type really doesn't need to be the only member in a new structure, so remove the struct. Additionally, remove the _CONF_CHANGE_HT flag and use _CONF_CHANGE_CHANNEL when the channel type changes, since that's enough of a change to require reprogramming the hardware anyway. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 47166791b7296db5c0a7189401e42b8c7f4cca25 Author: David Kilroy Date: Wed Jan 7 00:43:54 2009 +0000 orinoco: Remove unused variable rx_data Probably something leftover from experimentation with tasklets. Now the structure declaration orinoco_rx_data can be relocated to orinoco.c Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit d1c3a37ceeb1a5ea02991a0476355f1a1d3b3e83 Author: Johannes Berg Date: Wed Jan 7 00:26:10 2009 +0100 mac80211: clarify alignment docs, fix up alignment Not all drivers are capable of passing properly aligned frames, in particular with mesh networking no hardware will support completely aligning it correctly. This patch adds code to align the data payload to a 4-byte boundary in memory for those platforms that require this, or when CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is set. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 2bf30fabadbdcb535b057afc92aba015884847dc Author: Johannes Berg Date: Tue Jan 6 23:23:56 2009 +0100 mac80211: remove user_power_level from driver API I missed this during review of "mac80211: Fix tx power setting", the user_power_level shouldn't be available to the driver but rather be an internal value used to calculate the value for the driver. Signed-off-by: Johannes Berg Cc: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 8465676241cad5e28a1b745c32a0e18e1f67e18e Author: Nick Kossifidis Date: Tue Jan 6 17:27:06 2009 +0200 ath5k: Minor QCU updates * Sync qcu.c with legacy-hal * Add some more comments * Set QCU mask to save power (QCU mask controls which QCUs are attached to each DCU, we do a 1:1 mapping) TODO: Use max QCU from EEPROM, further sync with legacy-hal and sam's hal and a few more minor fixes. I think after this we are ready to implement WME on the driver part. Anyone interested ? Signed-Off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 8fe12920dc5fa0a0db7cad3661223d5f78a39c60 Author: Rami Rosen Date: Tue Jan 6 15:24:57 2009 +0200 mac80211: remove unused variable in ieee80211_local (dot11WEPUndecryptableCount). This patch removes an unused declaration of dot11WEPUndecryptableCount (an snmp counter) in ieee80211_local structure and its usage in debugfs.c since this counter is not incremented/decremented anywhere. Signed-off-by: Rami Rosen Signed-off-by: John W. Linville commit 81d963a1f6aeefca5527cc605f863eb82a634eab Author: Rami Rosen Date: Tue Jan 6 10:51:01 2009 +0200 mac80211: remove an unused definition (MAX_STA_COUNT) in sta_info.h. This patch removes an unused definition of MAX_STA_COUNT in sta_info.h. Signed-off-by: Rami Rosen Signed-off-by: John W. Linville commit 504a71e4c2718d8ef5dc5bff89dea47a91cf87e5 Author: Rami Rosen Date: Tue Jan 6 10:50:51 2009 +0200 mac80211: remove an unused parameter in ieee80211_rx_mgmt_probe_req(). This patch removes an unused parameter (rx_status) in ieee80211_rx_mgmt_probe_req(), in mlme.c. Signed-off-by: Rami Rosen Signed-off-by: John W. Linville commit def1343971b2abd158ece1a71dd1c7a20e4c2fcb Author: Rami Rosen Date: Tue Jan 6 10:50:33 2009 +0200 mac80211: remove an unnecessary assignment to info in __ieee80211_tx(). This patch removes an unnecessary assignment to info in __ieee80211_tx() , tx.c. Signed-off-by: Rami Rosen Signed-off-by: John W. Linville commit c481ec9705d4a5d566393bc17374cfd82c870715 Author: Sujith Date: Tue Jan 6 09:28:37 2009 +0530 mac80211: Add 802.11h CSA support Move to the advertised channel on reception of a CSA element. This is needed for 802.11h compliance. Signed-off-by: Sujith Acked-by: Johannes Berg Signed-off-by: John W. Linville commit b522ed56ef90f5078a2a1253e390299723510a89 Author: Alina Friedrichsen Date: Tue Jan 6 03:15:23 2009 +0100 mac80211: Allow to set channel in adhoc properly The last patch fixes a bug that it was not possible to set the channel manually in the ad hoc mode properly. Please commit this patches so that we don't need the proprietary Broadcom driver in the near future anymore. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit 65f0e6a36e25fbfa6adf706d9c53bf64b13096eb Author: Alina Friedrichsen Date: Tue Jan 6 03:08:10 2009 +0100 mac80211: Don't merge if BSSID is set manually If you set a fixed BSSID manually, you never want that the driver change it back, or your ad-hoc mesh network will break into peaces. So don't do it. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit 137f9f46a4edf8a937ffe9e3dba498b5cfaa1e5b Author: Alina Friedrichsen Date: Tue Jan 6 02:49:07 2009 +0100 mac80211: Don't scan if BSSID and channel are set manually If you set a fixed BSSID and channel it's not necessary to scan for neighbors to merge, because you really don't want to merge with it. So don't do it. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit 0efcdfd6ed4e7ac74c45e7c3218fd1a7416fdb3f Author: Alina Friedrichsen Date: Tue Jan 6 02:41:35 2009 +0100 mac80211: Disallow to set multicast BSSID Okay, here is the first of the five patches. After applying all of them you should be able to build/join huge city mesh networks (e.g. with the OLSR protocol) with the most of the mac80211 wireless drivers by setting a fixed BSSID in the ad hoc mode. (If you found no other bug/problem.) This was not specified in the original standard, but is a widely used de facto standard. The first patch now completely disallow to set multicast MAC addresses as BSSID. The behavior before was really strange. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville commit cca3e99861e883358ceb39ad17c9eaee082138a5 Author: Ivo van Doorn Date: Sat Jan 3 19:56:02 2009 +0100 rt2x00: Replace RFKILL with INPUT As discussed on linux-wireless rt2x00 does not offer a true RFKILL key, for that reason RFKILL support should be entirely removed. The key which is attached to the hardware should be treated as normal input device instead. Implement input_poll_dev support to poll the device frequently. When the key status has changed report it as a SW event. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit c97c92d92715ea4ea2d7cf00957e8a014439bdd8 Author: Vasanthakumar Thiagarajan Date: Fri Jan 2 15:35:46 2009 +0530 ath9k: Enable Bluetooth Coexistence support Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 7d969204882882585336b0fa19ad4587d8fb15a2 Author: Bob Copeland Date: Thu Jan 1 15:01:45 2009 -0500 ath5k: fix off-by-one in gpio checks Sanity checks against AR5K_NUM_GPIO were all broken. This doesn't currently cause any problems since we only use the first four gpios. Changes-licensed-under: ISC Reported-by: Andreas Mohr Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit 63649b6cf0a964582af2b4d4734e28ca90ec8f5c Author: Bob Copeland Date: Thu Jan 1 15:01:44 2009 -0500 ath5k: support LEDs on Acer Aspire One netbook Add vendor ID for Foxconn and use it to set the ath5k LED gpio and polarity for Acer branded laptops. base.c: Changes-licensed-under: 3-Clause-BSD Reported-by: Maxim Levitsky Tested-by: Maxim Levitsky Tested-by: Andreas Mohr Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit 2b8d4e2eea711b6dfe1878ff3c94ebe757656f6d Author: Christian Lamparter Date: Tue Dec 30 13:48:41 2008 +0100 p54: power save management This patch implements dynamic power save feature for p54. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 51eed9923d98477e7f7473edd60d876d1cecc8c5 Author: Christian Lamparter Date: Tue Dec 30 13:48:29 2008 +0100 p54: implement FIF_OTHER_BSS filter setting According to STMicroelectronics' LMAC documentation, the P54_FILTER_TYPE_TRANSPARENT flag "configures the receive frame filter to pass all frames without regard to type and address matching." Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 78eb7484fadddd2860d4503b3c8c1710c1bfa1b3 Author: Christian Lamparter Date: Tue Dec 30 13:48:19 2008 +0100 p54: enable rx/tx antenna diversity by eeprom bits Respect all documented bits in the eeprom about the device diversity features. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 295834fe3605fd50265399c266fe0a5ccc76edc8 Author: Gabor Juhos Date: Mon Dec 29 21:07:42 2008 +0100 ath9k: use signed format to print HAL status Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit dc822b5db479dc0178d5c04cbb656dad0b6564fb Author: Johannes Berg Date: Mon Dec 29 12:55:09 2008 +0100 mac80211: clean up set_key callback The set_key callback now seems rather odd, passing a MAC address instead of a station struct, and a local address instead of a vif struct. Change that. Signed-off-by: Johannes Berg Acked-by: Bob Copeland [ath5k] Acked-by: Ivo van Doorn [rt2x00] Acked-by: Christian Lamparter [p54] Tested-by: Kalle Valo [iwl3945] Tested-by: Samuel Ortiz [iwl3945] Signed-off-by: John W. Linville commit b3093664c931aa06fc50da42e25b3b6dc307a915 Author: Kalle Valo Date: Mon Dec 29 10:02:48 2008 +0200 mac80211: make wake/stop_queue_by_reason() functions static Fixes sparse warnings: net/mac80211/util.c:355:6: warning: symbol 'ieee80211_wake_queue_by_reason' was not declared. Should it be static? net/mac80211/util.c:385:6: warning: symbol 'ieee80211_stop_queue_by_reason' was not declared. Should it be static? Thanks to Johannes Berg for reporting this. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit c557289cb8ea063bd09db88f8a687a841556e291 Author: Michael Buesch Date: Sat Dec 27 18:26:39 2008 +0100 b43: Change schedule for old-fw support removal The scheduled date for the removal of old fw support was in July 2008. However, we're not going to remove the support unless it causes a major headache. So change the schedule from "July 2008" to "when it causes headaches". Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 98a8d1a8f22237e2aa7db5453df0f68935a5ede0 Author: Christian Lamparter Date: Fri Dec 26 21:50:33 2008 +0100 p54: regulatory domain hints This patch adds a sub-routine that parses the default country eeprom entry and forwards the obtained Alpha2 identifier to the regulatory sub-system. Note: I dropped the p54 specific regdomain<->alpha2 conversion code for now. But it will be added as soon as there's the common library function is ready. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit e365f16046b72977ec22364215b57af840f0907e Author: Christian Lamparter Date: Fri Dec 26 19:09:34 2008 +0100 p54: prevent upload of wrong firmwares This patch will prevent anyone to upload a firmware which was not designed for his device. There's still a catch: There is no easy way to detect if a firmware is for PCI or for USB (1st Gen), because they all share the same LM86 identifier. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 6982869d993009c02cefcca98a67b212d0e61c5f Author: Christian Lamparter Date: Fri Dec 26 19:08:31 2008 +0100 p54usb: utilize usb_reset_device for 3887 Sometimes on unload or reboot the 3887 USB devices become stuck. kernel: usbcore: registered new interface driver p54usb kernel: usb 2-10: (p54usb) reset failed! (-110) kernel: p54usb: probe of 2-10:1.0 failed with error -110 [...] and a physical unplug and replug was necessary. However we should be able to do this in software as well, without any user interaction. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 6b1c7c67603efdf0b39f6056989b0f8194cdc1f3 Author: Michael Buesch Date: Thu Dec 25 00:39:28 2008 +0100 b43/ssb: Add SPROM8 extraction and LP-PHY detection This adds detection code for the LP-PHY and SPROM extraction code for version 8, which is needed by the LP-PHY and newer N-PHY. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit bb519bee07eed4fac9921ad658fb1f7ed78defb5 Author: Johannes Berg Date: Wed Dec 24 15:26:40 2008 +0100 b43: detect N PHY revision/radio Does nothing unless you enable the hidden N PHY config. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit cb33c4126ba9825b047463352d12dc3ed983d320 Author: Senthil Balasubramanian Date: Wed Dec 24 18:03:58 2008 +0530 ath9k: INI update for Atheros AR9280 and AR9285 chipset. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit 92d6128e1766bb7a7b6dc58f012fdf772fdf1100 Author: Johannes Berg Date: Wed Dec 24 12:44:09 2008 +0100 ssb/b43: add new N PHY device This is used on my macbook. N PHY, obviously nothing works yet, but we can detect the chip with this patch. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit e3c92df08cbf6a0cb60a9c7ce377378383967e07 Author: Vasanthakumar Thiagarajan Date: Wed Dec 24 13:53:11 2008 +0530 mac80211: Fix tx power setting power_level in ieee80211_conf is being used for more than one purpose. It being used as user configured power limit and the final power limit given to the driver. By doing so, except very first time, the tx power limit is taken from min(chan->max_power, local->hw.conf.power_level) which is not what we want. This patch defines a new memeber in ieee80211_conf which is meant only for user configured power limit. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit a085ff718c8c9f14c44feb337774fadfd982e1a5 Author: Luis R. Rodriguez Date: Tue Dec 23 15:58:51 2008 -0800 ath9k: fix sparse warnings Fix sparse warnings: drivers/net/wireless/ath9k/hw.c:1850:17: warning: symbol 'tmp' shadows an earlier one drivers/net/wireless/ath9k/hw.c:1713:6: originally declared here drivers/net/wireless/ath9k/hw.c:2051:17: warning: symbol 'tmp' shadows an earlier one drivers/net/wireless/ath9k/hw.c:1961:6: originally declared here drivers/net/wireless/ath9k/eeprom.c:195:6: warning: symbol 'ath9k_fill_eeprom' was not declared. Should it be static? drivers/net/wireless/ath9k/eeprom.c:463:5: warning: symbol 'ath9k_check_eeprom' was not declared. Should it be static? drivers/net/wireless/ath9k/eeprom.c:1219:6: warning: symbol 'ath9k_hw_set_def_power_per_rate_table' was not declared. Should it be static? drivers/net/wireless/ath9k/eeprom.c:1510:6: warning: symbol 'ath9k_hw_set_4k_power_per_rate_table' was not declared. Should it be static? drivers/net/wireless/ath9k/eeprom.c:2007:5: warning: symbol 'ath9k_set_txpower' was not declared. Should it be static? drivers/net/wireless/ath9k/eeprom.c:2106:6: warning: symbol 'ath9k_set_addac' was not declared. Should it be static? drivers/net/wireless/ath9k/eeprom.c:2543:6: warning: symbol 'ath9k_eeprom_set_board_values' was not declared. Should it be static? drivers/net/wireless/ath9k/eeprom.c:2606:5: warning: symbol 'ath9k_get_eeprom_antenna_cfg' was not declared. Should it be static? drivers/net/wireless/ath9k/eeprom.c:2622:4: warning: symbol 'ath9k_hw_get_4k_num_ant_config' was not declared. Should it be static? drivers/net/wireless/ath9k/eeprom.c:2628:4: warning: symbol 'ath9k_hw_get_def_num_ant_config' was not declared. Should it be static? drivers/net/wireless/ath9k/eeprom.c:2647:4: warning: symbol 'ath9k_get_num_ant_config' was not declared. Should it be static? drivers/net/wireless/ath9k/eeprom.c:2790:5: warning: symbol 'ath9k_get_eeprom' was not declared. Should it be static? drivers/net/wireless/ath9k/calib.c:962:30: warning: symbol 'iq_cal_multi_sample' was not declared. Should it be static? drivers/net/wireless/ath9k/calib.c:969:30: warning: symbol 'iq_cal_single_sample' was not declared. Should it be static? drivers/net/wireless/ath9k/calib.c:976:30: warning: symbol 'adc_gain_cal_multi_sample' was not declared. Should it be static? drivers/net/wireless/ath9k/calib.c:983:30: warning: symbol 'adc_gain_cal_single_sample' was not declared. Should it be static? drivers/net/wireless/ath9k/calib.c:990:30: warning: symbol 'adc_dc_cal_multi_sample' was not declared. Should it be static? drivers/net/wireless/ath9k/calib.c:997:30: warning: symbol 'adc_dc_cal_single_sample' was not declared. Should it be static? drivers/net/wireless/ath9k/calib.c:1004:30: warning: symbol 'adc_init_dc_cal' was not declared. Should it be static? Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit c0d7c7af0a8298a43449d54762e655ab57739539 Author: Luis R. Rodriguez Date: Tue Dec 23 15:58:50 2008 -0800 ath9k: remove superfluous check on changing channel When we try to change the channel in ath9k its because either the configuration indicates we *have* changed channels or HT configuration has changed. In both cases we want to do a reset. Either way mac80211 will inform us when we want to actually change the channel so trust those calls. Although in the patch it may seem as I am doing more code changes I am not, all I am doing is removing the initial branch conditional and shifting the code to the left. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 0de57d991b82eb64b7a0f4cf406251713ee633cf Author: Luis R. Rodriguez Date: Tue Dec 23 15:58:49 2008 -0800 ath9k: remove ath9k_hw_check_chan() The only check we care about in ath9k_hw_check_chan() is the internal regulatory check so use that. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 4febf7b8f4f2c7052cffbccba9e5ddf041b41330 Author: Luis R. Rodriguez Date: Tue Dec 23 15:58:48 2008 -0800 ath9k: remove ath9k_hw_chan2wmode() The only left users are for timing for ACK timeout, slotime and CTS timeout. We currently use an array CLOCK_RATE to keep these values per mode and since as only will use A and G we can depend on the band to get the appropriate values. We note that we should be using a different clock rate value for CCK, we can do this in separate patch, currently this is being disregarded and should only affect when we want to change the default ACK/CTS timeout or slot time and stuck with using using 802.11b. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit e56db718468416ce5ff1ba05e7fa5026424befd5 Author: Luis R. Rodriguez Date: Tue Dec 23 15:58:47 2008 -0800 ath9k: remove mode specific default noise floor values The NOISE_FLOOR array we have is mode specific, and the only possible indexed values are A, B and G. The mode routine only can return G or A, so this is band specific. Then since the values for A and G (5ghz or 2ghz) are the same (-96) we simply remove the array and use a static value. If we later determine we want to use special values for HT configurations we can use the new mac80211 conf_is_ht*() helpers. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 38b33707a1ec77f7b4c92ae41cfe93318014f5bf Author: Luis R. Rodriguez Date: Tue Dec 23 15:58:46 2008 -0800 ath9k: Make ANI CCK and OFDM error triggers band specific The CCK and OFDM ANI error triggers are not mode specific but rather band specific so just make use of the already available band from ieee80211_conf. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 285256a59d790c6a9afe8ec82804a369d956ac06 Author: Luis R. Rodriguez Date: Tue Dec 23 15:58:45 2008 -0800 mac80211: no need for ht.enabled We can simply use conf_is_ht() check where needed. Signed-off-by: Luis R. Rodriguez Acked-by: Johannes Berg Signed-off-by: John W. Linville commit de27e64e5eb72ff3edcaf5edce2f306ada1f094d Author: Luis R. Rodriguez Date: Tue Dec 23 15:58:44 2008 -0800 iwlwifi: make use of conf_is_ht*() helpers Signed-off-by: Luis R. Rodriguez Acked-by: Johannes Berg Signed-off-by: John W. Linville commit ecf70441a3d53dd96cb1b454060fe39f9c3db301 Author: Luis R. Rodriguez Date: Tue Dec 23 15:58:43 2008 -0800 ath9k: make use of conf_is_ht*() in the rest of the driver Use shiny new conf_is_ht*() helpers, we can later remove ht.enabled if desired. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit c9e27d94f5fc726f88897914025619fbfc18b23c Author: Luis R. Rodriguez Date: Tue Dec 23 15:58:42 2008 -0800 ath9k: use ieee80211_conf on ath9k_hw_iscal_supported() ath9k_hw_iscal_supported() just needs to be aware of your band and if HT20 is being used so lets abandon our internal channel, HT appended values and internal mode values and use ieee80211_conf which already carries this information. This works as calibration is being done for the currently configured channel. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 76061abbbb39ba4bdf42fe28aa3157df8bb03d38 Author: Luis R. Rodriguez Date: Tue Dec 23 15:58:41 2008 -0800 ath9k: make request to get the noisefloor threshold band specific Lets make the request to get the current noise floor threshold from the EEPROM band specific as it is band specific, not mode specific. This also adds a backpointer on the private channel structure back to the ieee80211_channel structure as this is now needed during ath9k_hw_getnf(). Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit ae8d2858c54f52dc4df513a818cc4e1257fd9143 Author: Luis R. Rodriguez Date: Tue Dec 23 15:58:40 2008 -0800 ath9k: consolidate arguments on hw reset HW reset calls pass the same variables or structs which we can obtain easily from ah. Although this also applies during channel changes as we will keep around the ath9k_channel passed as an argument for now. We now also now propagate the hw reset errors down. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit ce111badf5ac387e9eefe1f2bba751f595994cb2 Author: Luis R. Rodriguez Date: Tue Dec 23 15:58:39 2008 -0800 ath9k: Rename ath_setcurmode() to ath_cache_conf_rate() ath_setcurmode() is a bit misleading, all we are doing is caching the rate for the corresponding configuration we are using. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 96742256aba8c458d49af42610557977245be82d Author: Luis R. Rodriguez Date: Tue Dec 23 15:58:38 2008 -0800 ath9k: remove cache of rate preference when using 11g protection No need to cache when we want to use 2Mbit/s for all protection frames for 802.11g as we can determine that dynamically on ath_buf_set_rate() itself. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 030bb495c0c34aa74903ab8cf9c35e4f2f0aedea Author: Luis R. Rodriguez Date: Tue Dec 23 15:58:37 2008 -0800 ath9k: use hw->conf on ath_setcurmode() We don't need to use our own mode for setting the the routine tries to do, in fact lets remove ath_chan2mode() now as we can simply use the currently set band and the HT configuration provided by mac80211 through the ieee80211_conf. This works on changing channels as well as the internal ath9k_channel we use is based on the ieee80211_channel in the config. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 10c806b32db1c9f010945e92043ef2a3f6fffc3f Author: Luis R. Rodriguez Date: Tue Dec 23 15:58:36 2008 -0800 mac80211: add HT conf helpers In HT capable drivers you often need to check if you are currently using HT20 or HT40. This adds a few small helpers to let drivers figure that out. Signed-off-by: Luis R. Rodriguez Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 51af3d3fbbe326077a7e245268a7de325de6ecd2 Author: Winkler, Tomas Date: Mon Dec 22 11:31:23 2008 +0800 iwl3945: use rx queue management infrastructure from iwlcore This patch uses rx queue alloc free and reset function from iwlcore. This should fix the regression reported by Kalle Valo. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit e52119c50d6a35506b1c063eeacf7acc40b4e03d Author: Winkler, Tomas Date: Mon Dec 22 11:31:19 2008 +0800 iwl3945: use iwl3945_tx_cmd instead of iwl_tx_cmd The patch replaces iwl_tx_cmd with iwl3945_tx_cmd to complete transitions introduced by "iwlwifi: use iwl_cmd instead of iwl3945_cmd" Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit c496294efe6ebc9bd5dd1e0d3cce5d1ad6a1ea2c Author: Samuel Ortiz Date: Mon Dec 22 11:31:18 2008 +0800 iwl3945: switch to the iwl-core send_card_state routine Switch iwl3945 to use iwl-core:send_card_state routine. Signed-off-by: Samuel Ortiz Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 188cf6c73a72be1d8c118580a40d70cd76415eec Author: Samuel Ortiz Date: Mon Dec 22 11:31:16 2008 +0800 iwl3945: sync tx queue data structure with iwlagn We are now using the iwl_tx_queue for iwl3945. To reach that goal, we included the 3945 specific tfd frame structure to iwl_tx_queue. This has no effect on the current iwlagn code. Signed-off-by: Samuel Ortiz Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 42427b4e436bbbf038742ecbb3bf09815f93ed7a Author: Kolekar, Abhijeet Date: Mon Dec 22 11:31:15 2008 +0800 iwl3945: adding utils ops The patch implements iwl_hcmd_utils_ops for 3945. Signed-off-by: Samuel Ortiz Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit dbb6654c411e2030ed969ef0c531eb7fda8b27a3 Author: Winkler, Tomas Date: Mon Dec 22 11:31:14 2008 +0800 iwl3945: rearrange 3945 tfd This patch moves 3945 TFD structures to iwl-3945-fh.h. It renames them similarly to AGN naming. This patch also eliminates iwl3945_tx_info and fixes endianity issue in iwl3945_tx_skb and iwl3945_enqueue_hcmd caused by ugly casting. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 8cd812bcda06645160b0b279e1a125271a73411c Author: Winkler, Tomas Date: Fri Dec 19 10:37:43 2008 +0800 iwl3945: use iwl_rb_status This patch makes use of iwl_rb_status also in 3945. The structure for 3945 is not the same but since only closed_rb_num filed is used in both cases there is no reason to duplicate it. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit cbba18c6e3d1b2610f9a63c4636247af26141686 Author: Kolekar, Abhijeet Date: Fri Dec 19 10:37:42 2008 +0800 iwl3945: use iwl_get_hw_mode Use iwl_get_hw_mode for 3945. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit d552bfb65241a35d48e44ddb0d27e0454f579ab4 Author: Kolekar, Abhijeet Date: Fri Dec 19 10:37:41 2008 +0800 iwl3945: release resources before shutting down Release resource before shutting down and notify upper stack. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 90a30a021eec15da64a354656cb66987216361eb Author: Kolekar, Abhijeet Date: Fri Dec 19 10:37:40 2008 +0800 iwl3945: simplify iwl3945_pci_probe The patch simplifies iwl3945_pci_probe. It also uses apm_ops for apm init. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 854682ed2892836d7cff77931a79183c1fc59fef Author: Kolekar, Abhijeet Date: Fri Dec 19 10:37:39 2008 +0800 iwl3945: add set_pwr_src The patch adds 3945 iwl_lib_ops->set_pwr_src to the driver Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 01ec616d8ccbfac41c87dafc0fc0aa4abe13b8f8 Author: Kolekar, Abhijeet Date: Fri Dec 19 10:37:38 2008 +0800 iwl3945: add apm ops The patch adds 3945 iwl_lib_ops->apm_ops to the driver. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 0164b9b45dbee4a3c4c95f59f9dd538b1e9c2635 Author: Kolekar, Abhijeet Date: Fri Dec 19 10:37:37 2008 +0800 iwl3945: add load ucode op The patch adds 3945 iwl_lib_ops->load_ucode to the driver. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 775a6e27bfca9d19f3ea6006a7e60a4a54aaf69c Author: Kolekar, Abhijeet Date: Fri Dec 19 10:37:36 2008 +0800 iwl3945: cleanup and remove duplicate code The patch removes the following duplicate structures: iwl3945_is_alive iwl3945_is_ready iwl3945_is_init iwl3945_is_rfkill_sw iwl3945_is_rfkill iwl3945_reset_qos Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit df878d8f0156ec2b41da5ae9c70af4a27cb2eb0a Author: Kolekar, Abhijeet Date: Fri Dec 19 10:37:35 2008 +0800 iwl3945: use iwl_mod_params for 3945 Use iwl_mod_params for 3945. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit c2d79b488a33a77d337092c967ce50614edc5d25 Author: Winkler, Tomas Date: Fri Dec 19 10:37:34 2008 +0800 iwlwifi: use iwl_cmd instead of iwl3945_cmd This patch makes use of iwl_cmd instead of iwl3945_cmd and related structures which were just the same. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 15b1687cb4f45b87ddbe4dfc7759ff5bb69497d2 Author: Winkler, Tomas Date: Fri Dec 19 10:37:33 2008 +0800 iwlwifi: replace IWL_ERROR with IWL_ERR IWL_ERR doesn't use hidden priv pointer. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 39aadf8c29ad959e823efca15381bea9d0770b1e Author: Winkler, Tomas Date: Fri Dec 19 10:37:32 2008 +0800 iwlwifi: replace IWL_WARNING with IWL_WARN IWL_WARN doesn't use hidden priv pointer. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 978785a3892b34448446e8c8a17f48454f1bdd6a Author: Tomas Winkler Date: Fri Dec 19 10:37:31 2008 +0800 iwlwifi: clean up printing Use IWL_ macros where possible to unify debug output usage. Define new unconditional printouts IWL_ERR, IWL_WARN, IWL_INFO, and IWL_CRIT which don't use hidden priv pointer. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 146846aed534aa0eb1fb0a8e6c0394190e5c1ad7 Author: Zhu Yi Date: Fri Dec 19 10:37:30 2008 +0800 iwlwifi: add more comments to IWL_DL_xx This adds more comments to IWL_DL_xx macros. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 5d49f498a29360592dea4693724fef242278e0d3 Author: Abhijeet Kolekar Date: Fri Dec 19 10:37:29 2008 +0800 iwl3945: use iwl-io.h and delete iwl-3945-io.h The patch deletes iwl-3945-io.h and uses iwl-io.h functions. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 4a8a43222db6f04c88def2160a95f978f704b515 Author: Abhijeet Kolekar Date: Fri Dec 19 10:37:28 2008 +0800 iwl3945: replaces iwl3945_priv with iwl_priv The patch replaces iwl3945_priv to iwl_priv. It adds 3945 specific data members to iwl_priv. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit f2c7e52100545e54af064fe0345d141fdcf2d243 Author: Abhijeet Kolekar Date: Fri Dec 19 10:37:27 2008 +0800 iwl3945: rename iwl3945_priv variables The patch renames iwl3945 specific variables in iwl3945_priv structure. iwl3945_priv structure differs with iwl_priv structure with these variables. Goal of this patch is to make transition from iwl3945_priv to iwl_priv smoothly. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 3832ec9dc919a0994d713390eb4fb3c7e7500b94 Author: Abhijeet Kolekar Date: Fri Dec 19 10:37:26 2008 +0800 iwl3945: use iwl_hw_params in iwl3945_priv The patch makes changed necessary to use iwl_hw_params to replace iwl3945_driver_hw_info. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit cc2f362c360af35b74530f3c896511b8dbd0264c Author: Abhijeet Kolekar Date: Fri Dec 19 10:37:25 2008 +0800 iwl3945: use iwl_rx_queue in iwl3945 The patch replaces iwl3945_rx_queue with iwl_rx_queue. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 6100b58806e6307f959af79334ac553825400242 Author: Abhijeet Kolekar Date: Fri Dec 19 10:37:24 2008 +0800 iwl3945: use iwl_rx_mem_buffer The patch replaces iwl3945_rx_mem_buffer with iwl_rx_mem_buffer. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit d2bf55839ad77486a02ec32f8411f432621da110 Author: Wu Fengguang Date: Fri Dec 19 10:37:23 2008 +0800 iwlwifi: beautify code This patch beautifies macros in iwl-debug.h. Signed-off-by: Wu Fengguang Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit b5323d36637909481318e7dfcba9f3e3b9368881 Author: Kolekar, Abhijeet Date: Fri Dec 19 10:37:22 2008 +0800 iwl3945: replace iwl3945_broadcast_addr with iwl_bcast_addr The patch replaces iwl3945_broadcast_addr with iwl_bcast_addr for 3945. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit a78fe754e0e5a77ca968ee0c348f027e84659d8b Author: Kolekar, Abhijeet Date: Fri Dec 19 10:37:21 2008 +0800 iwl3945: remove duplicate structures from iwl-3945.h The patch renames and deletes duplicate structure from iwl-3945.h. The following structures are renamed with iwlwifi counterparts: 1) iwl3945_ac_qos 2) iwl3945_ucode 3) iwl3945_qos_capabity Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 85d4149533e07e5ca4c94010a52fe5496d998611 Author: Kolekar, Abhijeet Date: Fri Dec 19 10:37:20 2008 +0800 iwl3945: move structures from iwl-3945.h to iwl-dev.h The patch moves few structres from iwl-3945.h to iwl-dev.h. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit c0f20d91417bc8a4b54e1917a45f8fd4cf9f2991 Author: Kolekar, Abhijeet Date: Fri Dec 19 10:37:19 2008 +0800 iwl3945: replace iwl_3945_cfg with iwl_cfg The patch replaces iwl_3945_cfg with iwl_cfg for 3945. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 5747d47fb469613901e76a1380daf14901e76092 Author: Kolekar, Abhijeet Date: Fri Dec 19 10:37:18 2008 +0800 iwl3945: include iwl-core.h Use iwl-core.h instead of iwl-3945-core.h. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit eaa686c37d12aac37f955eb7643a62370c84ee12 Author: Kolekar, Abhijeet Date: Fri Dec 19 10:37:17 2008 +0800 iwl3945: Change IWLWIFI_VERSION constant name Change IWLWIFI_VERSION to IWL3945_VERSION. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 6d6498947da40485f691bcbafdc4e9b3280a9b3b Author: Winkler, Tomas Date: Fri Dec 19 10:37:16 2008 +0800 iwlwifi: emliminate iwl3945_mac_get_stats mac80211 handler This patch removes empty iwl3945_mac_get_stats mac80211 handler. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit d20b3c65f2a3e18ea86542e6ca4fe1c6d16c91df Author: Samuel Ortiz Date: Fri Dec 19 10:37:15 2008 +0800 iwl3945: iwl3945_queue and iwl3945_channel_info replacement This patch replaces the queue and channel info 3945 structures with the iwl ones. The initial goal was to replace the channel info structure. Once we do that, and then include iwl-dev.h instead of iwl-3945.h, we still get build errors due to several routines and macro redefinitions. This is why this patch also includes: - TFD39_MAX_PAYLOAD definition for 3945. - CMD_SIZE, CMD_HUGE, CMD_SKB duplication removal. - iwl3945_queue replacement in order to also get rid of the duplicated get_cmd_index routine. Getting rid of any of those needs the iwl-dev.h inclusion which then creates build errors due to definitions duplication. This is why we include all those in the same patch. Signed-off-by: Samuel Ortiz Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 1125eff3ae26b2e39c6bf940b5e0b8774ebd2896 Author: Samuel Ortiz Date: Fri Dec 19 10:37:14 2008 +0800 iwl3945: Remove power related definitions from 3945 code Most of the power (not TX power, but power management) structures and definitions are duplicated accross iwl-power.h and iwl-3945.h. We should try to only use the iwl header. Signed-off-by: Samuel Ortiz Acked-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit b5b83239e7a3540ff31db24249b90f9f6d7f5be8 Author: Samuel Ortiz Date: Fri Dec 19 10:37:13 2008 +0800 iwl3945: Getting rid of iwl-3945-led.h The duplicated LED definitions prevent one from including iwl-dev.h from the 3945 specific C files. Moreover, we are sharing many definitions between iwl-3945-led.h and iwl-led.h, so let's just use the iwl one. Note that this file will get more cleanups once we share a common iwl_priv structure. Signed-off-by: Samuel Ortiz Acked-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit d9829a67f953379b5cab6b78ae8f7a879a591eb1 Author: Samuel Ortiz Date: Fri Dec 19 10:37:12 2008 +0800 iwl3945: Use iwl-agn-rs.h rates definitions. A lot of rate relates definition are shared between iwl-3945-rs.h and iwl-agn-rs.h. Let's just use the agn version, and add the 3945 specific constants there. Signed-off-by: Samuel Ortiz Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 250bdd216c95907760b3fcc3aac1ed436d21c66c Author: Samuel Ortiz Date: Fri Dec 19 10:37:11 2008 +0800 iwl3945: Have consistant and not redefined HW constants SRAM addresses are different for 3945, 4065, and 5000, let's give them different names. Also, the RSSI_OFFSET is different for 3945 and 4965, thus they should be named differently. Signed-off-by: Samuel Ortiz Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 0f741d9992ad043026218677c06042ac9f834f8f Author: Samuel Ortiz Date: Fri Dec 19 10:37:10 2008 +0800 iwl3945: Getting rid of iwl3945_eeprom_channel The corresponding iwl structure is identical. Signed-off-by: Samuel Ortiz Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit a3139c5956702c9ff957ac9fe2d902de355b063e Author: Samuel Ortiz Date: Fri Dec 19 10:37:09 2008 +0800 iwl3945: Remove DRV_NAME dependenies As DRV_NAME is defined in 2 different header files, including both is not possible. This patch defines this constant from iwl3945-base.c and iwl-agn.c. It also redefines the IWL_ERROR and IWL_WARNING macros to use dev_printk, as the IWL_DEBUG_* macros do. Signed-off-by: Samuel Ortiz Acked-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 40b8ec0bfa2d96c9feae2bc1596e9b427c77b8da Author: Samuel Ortiz Date: Fri Dec 19 10:37:08 2008 +0800 iwl3945: Getting rid of iwl-3945-debug.h At the cost of adding a debug_level field to iwl3945_priv, we are now able to get rid of iwl-3945-debug.h, and use iwl-debug.h instead. Signed-off-by: Samuel Ortiz Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 3d24a9f790c0e39cfdef1446c7100e89c542805c Author: Tomas Winkler Date: Fri Dec 19 10:37:07 2008 +0800 iwlwifi: 3945 remove iwl-3945-commands.h This patch remove iwl-3945-commands.h eliminating duplicated and moving all definitions to iwl-commands.h Signed-off-by: Tomas Winkler Acked-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 28afaf9139ce9f1c26452f34808e322e8e868850 Author: Tomas Winkler Date: Fri Dec 19 10:37:06 2008 +0800 iwlwifi: 3945 drop usage of union tsf This patch replaces union tsf with u64 This also allows to use iwl_error_res and iwl_rxon_time_cmd instead of 3945 structures Signed-off-by: Tomas Winkler Acked-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 4c897253cc9ae1c6a2798b27b5fe8e6d94ab6185 Author: Tomas Winkler Date: Fri Dec 19 10:37:05 2008 +0800 iwlwifi: 3945 remove duplicated code from iwl-3945-commands.h This patch remove trivial (renames) commands and defines from iwl-3945-commands.h Signed-off-by: Tomas Winkler Acked-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 600c0e11ea6161e00e8cb4b4dda39a64ce988c60 Author: Tomas Winkler Date: Fri Dec 19 10:37:04 2008 +0800 iwlwifi: use iwl-commands.h also in 3945 This patch uses iwl-commands.h also for iwl3945 more clean ups are required but this get to stage where it compiles cleanly. Most massive changes are in spectrum and power managment. Signed-off-by: Tomas Winkler Acked-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit b936d9be05d66172b2c035eaca002a134f078c64 Author: Winkler, Tomas Date: Fri Dec 19 10:37:03 2008 +0800 iwlwifi: 3945 remove current_rate from station entry. This patch removes current_rate from station_entry it was write only variable Signed-off-by: Tomas Winkler Acked-by: Samuel Ortiz Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 69d00d2722e7478e590e40b1a8b791b4aeea195f Author: Tomas Winkler Date: Fri Dec 19 10:37:02 2008 +0800 iwlwifi: 3945 unfold iwl-3945-commands.h This patch unfolds includes of iwl-3945-commands.h Signed-off-by: Tomas Winkler Acked-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit bddadf86fb284f237d6e2d3496772c8f5c68370e Author: Tomas Winkler Date: Fri Dec 19 10:37:01 2008 +0800 iwlwifi: 3945 extract flow handler definitions into iwl-3945-fh.h This patch moves 3945 definitions into iwl-3945-fh.h It renames FH_ to FH39 to help inclusion of 3945 into iwlcore framework Signed-off-by: Tomas Winkler Acked-by: Samuel Ortiz Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 7cbf0ba5193d1f3bb3caaa06668e22bc86776e41 Author: Vivek Natarajan Date: Wed Dec 24 00:34:37 2008 -0800 mac80211: Cancel the power save timer in ieee80211_stop. Since the station info is flushed before calling set_disassoc in ieee80211_stop, the power save timer is never cancelled when the driver is unloaded. Hence the timer cancellation has to be done in ieee80211_stop itself. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit a97b77b90decf27a86ac40ea53a741ffb5ead21a Author: Vivek Natarajan Date: Tue Dec 23 18:39:02 2008 -0800 mac80211: Enhancements to dynamic power save. This patch enables mac80211 to send a null frame and also to check for tim in the beacon if dynamic power save is enabled. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 869717fbe43eb831cbebd03a9a66a4a4c3b406a9 Author: Vivek Natarajan Date: Tue Dec 23 18:28:34 2008 -0800 mac80211: A couple of fixes to dynamic power save. a) hw_config() should not be called from siwpower() for the drivers which do not support dynamic powersave. b) IEEE80211_HW_NO_STACK_DYNAMIC_PS needs to be verified in set_associated() also before enabling the power save timers. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit d063ed0f0cd623b45edc6f4781dda6478c56bb4f Author: Vivek Natarajan Date: Tue Dec 23 18:17:19 2008 -0800 mac80211: Reset the power save timer from master_start_xmit. When a null data frame is generated from mac80211, it goes through master_start_xmit and not through subif_start_xmit. Hence for the power save timer to be triggered while sending this null data frame also, the timer has to be reset from master_start_xmit. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit eb46936b9f2b639f4edeeaf9154d49476fc30fe5 Author: Vasanthakumar Thiagarajan Date: Tue Dec 23 21:30:50 2008 +0530 mac80211: Scale down to non-HT association with TKIP/WEP as pairwise cipher As TKIP is not updated to new security needs which arise when TKIP is used to encrypt A-MPDU aggregated data frames, IEEE802.11n does not allow any cipher other than CCMP (Which has new extensions defined) as pairwise cipher between HT peers. When such configuration (TKIP/WEP in HT) is forced, we still associate in non-HT mode (11a/b/g). Signed-off-by: Vasanthakumar Thiagarajan Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 9ee677c2276bfcbcf68042ec2718a504af0c5fd7 Author: David Kilroy Date: Tue Dec 23 14:03:38 2008 +0000 wireless: Add channel/frequency conversions to ieee80211.h Added mappings for FHSS, DSSS and OFDM channels - with macros to point HR DSSS and ERP to the DSSS mappings. Currently just static inline functions. Use the new functions in the older fullmac drivers. This eliminates a number of const static buffers and removes a couple of range checks that are now redundant. Signed-off-by: David Kilroy Acked-by: Arnaldo Carvalho de Melo Acked-by: Richard Farina Acked-by: Jeroen Vreeken Signed-off-by: John W. Linville commit eaee7cc2c180c291084a1c1f49cd2bf13002b3e1 Author: Nick Kossifidis Date: Mon Dec 22 12:35:55 2008 +0200 ath5k: More EEPROM code updates * Don't scale power values on RF5111 EEPROMs because they get out of bounds (power is u8, so multiplying power by 50 is too much and there is no reason to do so -we don't do it on other chips anyway-). HAL does it as a technique to handle 0.5 dbm steps but i believe it's not the right thing to do and certainly not the right place to do it. We 'll work this out on interpolation code for all chips (0.5 or 0.25 steps etc) in a generic way. Signed-Off-by: Nick Kossifidis Signed-off-by: John W. Linville commit b306b82c58069159791df5a377a1f1f49b42c4d3 Author: Winkler, Tomas Date: Mon Dec 22 11:31:21 2008 +0800 iwlwifi: kill retry_rate sysfs for iwlagn This patch kills retry_rate in sysfs for iwlagn. It's not used. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 2ddfa129bbf3dca708ffb0eb29d08de32cacd547 Author: Winkler, Tomas Date: Mon Dec 22 11:31:20 2008 +0800 iwlwifi: move sysfs status entry to debugfs This patch moves priv->status sysfs entry to debugfs. It is for debugging only anyway. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 29701e5abf155d76fc8ab785a172c4ccf6cf47ee Author: Christian Lamparter Date: Sun Dec 21 22:52:10 2008 +0100 p54: enable proper frame injection This patch enables frame injection in monitor mode for all p54 devices. As a result, any user can finally use the aircrack-ng suite out of the box. e.g: aireplay-ng --test wlan0 Trying broadcast probe requests... Injection is working! Found 1 AP Trying directed probe requests... XX:XX:XX:XX:XX:XX - channel: i - 'SSID' Ping (min/avg/max): 1.536ms/3.193ms/4.377ms Power: 193.00 30/30: 100% Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit a15bd00543a859a72546e4b09342b70e79e9ef1e Author: Christian Lamparter Date: Sun Dec 21 20:54:34 2008 +0100 p54: label queues with their corresponding names This patch introduce new shiny named labels for our 8 (4 - on old firmware) queues. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 0ea9c00c9d4e6309637a2defe18d26b6cda0fdc0 Author: Nick Kossifidis Date: Sun Dec 21 04:47:39 2008 +0200 ath5k: Update EEPROM code *Read misc2...6 values from eeprom since we want to use them (fixes wrong power calibration info offset on RF2413+ chips) *Initialize num_piers to 0 for RF2413 chips (note that we read 2GHz frequency piers while reading mode sections, we have to ignore them -usualy they are 0xff anyway but during my tests i got a 1 on b mode with no data- and use the newer eemap. *Add some more comments (please forgive my poor English ;-( ) and some minor code cleanup *Tested on 2425 and 2112 and has the same data with ath_info (i wrote some debug code on debug.c to print everything like ath_info but i haven't tested it yet on 5111 and it's full of > 80 col lines, if anyone wants to play with it let me know). Signed-Off-by: Nick Kossifidis Acked-by: Felix Fietkau Signed-off-by: John W. Linville commit 754be3098b22d1bea9620b40fe2f9f2286c55101 Author: Ivo van Doorn Date: Sat Dec 20 11:00:49 2008 +0100 rt2x00: Release rt2x00 2.3.0 Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit b30dd5c043eda4b3d23659ef550c16ce4f6ecb47 Author: Ivo van Doorn Date: Sat Dec 20 10:59:55 2008 +0100 rt2x00: Introduce RXDONE_SIGNAL_MASK mask Improve error message reporting when a frame was received with unknown rate. Instead of using the boolean check if the frame is supposed to be a PLCP value or not, we should add a new mask (RXDONE_SIGNAL_MASK) which returns the type identification for a signal value (i.e. PLCP). At the moment we only have 2 different types, but more will arrive when support for 11n is added. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 2bdb35c7ffb61f4b9d963dd447a2c54add5f02c5 Author: Ivo van Doorn Date: Sat Dec 20 10:59:29 2008 +0100 rt2x00: Allow drivers to pass the noise value during rxdone Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 076f9582a6b82e54339ee815130315744b730787 Author: Ivo van Doorn Date: Sat Dec 20 10:59:02 2008 +0100 rt2x00: Remove ENTRY_TXD_OFDM_RATE The flag ENTRY_TXD_OFDM_RATE isn't flexible enough to indicate which rate modulation should be used for a frame. This will become a problem when 11n support is added. Remove the flag and replace it with an enum value which can better indicate the exact rate modulation. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 7b40982e235d6ff9343d38703eb48a0143afcc26 Author: Ivo van Doorn Date: Sat Dec 20 10:58:33 2008 +0100 rt2x00: Move code into seperate functions Some functions have grown rapidly in size over the last time, some of those functions (like the rt2x00queue_create_tx_descriptor) will further increase in size soon, so it is best to start cutting it into logical pieces. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 91581b627287d8cc3ee382ee038e04c4beca8176 Author: Ivo van Doorn Date: Sat Dec 20 10:57:47 2008 +0100 rt2x00: Split EEPROM_NIC_TX_RX_FIXED The 2 bits in EEPROM_NIC_TX_RX_FIXED each influence a different antenna. We might as well split the definition and directly read the correct bit. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit ce292a640228fded0d2e232216a19cba33e2cd0f Author: Ivo van Doorn Date: Sat Dec 20 10:57:02 2008 +0100 rt2x00: Implement WDS support WDS support should be very easy to handle, mac80211 handles everything for us, so all that is needed is to set the support flags and handle it in the add_interface() callback. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 3f787bd6d596ff56625f440910944ef6f937af8d Author: Ivo van Doorn Date: Sat Dec 20 10:56:36 2008 +0100 rt2x00: Rename CONFIG_CRYPTO_COPY_IV CONFIG_CRYPTO_COPY_IV is a bad name since it is part of the driver requirements instead of a configuration option. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 7396faf4f3228b88c6c815c7a93081b456716d5f Author: Ivo van Doorn Date: Sat Dec 20 10:55:57 2008 +0100 rt2x00: Add RFKILL support to rt2500usb and rt73usb Some very rare Ralink USB hardware exists which features the RFKILL switch on the USB stick. This patch adds the EEPROM check function to see if RFKILL is supported and the polling function to rt2500usb and rt73usb in order to support RFKILL for that hardware. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit a07dbea210e146aedf8929cdabe082b58696260c Author: Andrey Yurovsky Date: Sat Dec 20 10:55:34 2008 +0100 rt2x00: Add mesh support This adds initial support for Mesh Point mode. For this we tell mac80211 that we support NL80211_IFTYPE_MESH_POINT. We also need to send beacons. mac80211 will configure our RX filter accordingly. Signed-off-by: Andrey Yurovsky Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 5352ff6510422d9a9bf13b7272f865eb53247f4d Author: Ivo van Doorn Date: Sat Dec 20 10:54:54 2008 +0100 rt2x00: Restrict interface between rt2x00link and drivers Restrict drivers to only access link_qual structure during link tuning. The contents of these fields are for the drivers and all fields are allowed to be changed to values the driver considers correct. This means that some fields need to be moved outside of this structure to restrict access only to rt2x00link itself. This allows some code to be moved outside of the rt2x00.h header and into rt2x00link.c. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit eb20b4e8a6998ca68d9ac0963ee36a1a36fe241d Author: Ivo van Doorn Date: Sat Dec 20 10:54:22 2008 +0100 rt2x00: Reduce calls to bbp_read() The link_tuner() function will always call bbp_read() at the start of the function. Because this is an indirect register access has some costs attached to it (especially for USB hardware). We already store the value read from the register into the vgc_level value inside the link structure. Instead of reading from the register we can read that field directly and base the tuner on that value. This reduces the time the registers are locked with the csr_mutex and speeds up the link_tuner processing. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 84e3196ff867c623056eea02c11a45e046490d89 Author: Ivo van Doorn Date: Sat Dec 20 10:53:29 2008 +0100 rt2x00: Move link tuning into seperate file Move link and antenna tuning into a seperate file named rt2x00link.c, this makes the interface to the link tuner a lot cleaner. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 7d7f19ccb777946df0a8fb7c83189ba2ae08b02e Author: Ivo van Doorn Date: Sat Dec 20 10:52:42 2008 +0100 rt2x00: Implement Powersaving Listen to IEEE80211_CONF_PS to determine if the device should drop into powersaving mode. This feature depends on the dynamic power save functionality in mac80211. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 3ebbbb56a162b8f9b9a77bc7810b9d4e0868e039 Author: Michael Buesch Date: Fri Dec 19 22:51:57 2008 +0100 b43: Use 64bit atomic register access for TSF On modern b43 devices with core rev >=3, the hardware guarantees us an atomic 64bit read/write of the TSF, if we access the lower 32bits first. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit e808e586b77a10949e209f8a00cb8bf27e51df12 Author: Michael Buesch Date: Fri Dec 19 21:30:52 2008 +0100 b43: Fixup set_key handling This fixes the key handling for mac80211's new key->flags. It also adds TX locking to the set_key handler and adds a comment why this is required. This doesn't fix any known bugs. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit b98b7b347eed333d6fa2f74770beb8106e576cc6 Author: Herton Ronaldo Krzesinski Date: Thu Jan 29 13:18:31 2009 -0200 ALSA: hda - make alc882_auto_init_input_src aware of selectors In the case of having a selector instead of mixer while initing input sources, the case that happens with ALC889, we must select instead of muting input. Problem was found while testing with hda-emu. Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Takashi Iwai commit 7393958f630ac91e591e62058f2bdb61523ec60c Author: Peter Ujfalusi Date: Thu Jan 29 14:57:50 2009 +0200 ASoC: TWL4030: Add analog loopback support This patch adds the analog loopback/bypass support for twl4030 codec. Details for the implementation: It seams that the analog loopback needs the DAC powered on on the channel, where the loopback is selected. The switch for the DACs has been moved from the DAPM_DAC to the "Analog XX Playback Mixer". In this way the DAC will be powered while the audio playback is used or/and the loopback is enabled for the channel. The twl4030 codec powering has been reworked. Now the codec will be powered as long as it does not receives the SND_SOC_BIAS_OFF event. The exceptions are when the given change in the registers needs the codec power down/up cycle in order to take effect. Otherwise the codec is on. When the codec enters to STANDBY state and none of the loopback paths are enabled, than the amplifiers, which are no in the DAPM path are forced to turn off and the PLL is disabled. When playback/capture starts the disabled gains are restored and the PLL is enabled. When one of the loopback enabled in STANDBY mode, the disabled gains are restored and the PLL is enabled also. In short: the codec always goes to the lowest power state based on the bias_level and the bypass_state. Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown commit 0bf5460de96aa66abf9350333ee6711e73b3b31e Merge: 67fcdea... ef390c0... Author: Mark Brown Date: Thu Jan 29 13:57:59 2009 +0000 Merge branch 'for-2.6.29' into for-2.6.30 commit 9e128fddcc589db4e7d9e8328f656ae4a21a2808 Author: Takashi Iwai Date: Thu Jan 29 11:49:10 2009 +0100 ALSA: Add missing description of snd-cmi8330 module parameters Signed-off-by: Takashi Iwai commit c97dff84e0d9a4e0b7048e033d33511e3897c859 Author: Krzysztof Helt Date: Thu Jan 29 11:48:14 2009 +0100 ALSA: cmi8330: add MPU-401 support Add MPU-401 port support for the chip. Also, update some error messages and description. Signed-off-by: Takashi Iwai commit 0a898e6e500ec8ab98000896fe243c4c0e91c72a Author: Krzysztof Helt Date: Thu Jan 29 11:46:45 2009 +0100 ALSA: gus: update debug messages Convert some of them to snd_printdd() and update arguments to make them compilable. Signed-off-by: Takashi Iwai commit 56305757f0b64b7d5dd02fd54c6dfc0989868f31 Author: Krzysztof Helt Date: Thu Jan 29 11:44:24 2009 +0100 ALSA: sscape: update Kconfig description about SoundScape cards The SoundScape driver handles more cards then described. Signed-off-by: Takashi Iwai commit c161e40f45d32b48f8facbee17720e708607002f Author: Paul Mundt Date: Thu Jan 29 18:11:25 2009 +0900 sh: Don't enable GENERIC_TIME for the CMT clockevent driver yet. GENERIC_TIME still depends on the clocksource bits being there, which is presently not supported. This allows the CMT clockevent driver to be used alongside alternate system timers that do not yet provide a clocksource of their own (MTU2 and so on in the case of SH-2A). Signed-off-by: Paul Mundt commit d63f3a5857906851b9c1a39e3871a97f4acc1005 Author: Paul Mundt Date: Thu Jan 29 18:10:13 2009 +0900 sh: Fix up MTU2 support for SH7203. Signed-off-by: Paul Mundt commit f5ad881b425616741bf8696f70b2749abe54a936 Author: Paul Mundt Date: Thu Jan 29 18:08:58 2009 +0900 sh: Use SYS_SUPPORTS_CMT for managing CMT timer dependencies. Signed-off-by: Paul Mundt commit 424f59d04d7450555ef2bf1eb4a5e2cd2ecf08cd Author: Magnus Damm Date: Thu Jan 22 09:56:09 2009 +0000 sh: CMT platform data for sh7723/sh7722/sh7366/sh7343 CMT platform data for SuperH Mobile sh7723/sh7722/sh7343/sh7366. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 3fb1b6ad0679ad671bd496712b2a088550ee86b2 Author: Magnus Damm Date: Thu Jan 22 09:55:59 2009 +0000 sh: CMT clockevent platform driver SuperH CMT clockevent driver. Both 16-bit and 32-bit CMT versions are supported, but only 32-bit is tested. This driver contains support for both clockevents and clocksources, but no unregistration is supported at this point. Works fine as clock source and/or event in periodic or oneshot mode. Tested on sh7722 and sh7723, but should work with any cpu/architecture. This version is lacking clocksource and early platform driver support for now - this to minimize the amount of dependencies. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 07821d3310996746a2cf1e9c705ffe64223d1112 Author: Magnus Damm Date: Thu Jan 22 09:55:49 2009 +0000 sh: fix no sys_timer case Handle the case with a sys_timer set to NULL. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 70f0800133b2a6d694c10908b8673a5327b3bfd6 Author: Magnus Damm Date: Thu Jan 22 09:55:40 2009 +0000 sh: tmu disable support Add TMU disable support so we can use other clockevents. Also, setup the clockevent rating. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 955c0778723501cc16fec40501cd54b7e72d3e74 Author: Magnus Damm Date: Thu Jan 22 09:55:31 2009 +0000 sh: rework clocksource and sched_clock Rework and simplify the sched_clock and clocksource code. Instead of registering the clocksource in a shared file we move it into the tmu driver. Also, add code to handle sched_clock in the case of no clocksource. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit b833b5ec0411adc2255053a0e0ec536d97e5784e Author: Thadeu Lima de Souza Cascardo Date: Wed Jan 28 18:20:06 2009 -0200 ALSA: AC97: Fix function name type in comment s/updat/update/ Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Takashi Iwai commit 328cc6dfaadad614449eca1c75559e64c5054fea Author: Thadeu Lima de Souza Cascardo Date: Wed Jan 28 15:39:22 2009 -0200 ALSA: AC97: Print AC97 flags in proc file to make debug it easier While debugging some code paths in AC97 codec patches and its suspend and resume functions, getting to know the flags has proved useful to follow those code paths. Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Takashi Iwai commit dc66ff6220f0a6c938df41add526d645852d9a75 Author: Roel Kluin Date: Thu Jan 22 15:16:14 2009 +0000 SH: fix start_thread and user_stack_pointer macros Fix macros start_thread and user_stack_pointer. When these macros aren't called with a variable named regs as second argument, this will result in a build failure. Signed-off-by: Roel Kluin Signed-off-by: Paul Mundt commit bdc54625b650bfeeb8225a2a5103a3685423e43c Author: David Woodhouse Date: Thu Jan 29 14:37:20 2009 +1100 solos: Remove debugging, commented-out test code Signed-off-by: David Woodhouse commit 35c2221ba1093af77cc2164d5785a88f08a9fc57 Author: David Woodhouse Date: Thu Jan 29 14:08:27 2009 +1100 solos: Clean up handling of card->tx_mask a little Signed-off-by: David Woodhouse commit 84fdf6cda30df72994baa2496da86787fb44cbb4 Author: Matt Fleming Date: Tue Jan 20 21:14:38 2009 +0000 sh: Use the atomic_t "counter" member Now that atomic_t is a generic opaque type for all architectures, it is unwise to use intimate knowledge of its internals when manipulating it. Instead of relying on the "counter" member being at offset 0 from the beginning of an atomic_t, explicitly reference the member. This guards us from any changes to the layout of the beginning of the atomic_t type. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit 42990701f938b9318e46102d9919ceb28e5b0e6d Author: Matt Fleming Date: Tue Jan 20 21:14:37 2009 +0000 sh: Relax inline assembly constraints When dereferencing the memory address contained in a register and modifying the value at that memory address, the register should not be listed in the inline asm outputs. The value at the memory address is an output (which is taken care of with the "memory" clobber), not the register. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit e4e3c3f17fdb78282e3d9b4af7ec90d6e65798eb Merge: ae5e6d0... c20f326... Author: Paul Mundt Date: Thu Jan 29 11:56:45 2009 +0900 Merge branch 'sh/stable-updates' commit c6428e52facd03dfac971a44abca4bc058104fec Author: David Woodhouse Date: Thu Jan 29 12:17:09 2009 +1100 solos: Fix various bugs in status packet handling Signed-off-by: David Woodhouse commit a0641cc49a1d1436b3591a9aa4be8159f84b662c Author: David Woodhouse Date: Thu Jan 29 11:31:28 2009 +1100 solos: Remove superfluous wait_queue_head_t from struct solos_param Signed-off-by: David Woodhouse commit fcd82664cb421b043f97ad194a7eda3592e0349e Author: David Woodhouse Date: Thu Jan 29 11:29:12 2009 +1100 solos: Remove IRQF_DISABLED, don't frob IRQ enable on the FPGA in solos_irq() Neither of these are necessary. Signed-off-by: David Woodhouse commit cd2169fbfb39e6fc2fb9055ed2eedaa68f53c734 Author: David Woodhouse Date: Thu Jan 29 11:12:58 2009 +1100 solos: Remove unused loopback debug stuff Signed-off-by: David Woodhouse commit f69e417033af84316c3ed7cafabd388b3ae85952 Author: David Woodhouse Date: Thu Jan 29 11:10:58 2009 +1100 solos: Tidy up tx_mask handling for ports which need TX Signed-off-by: David Woodhouse commit eaf83e39355a0a8933a003fa3b27b37d19901d64 Author: David Woodhouse Date: Thu Jan 29 10:51:11 2009 +1100 solos: Tidy up DMA handling a little. Still untested Signed-off-by: David Woodhouse commit 270b8b85134c299799dddec624ceeb5671330131 Author: Moni Shoua Date: Wed Jan 28 15:15:56 2009 -0800 IB/mthca: Fix dispatch of IB_EVENT_LID_CHANGE event When snooping a PortInfo MAD, its client_reregister bit is checked. If the bit is ON then a CLIENT_REREGISTER event is dispatched, otherwise a LID_CHANGE event is dispatched. This way of decision ignores the cases where the MAD changes the LID along with an instruction to reregister (so a necessary LID_CHANGE event won't be dispatched) or the MAD is neither of these (and an unnecessary LID_CHANGE event will be dispatched). This causes problems at least with IPoIB, which will do a "light" flush on reregister, rather than the "heavy" flush required due to a LID change. Fix this by dispatching a CLIENT_REREGISTER event if the client_reregister bit is set, but also compare the LID in the MAD to the current LID. If and only if they are not identical then a LID_CHANGE event is dispatched. Signed-off-by: Moni Shoua Signed-off-by: Jack Morgenstein Signed-off-by: Yossi Etigin Signed-off-by: Roland Dreier commit f0f6f346a1edaec23b990c25f53478669e56fa70 Author: Moni Shoua Date: Wed Jan 28 14:54:35 2009 -0800 IB/mlx4: Fix dispatch of IB_EVENT_LID_CHANGE event When snooping a PortInfo MAD, its client_reregister bit is checked. If the bit is ON then a CLIENT_REREGISTER event is dispatched, otherwise a LID_CHANGE event is dispatched. This way of decision ignores the cases where the MAD changes the LID along with an instruction to reregister (so a necessary LID_CHANGE event won't be dispatched) or the MAD is neither of these (and an unnecessary LID_CHANGE event will be dispatched). This causes problems at least with IPoIB, which will do a "light" flush on reregister, rather than the "heavy" flush required due to a LID change. Fix this by dispatching a CLIENT_REREGISTER event if the client_reregister bit is set, but also compare the LID in the MAD to the current LID. If and only if they are not identical then a LID_CHANGE event is dispatched. Signed-off-by: Moni Shoua Signed-off-by: Jack Morgenstein Signed-off-by: Yossi Etigin Signed-off-by: Roland Dreier commit 61b9b9b109217b2bfb128c3ca24d8f8c839a425f Author: Herton Ronaldo Krzesinski Date: Wed Jan 28 09:16:33 2009 -0200 ALSA: hda - Consider additional capture source/selector in ALC889 Currently code for capture source support in ALC889 only considers capture mixers. This change adds additional support for ADC+selector present in ALC889, taking into account also the presence of an additional DMIC connection item in the selector. Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Takashi Iwai commit e167280070cccd2e0cde94f73ded0a4b08bf6412 Author: Takashi Iwai Date: Wed Jan 28 16:05:16 2009 +0100 ALSA: intel8x0 - Fix build with CONFIG_SND_AC97_POWERSAVE=n Signed-off-by: Takashi Iwai commit e3e9c5e7096f6379ca8fa78413b2055fa29f4530 Author: Thadeu Lima de Souza Cascardo Date: Wed Jan 28 12:40:42 2009 -0200 ALSA: Don't cold reset AC97 codecs in some ICH chipsets Check in a quirk list if it should do cold reset when AC97 power saving is enabled. Some devices do not resume properly when cold reset, although power saving works OK. Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Takashi Iwai commit a5f7c47391ca15c3e2f8e2aa46fb089408541bcd Author: Takashi Iwai Date: Wed Jan 28 09:02:52 2009 +0100 ALSA: enable build of snd-msnd-* drivers Added the missing msnd directory to Makefile. Signed-off-by: Takashi Iwai commit c96330b083ce88b9fea428df99b4631f1b6410ef Author: Takashi Iwai Date: Wed Jan 28 08:23:03 2009 +0100 ALSA: Add description of new snd-msnd-* drivers Signed-off-by: Takashi Iwai commit 67fcdead3c7424d51e7108c220c9ab1a5e752ed3 Merge: 006f367e... b1a0aac... Author: Takashi Iwai Date: Wed Jan 28 08:08:32 2009 +0100 Merge branch 'topic/snd_card_new-err' into topic/asoc Conflicts: sound/soc/soc-core.c commit f6c6383502751ceb6f2f3579ad22578ca44f91f5 Author: Krzysztof Helt Date: Sat Jan 24 13:35:28 2009 +0100 ALSA: Turtle Beach Multisound Classic/Pinnacle driver This is driver for Turtle Beach Multisound cards: Classic, Fiji and Pinnacle. Tested pcm playback and recording and MIDI playback on Multisound Pinnacle. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 909372317e67bdbbfced5dab3ade3437e3f2b254 Author: David Woodhouse Date: Wed Jan 28 16:46:56 2009 +1100 solos: First attempt at DMA support Signed-off-by: David Woodhouse commit c0fe30265a1fe3a69e0ce0d08b49de1dda9c1190 Author: David Woodhouse Date: Wed Jan 28 14:34:34 2009 +1100 solos: Remove parameter group from sysfs on ATM dev deregister Signed-off-by: David Woodhouse commit 7019298a2a5058c4e324494d6c8d0598214c28f4 Author: David S. Miller Date: Tue Jan 27 16:34:47 2009 -0800 net: Get rid of by-hand TX queue hashing. We now only TX hash on pre-computed SKB properties. The thinking is: 1) High performance routing and firewalling setups will have a multiqueue capable card used for receive, and therefore would have RX queue recordings made into the SKB which can be used for the TX side hash. 2) Locally generated packets will have an attached socket and thus a valid sk->sk_hash to make use of. Signed-off-by: David S. Miller commit f7105d63940899ece79bda024f668e6c761cfebf Author: David S. Miller Date: Tue Jan 27 16:27:48 2009 -0800 net: If SKB has attached socket, use socket's hash for TX queue selection. Signed-off-by: David S. Miller commit 0c8dfc830aadd978e461dad66c33741b71c6a0be Author: David S. Miller Date: Tue Jan 27 16:22:32 2009 -0800 net: Add skb_record_rx_queue() calls to multiqueue capable drivers. Signed-off-by: David S. Miller commit d5a9e24afb4ab38110ebb777588ea0bd0eacbd0a Author: David S. Miller Date: Tue Jan 27 16:22:11 2009 -0800 net: Allow RX queue selection to seed TX queue hashing. The idea is that drivers which implement multiqueue RX pre-seed the SKB by recording the RX queue selected by the hardware. If such a seed is found on TX, we'll use that to select the outgoing TX queue. This helps get more consistent load balancing on router and firewall loads. Signed-off-by: David S. Miller commit 3456b22111be920e15e6999b15d2f402a48e775d Author: David Woodhouse Date: Wed Jan 28 10:39:23 2009 +1100 solos: Fix under-allocation of skb size for get/set parameters Signed-off-by: David Woodhouse commit af7806560c972b5b8c79e9704d7816813343cbc1 Author: David Woodhouse Date: Wed Jan 28 10:22:57 2009 +1100 solos: Add SNR and Attn to status packet, fix oops on load Signed-off-by: David Woodhouse commit b28a4b9a38b9d75caceb4f554bfdbb7a413b2ad0 Author: David Woodhouse Date: Tue Jan 27 21:50:36 2009 +1100 solos: Reject non-AAL5 connections.... for now Signed-off-by: David Woodhouse commit 1e615df654ef00a6354f32be08a8fb6a395b2ef1 Author: David Woodhouse Date: Tue Jan 27 21:47:47 2009 +1100 solos: Kill existing connections on link down event Signed-off-by: David Woodhouse commit 006f367e38fb45e2f161c0f500c74449ae63e866 Author: Peter Ujfalusi Date: Tue Jan 27 11:29:43 2009 +0200 ASoC: TWL4030: Move the twl4030_power_up and _power_down function Move the twl4030_power_up and twl4030_power_down function earlier to facilitate the analog bypass implementation. Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown commit fb2a2f84908460c18c3894963990518b224dd9ff Author: Peter Ujfalusi Date: Tue Jan 27 11:29:42 2009 +0200 ASoC: TWL4030: Physical ADC and amplifier power switch change Change the power switches for the physical ADC and for the amplifiers for the analog capture path to map more closely the actual path inside of the codec. Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown commit aad749e51a66d473f5cef4a050e3e36795261be3 Author: Peter Ujfalusi Date: Tue Jan 27 11:29:41 2009 +0200 ASoC: TWL4030: Enable Headset Left anti-pop/bias ramp only if the Headset Left is in use The Headset Left anti-pop and bias ramp does not need to be enabled, if the headset is not in use. Move the code to DAPM event handler for HeadsetL. Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown commit db04e2c58a65364218b89f1372b4b3b78d206423 Author: Peter Ujfalusi Date: Tue Jan 27 11:29:40 2009 +0200 ASoC: TWL4030: Code clean up for codec power up and down Merge the codec up and down functions to a simple one. Codec is powered down by default (reg_cache change). Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown commit 3fc93030e5a792fdd0da3321487f5cbfd1143c2b Author: Peter Ujfalusi Date: Tue Jan 27 11:29:39 2009 +0200 ASoC: TWL4030: Syncronize the reg_cache for ANAMICL after the offset cancelation The offset cancelation bit in ANAMICL register is self cleanig. Make sure that the reg_cache holds the same value as the HW register. Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown commit b9d710b3c530ed91e8683933fe94c7605d175bf5 Author: Andreas Bergmeier Date: Sat Jan 24 12:15:14 2009 +0100 ALSA: usbaudio - use printf format instead of hardcoding it Rather use printf format instead of hardcoding prefix like 0x. A next step would be to predefine certain formats. Signed-off-by: Andreas Bergmeier Signed-off-by: Takashi Iwai commit 6627a653bceb3a54e55e5cdc478ec5b8d5c9cc44 Author: Mark Brown Date: Fri Jan 23 22:55:23 2009 +0000 ASoC: Push the codec runtime storage into the card structure This is a further stage on the road to refactoring away the ASoC platform device. Signed-off-by: Mark Brown commit 87ebb18627930ce005beba227ca267b5b5372e06 Author: David Woodhouse Date: Tue Jan 27 20:02:30 2009 +1100 solos: Handle new line status change packets, hook up to ATM layer info Signed-off-by: David Woodhouse commit a73efd0a8552927ebe5dff84936f7fdac4f7e314 Author: Divy Le Ray Date: Mon Jan 26 22:22:19 2009 -0800 iw_cxgb3: handle chip reset notifications Freeze activity when notified that the underlying chip is getting reset on a EEH event or fatal error. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit cb0bc205959bf8c60acae9c71f3da0597e756f8e Author: Divy Le Ray Date: Mon Jan 26 22:21:59 2009 -0800 cxgb3: Notify fatal errors Set up a notification mechanism to inform upper layer modules (iWARP, iSCSI) of a chip reset due to an EEH event or a fatal error. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit d057f0a4efe441842adb2d263e50173b7e0e7e38 Author: David Woodhouse Date: Tue Jan 27 16:52:07 2009 +1100 solos: Add initial list of parameters I don't much like the trick with multiple inclusions of solos-attrlist.c but don't really see a saner way to do it without repeating the list. Signed-off-by: David Woodhouse commit ae5e6d05a606e05e054f816bd01e02f69d38d283 Author: Paul Mundt Date: Wed Jan 7 17:16:25 2009 +0900 sh: mach-highlander and mach-rsk require gpiolib. Fix up the build for mach-highlander and mach-rsk. These operated on the assumption that GENERIC_GPIO support with an optional GPIOLIB was possible. This used to be true, but has not been the case since commit-id d56cc8bc661ac1ceded8d45ba2d53bb134fee17d ("sh: use gpiolib"), where the GENERIC_GPIO implementation was rewritten to use GPIOLIB directly. Signed-off-by: Paul Mundt commit 57e97cb8bedd06e8a2e562454423d58aab5827ce Author: Paul Mundt Date: Tue Jan 6 12:47:12 2009 +0900 sh: Fix up GENERIC_GPIO build for ARCH_WANT_OPTIONAL_GPIO cases. CPUs define pinmux tables through the optional interface, while boards that require demux of their own require it explicitly. Roll the Makefile rules back to depend on GENERIC_GPIO, which covers both cases. Fixes a link error with an undefined reference to register_pinmux() on optional platforms. Signed-off-by: Paul Mundt commit 69edbba0021a48fe034849501513930f6175cb5d Author: Magnus Damm Date: Thu Dec 25 18:17:34 2008 +0900 sh: use gpiolib This patch updates the SuperH gpio code to make use of gpiolib. The gpiolib callbacks get() and set() are lockless, but we use our own spinlock for the other operations to make sure hardware register bitfield accesses stay atomic. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 3292094e88ce6b76714dad8ec4b43d7c5c12ada2 Author: Magnus Damm Date: Thu Dec 25 18:17:26 2008 +0900 sh: lockless gpio_set_value() This patch optimizes the gpio data register handling for gpio_set_value(). Instead of using the good old spinlock-plus-read-modify-write strategy we now use a shadow register and atomic operations. This improves the bitbanging mmc performance on Migo-R from 26 Kbytes/s to 40 Kbytes/s. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 0fc64cc0a27288e77ee8e12648d59632649371fc Author: Magnus Damm Date: Thu Dec 25 18:17:18 2008 +0900 sh: lockless gpio_get_value() This patch separates the register read and write functions to allow lockless gpio_get_value(). Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 18801be7f805b891876a6676ec7fac2e1acdec13 Author: Magnus Damm Date: Thu Dec 25 18:17:09 2008 +0900 sh: make gpio_get/set_value() O(1) This patch modifies the table based SuperH gpio implementation to make use of direct table lookups. With this change the functions gpio_get_value() and gpio_set_value() are O(1). Tested on Migo-R using bitbanging mmc. Performance is improved from 11 KBytes/s to 26 Kbytes/s. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 1373c0fdbc5b477f5597a3ca9f2c782f15b56886 Author: Steve Glendinning Date: Mon Jan 26 21:33:16 2009 -0800 smsc911x: leave RX_STOP interrupt permanently enabled smsc911x_set_multicast_list currently performs the only non-atomic read-modify-write of INT_EN. This patch permanently enables the RXSTOP_INT interrupt, and changes the ISR to only conditionally run the multicast filter workaround code. Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit a528079e01aa9cf6cddc852d5ab5cf4908974745 Author: Magnus Damm Date: Mon Jan 26 21:32:25 2009 -0800 smc91x: struct net_device_ops Convert the smc91x driver to use struct net_device_ops. Signed-off-by: Magnus Damm Signed-off-by: David S. Miller commit 01e2ffac7dbc0700c972eb38619870034a0b3418 Author: David Woodhouse Date: Tue Jan 27 16:20:04 2009 +1100 solos: Handle attribute show/store in kernel more sanely There are still a _lot_ of attributes, but for at least the basic ones we want to be able to get/set them from the kernel. Especially the ones we want to inform the ATM core about (link state, speed). Signed-off-by: David Woodhouse commit db1d7bf70f42124f73675fca62fe32f3ab1111b4 Author: Kay Sievers Date: Mon Jan 26 21:12:58 2009 -0800 net: struct device - replace bus_id with dev_name(), dev_set_name() Signed-off-by: Kay Sievers Acked-by: Greg Kroah-Hartman Signed-off-by: David S. Miller commit 3617aa485c7394e20fdaf356b1b78516fcaaa0d1 Author: Cyrill Gorcunov Date: Mon Jan 26 21:11:02 2009 -0800 net: pppoe - stop using proc internals Alexey Dobriyan pointed that using PDE_NET outside the proc code is plain bogus (thanks Alexey!). Fix it. Signed-off-by: Cyrill Gorcunov Signed-off-by: David S. Miller commit cbec6605cf0fd5080f03eb787c95c1ecd660421f Author: Alexey Dobriyan Date: Mon Jan 26 21:10:08 2009 -0800 pppol2tp: stop using proc internals PDE_NET usage in driver code is a sign and, indeed, switching to seq_open_net/seq_release_net saves code and fixes bogus things, like user triggerabble BUG_ON(!net) after maybe_get_net, and NULLifying ->private. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 9a3b7a42bb2919a6282a96a5f4abe0f9be36c4b3 Author: remi.denis-courmont@nokia Date: Fri Jan 23 03:00:30 2009 +0000 Phonet: use per-namespace devices list Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit 6530e0fee1834fab51720769ac422186de2b3120 Author: remi.denis-courmont@nokia Date: Fri Jan 23 03:00:29 2009 +0000 Phonet: remove useless locking in device cleanup Incoming packets and sockets are already gone. The netdevice notifier is unregistered under the RTNL lock There remains a race with the rtnetlink handlers unregistration, but it is a generic RTNL issue that was already present before this change. Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit 660f706d931d4795d341805e083a8091af74fa88 Author: remi.denis-courmont@nokia Date: Fri Jan 23 03:00:28 2009 +0000 Phonet: handle rtnetlink registration failure Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit 76e02cf6945e6faa9f6b546dc0513512197c5966 Author: remi.denis-courmont@nokia Date: Fri Jan 23 03:00:27 2009 +0000 Phonet: allow phonet_device_init() to fail, put it to __init section Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit 4b8f704bea70a2c8719e47f53197678a87a0c62f Author: remi.denis-courmont@nokia Date: Fri Jan 23 03:00:26 2009 +0000 Phonet: check destination before delivering packets locally Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit 5075138d67ac66adab777163907d92d1a955ff50 Author: remi.denis-courmont@nokia Date: Fri Jan 23 03:00:25 2009 +0000 Phonet: move to Networking options like other protocol stacks Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit 1e336d0fc99f159ed636ffb9128bc84e09ccc279 Author: Don Skidmore Date: Mon Jan 26 20:57:51 2009 -0800 ixgbe: add support KX/KX4 device And support for the KX/KX4 mezzanine card. Device id 0x10B6. Signed-off-by: Don Skidmore Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 5b9c3cdd55ba57a25ae586373aaff723d8150085 Author: Don Skidmore Date: Mon Jan 26 20:57:17 2009 -0800 ixgbe: fix slow load times on 82598 nics Load times for NICs that use i2c to communicate with the phy were taking ~4.5 sec per port. This fix first checks to see if the link is already up before calling get_link_capabilities, since if it is we don't need query the phy for link state. Signed-off-by: Don Skidmore Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit afcf12422ec8236dc8b9238fef7a475876eea8da Author: Timo Teras Date: Mon Jan 26 20:56:10 2009 -0800 gre: optimize hash lookup Instead of keeping candidate tunnel device from all categories, keep only one candidate with best score. This optimizes stack usage and speeds up exit code. Signed-off-by: Timo Teras Signed-off-by: David S. Miller commit 316bea79369334d11f8a6e22317a928d94c50ae5 Author: David Woodhouse Date: Tue Jan 27 14:25:16 2009 +1100 solos: Kill global 'opens' count. Signed-off-by: David Woodhouse commit fa755b9f2b03df1e0fa6d01b8949bbc778705973 Author: David Woodhouse Date: Tue Jan 27 14:16:12 2009 +1100 solos: Clean up firmware loading code We no longer try to load firmware while the ATM is up and running. However, this means that we _do_ make init_module() wait for it, and it takes a long time for now (since we're using ultra-conservative code in the FPGA for that too). The inner loop which uses swahb32p() was by Simon Farnsworth. Simon has patches which migrate us to request_firmware_nowait(), for which we'll actually need to take down the ATM devices, do the upgrade, then reregister them. Signed-off-by: David Woodhouse commit 7c4015bdffed7c961b6df46c6326cc65962e6594 Author: Simon Farnsworth Date: Wed Jan 21 20:45:49 2009 +0000 solos: FPGA and firmware update support. This is just a straight pull in of changes, syncing us up to 0.07 from openadsl.sf.net Signed-off-by: Nathan Williams Signed-off-by: Simon Farnsworth Signed-off-by: David Woodhouse commit 4306cad6fe02e2946183ab29e510f94190b8fff3 Author: Simon Farnsworth Date: Mon Jan 19 21:19:29 2009 +0000 solos: Slight debugging improvements Print a message if pskb_expand_head fails. Make atmdebug writable by root, so that you can turn printing of data sent to and received from the card on and off at runtime - useful for tracking corruption. Signed-off-by: Simon Farnsworth Signed-off-by: David Woodhouse commit 3eacdf58c2c0b9507afedfc19108e98b992c31e4 Merge: dd0a251... 5376071... Author: David S. Miller Date: Mon Jan 26 17:43:16 2009 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit b76811af7606b36cb0703f04449c301b9634dcbc Author: David Woodhouse Date: Tue Jan 27 10:18:51 2009 +1100 solos: Fix length header in FPGA transfers The length field shouldn't ever include the size of the header itself. This fixes the problem that some people were seeing with 1500-byte packets. Signed-off-by: David Woodhouse commit 160389c8d21c8139a93191c2e5ca2273f311ed4e Author: Clemens Ladisch Date: Mon Jan 26 08:10:19 2009 +0100 sound: usb-audio: make URB sizes more equal Distribute the packets evenly among the URBs, instead of making all URBs except the last one to have the maximum size. This makes the timing of pointer updates more regular and removes some special cases from the code. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 4d788e040b72d2a46ea3ba726b7fa0b65de06c88 Author: Clemens Ladisch Date: Mon Jan 26 08:09:28 2009 +0100 sound: usb-audio: limit playback queue length Once our URBs contain enough packets, queueing more URBs does not give us any additional underrun protection (as we use double-buffering) but just increases latency unnecessarily. Therefore, we try to limit the queue length to some reasonable value. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit b7eb4a06e9980973755b7e95a6d97fb8decbf8fd Author: Clemens Ladisch Date: Mon Jan 26 08:08:34 2009 +0100 sound: usb-audio: use normal number of frames for no-data URBs When sending a silence URB (before playback has started, or when it is paused), use the number of frames that would be normally sent instead of a single frame so that the rate at which completion interrupts arrive is consistent. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit ca8d33fc9fafe373362d35107f01fba1e73fb966 Author: Matthew Ranostay Date: Mon Jan 26 09:33:52 2009 -0500 ALSA: hda: 92hd71xxx disable unmute support for codecs that don't have input amps Some revisions of the 92hd71xxx codec families don't have input amps on ports 0xa, 0xd and 0xf, so probe the widget caps on port 0xa and check for support, if found run snd_hda_sequence_write_cache() on the stac92hd71xxx_unmute_core_init verb list. Signed-off-by: Matthew Ranostay Signed-off-by: Takashi Iwai commit dd0a251c8e087bca05e8f9a3657078591ae6e12b Author: David S. Miller Date: Sun Jan 25 21:17:25 2009 -0800 com0020: Add missing symbol export for com20020_netdev_ops. Thanks to Stephen Rothwell. Signed-off-by: David S. Miller commit 4811fcb79cee80c683237cfd15ca214e1d78c548 Author: Andy Richter Date: Tue Jan 20 06:14:33 2009 +0000 kmsg: convert claw printk messages claw printks are converted to dev_xxx and pr_xxx macros. Signed-off-by: Andy Richter Signed-off-by: Ursula Braun Signed-off-by: David S. Miller commit 150a7fcc5ccf6ffe4a2280f5a447d104ec77912d Author: Steve Glendinning Date: Sun Jan 25 17:54:46 2009 -0800 smsc95xx: fix function prototype of async callback smsc95xx_async_cmd_callback doesn't currently match usb_complete_t, so there's a cast to force the square peg into the round hole. This patch fixes this properly. Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit 01a1ac472f3cd3e24a5f70597346773115ef4586 Author: Steve Glendinning Date: Sun Jan 25 17:53:58 2009 -0800 smsc95xx: remove unused completion struct Oliver Neukum spotted the useless complete() in our async callback. On closer inspection, the entire completion struct is unused. This patch removes it. Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit 6626bff24578753808c8b5bd4f1619e14e980f0f Author: Thomas Gleixner Date: Sun Jan 25 11:31:36 2009 +0100 hrtimer: prevent negative expiry value after clock_was_set() Impact: prevent false positive WARN_ON() in clockevents_program_event() clock_was_set() changes the base->offset of CLOCK_REALTIME and enforces the reprogramming of the clockevent device to expire timers which are based on CLOCK_REALTIME. If the clock change is large enough then the subtraction of the timer expiry value and base->offset can become negative which triggers the warning in clockevents_program_event(). Check the subtraction result and set a negative value to 0. Signed-off-by: Thomas Gleixner commit 5b74f9e0e005baf12a2df6aaeef7d7134137792b Merge: e3ee1e1... f3b8436... Author: Thomas Gleixner Date: Sun Jan 25 11:54:33 2009 +0100 Merge branch 'linus' into timers/hrtimers commit 0db155de988031f925096a7df1bf9633790a2c18 Author: David S. Miller Date: Fri Jan 23 22:28:48 2009 -0800 com20020: Fix allyesconfig build failure. Reported by Stephen Rothwell. Due to missing 'extern' in the com20020_netdev_ops declaration, each file that includes linux/com20020.h gets another copy defined in it's resulting object file. Signed-off-by: David S. Miller commit 0db4d0705260dd4bddf1e5a5441c58bdf08bdc9f Author: Timur Tabi Date: Fri Jan 23 16:31:19 2009 -0600 ASoC: improve I2C initialization code in CS4270 driver Further improvements in the I2C initialization sequence of the CS4270 driver. All ASoC initialization is now done in the I2C probe function. Signed-off-by: Timur Tabi Signed-off-by: Mark Brown commit 070504ade7a95a0f4395673717f3bb7d41793ca8 Author: Mark Brown Date: Fri Jan 23 15:34:54 2009 +0000 ASoC: Fix L3 bus handling in Kconfig It has no external dependencies but needs to be selected for L3 based codecs to work. Signed-off-by: Mark Brown commit 01e097d6c409a6eb64758dce9fcde0c70073fe36 Author: Mark Brown Date: Fri Jan 23 15:07:45 2009 +0000 ASoC: Include header file in cs4270 and wm9705 Ensures that the DAI and socdev exported by the codec match up with their exported prototype. Signed-off-by: Mark Brown commit 2d663963dd915c1a342a03c820b648bd5f06b6a7 Merge: ef963dc... 43d5080... Author: Mark Brown Date: Fri Jan 23 15:02:08 2009 +0000 Merge branch 'for-2.6.29' into for-2.6.30 commit ef963dcf6879e500e6559b4327f6cbdc4439198e Author: Mark Brown Date: Fri Jan 23 14:53:58 2009 +0000 ASoC: Fix spurious codec driver dependencies Kbuild ignores dependency from things that are themselves selected so ASoC machine drivers need to ensure that the control bus is being built. This also avoids issues where multiple buses are supported by a given codec. Signed-off-by: Mark Brown commit 55aef4508598d59c2baea7e2a3e6dfed415bbfc0 Author: Markus Bollinger Date: Fri Jan 23 14:45:41 2009 +0100 ALSA: pcxhr - add support for gpio ports and minor bug fix - add support for gpio ports (2 GPI, 2 GPO) of pcxhr stereo cards - minor bugfixes : allow setting clock to internal by the mixer even if there is no stream (but monitoring) Signed-off-by: Markus Bollinger Signed-off-by: Takashi Iwai commit 70040c07402ef5a3fad2133daffb7ee61b0d4641 Author: Takashi Iwai Date: Fri Jan 23 14:18:11 2009 +0100 ALSA: hda - Fix wrong initial verb for AD1984 thinkpad model The docking mic-boost (0x25) has no mute bit. Signed-off-by: Takashi Iwai commit 4cfb91c6d764b18e81bfb6e6779e07bcecbb197c Author: Takashi Iwai Date: Fri Jan 23 12:53:09 2009 +0100 ALSA: hda - Fix invalid amp init for ALC268 codec Fix some invalid AMP initializations for ALC268 codecs. Signed-off-by: Takashi Iwai commit a435869cacbb581920df23411416bed533748bf1 Author: Mark Brown Date: Fri Jan 23 11:49:45 2009 +0000 ASoC: Configure SSP port PLL for Zylonite Signed-off-by: Mark Brown commit f6fca2e93c9ad3c704f02aaabe4359a8af16fbbb Author: Mark Brown Date: Fri Jan 23 11:40:26 2009 +0000 ASoC: Remove unneeded e7x0 inclusion of pxa-regs.h and hardware.h pxa-regs.h and hardware.h are not intended for use directly in driver code and references to them have been removed in other code - remove them from the newly added e740 and e750 machine drivers. Signed-off-by: Mark Brown commit 60e388e89c9e258a51a0995ddd9e18fdebcdbe12 Author: Takashi Iwai Date: Fri Jan 23 12:37:09 2009 +0100 ALSA: hda - Fix invalid verbs for mic-boosts on AD1884* The mic-boosts (0x14 and 0x15) on AD1884* codecs are input-amps, not output-amps. Fix the invalid initialization verbs. Signed-off-by: Takashi Iwai commit 19a2d3e9b99ffa264adf1138bd8d8aef8909dca9 Author: Takashi Iwai Date: Fri Jan 23 12:35:25 2009 +0100 ALSA: hda - Remove invalid amp initializations for AD1988* codecs The ADC widgets on AD1988* codecs have no amp controls. Remove invalid initialization verbs. Signed-off-by: Takashi Iwai commit 6d6e17de4f64131e9c976fd524d73aaec268178f Author: Takashi Iwai Date: Fri Jan 23 12:33:54 2009 +0100 ALSA: hda - Fix initial verbs for mic-boosts on AD1981HD The mic boosts (NID 0x08 and 0x18) are input-amps, not output-amps. Fix the initial verbs for them. Signed-off-by: Takashi Iwai commit c91cf25ebfbf3a5b336cbaa46646d37dd3d33127 Author: Mark Brown Date: Fri Jan 23 11:23:32 2009 +0000 ASoC: Fix merge with PXA tree Fix a merge issue caused by context overlap. Reported-by: Stephen Rothwell Signed-off-by: Mark Brown commit ff637d38ea6b9c54f708a2b9edabc1b0c73c6d0a Author: Timur Tabi Date: Thu Jan 22 18:23:39 2009 -0600 ASoC: remove stand-alone mode support from CS4270 codec driver The CS4270 supports stand-alone mode, where the codec is not connect to the I2C or SPI buses. Instead, input voltages configure the codec at power-on. The CS4270 ASoC device driver has partial support for this mode, but the code was never tested, and partial support doesn't help anyone. It also made the rest of the code more complicated than necessary. [Removed redundant CS4270 dependency on I2C -- broonie] Signed-off-by: Timur Tabi Signed-off-by: Mark Brown commit e3c75964666a27cec46d2cccf2d9806336becd48 Author: Takashi Iwai Date: Fri Jan 23 11:57:22 2009 +0100 ALSA: hda - Create "Input Source" control dynamically for STAC/IDT Instead of fixed kcontrol_new element, build "Input Source" controls dynamically. If the number of input-source items is 0 or 1, we don't need to create such a control. Signed-off-by: Takashi Iwai commit 028b9445b4b10fa8da61ba7cf14ff72cc877ef41 Merge: 8056d47... 00a602d... Author: Takashi Iwai Date: Fri Jan 23 11:55:52 2009 +0100 Merge branch 'fix/hda' into topic/hda commit 8056d47e77a0f7e3c99c114deab4859d31496075 Author: Takashi Iwai Date: Fri Jan 23 09:09:43 2009 +0100 ALSA: hda - Add model=ref for Intel board with STAC9221 An intel board (8086:0204) works only with model=ref. Reference: Novell bug #406529 https://bugzilla.novell.com/show_bug.cgi?id=406529 Signed-off-by: Takashi Iwai commit 92af3e95e4896452ab33b1841c3e9a9d50658064 Author: Jesse Brandeburg Date: Mon Jan 19 14:17:08 2009 +0000 e1000e: drop lltx, remove unnecessary lock LLTX is deprecated and complicated, don't use it. It was observed by Don Ash that e1000e was acquiring this lock in the NAPI cleanup path. This is obviously a bug, as this is a leftover from when e1000 supported multiple tx queues and fake netdevs. another user reported this to us and tested routing with the 2.6.27 kernel and this patch and reported a 3.5 % improvement in packets forwarded in a multi-port test on 82571 parts. Signed-off-by: Jesse Brandeburg Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 577aa2c195045599275b54356969ae19f34e7a66 Author: Matthew Ranostay Date: Thu Jan 22 22:55:44 2009 -0500 ALSA: hda: add reference board SND_PCI_QUIRK Add another LanParty reference board SND_PCI_QUIRK to quirk lists of all codec families. Signed-off-by: Matthew Ranostay Signed-off-by: Takashi Iwai commit fd8757aed16470e088ecdad96ffd30f86c34424d Author: Matthew Ranostay Date: Wed Jan 21 17:45:12 2009 -0500 Add PCI DFI vendor ID Add a define for DFI PCI vendor id. Signed-off-by: Matthew Ranostay Signed-off-by: Takashi Iwai commit 7907f6a411e005545d9047bd888215dbc60fc55e Merge: d9a4268... 32ed3f4... Author: Takashi Iwai Date: Fri Jan 23 08:07:51 2009 +0100 Merge branch 'fix/hda' into topic/hda commit 5ef3041e4a7cd817bc5ebbb0e5e956a2bdd32c38 Author: Florian Fainelli Date: Thu Jan 22 14:06:25 2009 -0800 au1000: reorder functions This patch reorders functions so that we do longer need forward declarations. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 4feb88e5c694bfe414cbc3ce0e383f7f7038f90b Author: Benjamin Thery Date: Thu Jan 22 04:56:23 2009 +0000 netns: ipmr: enable namespace support in ipv4 multicast routing code This last patch makes the appropriate changes to use and propagate the network namespace where needed in IPv4 multicast routing code. This consists mainly in replacing all the remaining init_net occurences with current netns pointer retrieved from sockets, net devices or mfc_caches depending on the routines' contexts. Some routines receive a new 'struct net' parameter to propagate the current netns: * vif_add/vif_delete * ipmr_new_tunnel * mroute_clean_tables * ipmr_cache_find * ipmr_cache_report * ipmr_cache_unresolved * ipmr_mfc_add/ipmr_mfc_delete * ipmr_get_route * rt_fill_info (in route.c) Signed-off-by: Benjamin Thery Signed-off-by: David S. Miller commit f6bb451476be53d456e73bcfd82356afd680bbb0 Author: Benjamin Thery Date: Thu Jan 22 04:56:22 2009 +0000 netns: ipmr: declare ipmr /proc/net entries per-namespace Declare IPv4 multicast forwarding /proc/net entries per-namespace: /proc/net/ip_mr_vif /proc/net/ip_mr_cache Signed-off-by: Benjamin Thery Signed-off-by: David S. Miller commit 6c5143dbcfe50ac722965dc7d096abbeeec8bb33 Author: Benjamin Thery Date: Thu Jan 22 04:56:21 2009 +0000 netns: ipmr: declare reg_vif_num per-namespace Preliminary work to make IPv4 multicast routing netns-aware. Declare variable 'reg_vif_num' per-namespace, move into struct netns_ipv4. At the moment, this variable is only referenced in init_net. Signed-off-by: Benjamin Thery Signed-off-by: David S. Miller commit 6f9374a9342e896c68df7cf7c0b039ab5cca994c Author: Benjamin Thery Date: Thu Jan 22 04:56:20 2009 +0000 netns: ipmr: declare mroute_do_assert and mroute_do_pim per-namespace Preliminary work to make IPv4 multicast routing netns-aware. Declare IPv multicast routing variables 'mroute_do_assert' and 'mroute_do_pim' per-namespace in struct netns_ipv4. At the moment, these variables are only referenced in init_net. Signed-off-by: Benjamin Thery Signed-off-by: David S. Miller commit 1e8fb3b6a4ac6c5e486298d88289038456957545 Author: Benjamin Thery Date: Thu Jan 22 04:56:19 2009 +0000 netns: ipmr: declare counter cache_resolve_queue_len per-namespace Preliminary work to make IPv4 multicast routing netns-aware. Declare variable cache_resolve_queue_len per-namespace: move it into struct netns_ipv4. This variable counts the number of unresolved cache entries queued in the list mfc_unres_queue. This list is kept global to all netns as the number of entries per namespace is limited to 10 (hardcoded in routine ipmr_cache_unresolved). Entries belonging to different namespaces in mfc_unres_queue will be identified by matching the mfc_net member introduced previously in struct mfc_cache. Keeping this list global to all netns, also allows us to keep a single timer (ipmr_expire_timer) to handle their expiration. In some places cache_resolve_queue_len value was tested for arming or deleting the timer. These tests were equivalent to testing mfc_unres_queue value instead and are replaced in this patch. At the moment, cache_resolve_queue_len is only referenced in init_net. Signed-off-by: Benjamin Thery Signed-off-by: David S. Miller commit 2bb8b26c3ea8bde1943dc5cd4dda2dc9f48fb281 Author: Benjamin Thery Date: Thu Jan 22 04:56:18 2009 +0000 netns: ipmr: dynamically allocate mfc_cache_array Preliminary work to make IPv4 multicast routing netns-aware. Dynamically allocate IPv4 multicast forwarding cache, mfc_cache_array, and move it to struct netns_ipv4. At the moment, mfc_cache_array is only referenced in init_net. Signed-off-by: Benjamin Thery Signed-off-by: David S. Miller commit 5c0a66f5f3c9c59e2c341400048e2cff768e67a9 Author: Benjamin Thery Date: Thu Jan 22 04:56:17 2009 +0000 netns: ipmr: store netns in struct mfc_cache This patch stores into struct mfc_cache the network namespace each mfc_cache belongs to. The new member is mfc_net. mfc_net is assigned at cache allocation and doesn't change during the rest of the cache entry life. A new net parameter is added to ipmr_cache_alloc/ipmr_cache_alloc_unres. This will help to retrieve the current netns around the IPv4 multicast routing code. At the moment, all mfc_cache are allocated in init_net. Signed-off-by: Benjamin Thery Signed-off-by: David S. Miller commit cf958ae377ee2545ae70cf48d38e7eb4308c27ea Author: Benjamin Thery Date: Thu Jan 22 04:56:16 2009 +0000 netns: ipmr: dynamically allocate vif_table Preliminary work to make IPv6 multicast routing netns-aware. Dynamically allocate interface table vif_table and move it to struct netns_ipv4, and update MIF_EXISTS() macro. At the moment, vif_table is only referenced in init_net. Signed-off-by: Benjamin Thery Signed-off-by: David S. Miller commit 70a269e6c9c9b38b1a37dce068c59e9a912f8578 Author: Benjamin Thery Date: Thu Jan 22 04:56:15 2009 +0000 netns: ipmr: allocate mroute_socket per-namespace. Preliminary work to make IPv4 multicast routing netns-aware. Make IPv4 multicast routing mroute_socket per-namespace, moves it into struct netns_ipv4. At the moment, mroute_socket is only referenced in init_net. Signed-off-by: Benjamin Thery Signed-off-by: David S. Miller commit e35fac80ed0bb878f652cc0f70ca268656d275f7 Author: Cyrill Gorcunov Date: Thu Jan 22 13:52:26 2009 -0800 net: pppoe - get rid of DECLARE_MAC_BUF While was playing with PPP namespaces I occasionally brought back DECLARE_MAC_BUF which is not needed (we have %pM here). Fix it. Signed-off-by: Cyrill Gorcunov Signed-off-by: David S. Miller commit 4fe1d58bf56f69de68868630d222322a6b45bb55 Author: Joe Perches Date: Thu Jan 22 13:49:44 2009 -0800 sctp/ipv6.c: use ipv6_addr_copy Signed-off-by: Joe Perches Acked-by: Vlad Yasevich Signed-off-by: David S. Miller commit d9a4268ee92ba1a2355c892a3add1fa66856b510 Author: Takashi Iwai Date: Thu Jan 22 17:40:18 2009 +0100 ALSA: hda - Add quirk for Gateway %1616 laptop Gateway T1616 laptop needs EAPD always on while the current STAC9205 code turns off per HP plug. Added a new model "eapd" to keep it on. Reference: Novell bnc#467597 https://bugzilla.novell.com/show_bug.cgi?id=467597 Signed-off-by: Takashi Iwai commit eda6829394cd1755c145583bd506ac244201a2c4 Merge: 8ce8419... e0c0e94... Author: Takashi Iwai Date: Thu Jan 22 17:10:22 2009 +0100 Merge branch 'fix/hda' into topic/hda commit 8ce8419829998c91b33200894a0db5e1441d6952 Author: Takashi Iwai Date: Thu Jan 22 16:59:20 2009 +0100 ALSA: hda - Avoid to set the pin control again if already set Check the present pin control bit and avoid the write if it's already set in patch_sigmatel.c. This will reduce the number of verb execs at jack plugging. Signed-off-by: Takashi Iwai commit d52a61c04c6c0814ca270a088feedb126436598e Author: Yinghai Lu Date: Thu Jan 22 00:38:56 2009 -0800 irq: clean up irq stat methods David Miller suggested, related to a kstat_irqs related build breakage: > Either linux/kernel_stat.h provides the kstat_incr_irqs_this_cpu > interface or linux/irq.h does, not both. So move them to kernel_stat.h. Signed-off-by: Ingo Molnar commit e81838d2555e77c893f720c25bfb0c0e5782ef57 Author: David Miller Date: Wed Jan 21 17:15:53 2009 -0800 sparc64: Fix build by using kstat_irqs_cpu() Changeset d7e51e66899f95dabc89b4d4c6674a6e50fa37fc ("sparseirq: make some func to be used with genirq") broke the build on sparc64: arch/sparc/kernel/irq_64.c: In function ‘show_interrupts’: arch/sparc/kernel/irq_64.c:188: error: ‘struct kernel_stat’ has no member named ‘irqs’ make[1]: *** [arch/sparc/kernel/irq_64.o] Error 1 Fix by using the kstat_irqs_cpu() interface. Signed-off-by: David S. Miller Signed-off-by: Ingo Molnar commit 623d3f0c619f3576dae69709ca8aa93ac76d8c63 Author: David Miller Date: Wed Jan 21 17:24:51 2009 -0800 sparc64: Fix build by including linux/irq.h into time_64.c Changeset d7e51e66899f95dabc89b4d4c6674a6e50fa37fc ("sparseirq: make some func to be used with genirq") broke the build on sparc64: arch/sparc/kernel/time_64.c: In function ‘timer_interrupt’: arch/sparc/kernel/time_64.c:732: error: implicit declaration of function ‘kstat_incr_irqs_this_cpu’ make[1]: *** [arch/sparc/kernel/time_64.o] Error 1 Signed-off-by: David S. Miller Signed-off-by: Ingo Molnar commit 1eaf5c0716d53d3f64da62a09682b1f5ae912ac2 Merge: 0898993... 7c7767e... Author: Takashi Iwai Date: Thu Jan 22 08:33:04 2009 +0100 Merge branch 'test/hda-vol-ofs' into next/hda commit f019a7a594d951f085eb3878c3d825556d447efe Author: Eric W. Biederman Date: Wed Jan 21 16:02:16 2009 -0800 tun: Implement ip link del tunXXX This greatly simplifies testing to verify I have fixed the problems with a tun device disappearing when the tun file descriptor is still held open. Further it allows removal network namespace operations for the tun driver. Reducing the network namespace handling in the driver to the minimum. i.e. When we are creating a tun device. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit aec191aa2a04b082238156dc9690fff8ce95dd6b Author: Eric W. Biederman Date: Tue Jan 20 11:08:46 2009 +0000 tun: There is no longer any need to deny changing network namespaces With the awkward case between free_netdev and dev_chr_close fixed there is no longer any need to limit tun and tap devices to the network namespace they were created in. So remove the NETIF_F_NETNS_LOCAL flag on the network device. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit c70f182940f988448f3c12a209d18b1edc276e33 Author: Eric W. Biederman Date: Tue Jan 20 11:07:17 2009 +0000 tun: Fix races between tun_net_close and free_netdev. The tun code does not cope gracefully if the network device goes away before the tun file descriptor is closed. It looks like we can trigger this with rmmod, and moving tun devices between network namespaces will allow this to be triggered when network namespaces exit. To fix this I introduce an intermediate data structure tun_file which holds a count of users and a pointer to the struct tun_struct. tun_get increments that reference count if it is greater than 0. tun_put decrements that reference count and detaches from the network device if the count is 0. While we have a file attached to the network device I hold a reference to the network device keeping it from going away completely. When a network device is unregistered I decrement the count of the attached tun_file and if that was the last user I detach the tun_file, and all processes on read_wait are woken up to ensure they do not sleep indefinitely. As some of those sleeps happen with the count on the tun device elevated waking up the read waiters ensures that tun_file will be detached in a timely manner. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit b2430de37ef0bc0799ffba7b5219d38ca417eb76 Author: Eric W. Biederman Date: Tue Jan 20 11:03:21 2009 +0000 tun: Move read_wait into tun_file The poll interface requires that the waitqueue exist while the struct file is open. In the rare case when a tun device disappears before the tun file closes we fail to provide this property, so move read_wait. This is safe now that tun_net_xmit is atomic with tun_detach. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit 38231b7a8d1b74c920822640d1ce8eb8046377fb Author: Eric W. Biederman Date: Tue Jan 20 11:02:28 2009 +0000 tun: Make tun_net_xmit atomic wrt tun_attach && tun_detach Currently this small race allows for a packet to be received when we detach from an tun device and still be enqueued. Not especially important but not what the code is trying to do. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit 36b50bab53207daf34be63ca62fb8b0b08dc6e6b Author: Eric W. Biederman Date: Tue Jan 20 11:01:48 2009 +0000 tun: Grab the netns in open. Grabbing namespaces in open, and putting them in close always seems to be the cleanest approach with the fewest surprises. So now that we have tun_file so we have somepleace to put the network namespace, let's grab the network namespace on file open and put on file close. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit 631ab46b79559d6fed784fd7883c0cda4d8cfcfa Author: Eric W. Biederman Date: Tue Jan 20 11:00:40 2009 +0000 tun: Introduce tun_file Currently the tun code suffers from only having a single word of data that exists for the entire life of the tun file descriptor. This results in peculiar holding of references to the network namespace as well as races between free_netdevice and tun_chr_close. Fix this by introducing tun_file which will hold the per file state. For the moment it still holds just a single word so the differences are all logic changes with no changes in semantics. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit eac9e902658dab1e097b8ef064e9e3d16c152cc9 Author: Eric W. Biederman Date: Tue Jan 20 10:59:05 2009 +0000 tun: Use POLLERR not EBADF in tun_chr_poll EBADF is meaningless in the context of a poll mask so use POLLERR instead. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit a7385ba21102a90f902055f9f185ca02bf62fa43 Author: Eric W. Biederman Date: Tue Jan 20 10:57:48 2009 +0000 tun: Fix races in tun_set_iff It is possible for two different tasks with access to the same file descriptor to call tun_set_iff on it at the same time and race to attach to a tap device. Prevent this by placing all of the logic to attach to a file descriptor in one function and testing the file descriptor to be certain it is not already attached to another tun device. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit 74a3e5a71c9b54c63bff978e9cafbcef67600f0b Author: Eric W. Biederman Date: Tue Jan 20 10:56:20 2009 +0000 tun: Remove unnecessary tun_get_by_name Currently the tun driver keeps a private list of tun devices for what appears to be a small gain in performance when reconnecting a file descriptor to an existing tun or tap device. So simplify the code by removing it. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit f5882c30508c1e3c4fbbdaa9ca08d0922c5fb071 Author: Cyrill Gorcunov Date: Wed Jan 21 15:55:40 2009 -0800 net: pppoe,pppol2tp - register channels with explicit net In PPPo[E|L2TP] we could explicitly point which net namespace we're going to use for channels - make it so. Signed-off-by: Cyrill Gorcunov Signed-off-by: James Chapman Signed-off-by: David S. Miller commit 273ec51dd7ceaa76e038875d85061ec856d8905e Author: Cyrill Gorcunov Date: Wed Jan 21 15:55:35 2009 -0800 net: ppp_generic - introduce net-namespace functionality v2 - Each namespace contains ppp channels and units separately with appropriate locks Signed-off-by: Cyrill Gorcunov Signed-off-by: David S. Miller commit 4e9fb8016a351b5b9da7fea32bcfdbc9d836e421 Author: Cyrill Gorcunov Date: Wed Jan 21 15:55:15 2009 -0800 net: pppol2tp - introduce net-namespace functionality - Each tunnel and appropriate lock are inside own namespace now. - pppox code allows to create per-namespace sockets for both PX_PROTO_OE and PX_PROTO_OL2TP protocols. Actually since now pppox_create support net-namespaces new PPPo... protocols (if they ever will be) should support net-namespace too otherwise explicit check for &init_net would be needed. Signed-off-by: Cyrill Gorcunov Signed-off-by: James Chapman Signed-off-by: David S. Miller commit a6bcf1c1d38e0672db35e0d9f2504ac04ddf3ed5 Author: Cyrill Gorcunov Date: Wed Jan 21 15:54:54 2009 -0800 net: pppoe - introduce net-namespace functionality - each net-namespace for pppoe module is having own hash table and appropriate locks wich are allocated at time of namespace intialization. It requires about 140 bytes of memory for every new namespace but such approach allow us to escape from hash chains growing and additional lock contends (especially in SMP environment). - pppox code allows to create per-namespace sockets for PX_PROTO_OE protocol only (since at this moment support for pppol2tp net-namespace is not implemented yet). Signed-off-by: Cyrill Gorcunov Signed-off-by: David S. Miller commit 6aba915881918a429d656e874f7fec2efd37ad96 Author: Cyrill Gorcunov Date: Wed Jan 21 15:54:15 2009 -0800 net: pppoe - code cleanup and helpers - Introduce PPPOE_HASH_MASK. - Remove redundant declaration of pppoe_chan_ops. - Introduce stage_session helper. - Tabs, space, long-line-split cleanup. Signed-off-by: Cyrill Gorcunov Signed-off-by: David S. Miller commit e2878806227d223467f84f900ef4c6733ee166df Author: Thomas Klein Date: Wed Jan 21 14:45:57 2009 -0800 ehea: Improve driver behaviour in low mem conditions Reworked receive queue fill policies to make the driver more tolerant in low memory conditions. Signed-off-by: Thomas Klein Signed-off-by: David S. Miller commit 3faf2693bd6800c2521799f6a9ae174d9f080ed2 Author: Thomas Klein Date: Wed Jan 21 14:45:33 2009 -0800 ehea: Fix mem allocations which require page alignment PAGE_SIZE allocations via slab are not guaranteed to be page-aligned. Fixed all memory allocations where page alignment is required by firmware. Signed-off-by: Thomas Klein Signed-off-by: David S. Miller commit 086c1b2c52f03d128d1a6db47f8736c56e915043 Author: Thomas Klein Date: Wed Jan 21 14:43:59 2009 -0800 ehea: Use net_device_ops structure Adapt to lately introduced net_device_ops structure. Signed-off-by: Thomas Klein Signed-off-by: David S. Miller commit 8017943e6b177f117e4be71f09a38e2c9fd56193 Author: Alexander Duyck Date: Wed Jan 21 14:42:47 2009 -0800 e1000: drop lltx, remove unnecessary lock LLTX is deprecated, don't use it. This completes the removal of LLTX from the Intel Network drivers. Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 921aa7491201b238589ab9f94184b18a1ed00e12 Author: Alexander Duyck Date: Wed Jan 21 14:42:28 2009 -0800 igb: make certain to power on optics for 82576 fiber nics It appears that a step was missed in the initialization of 82576 fiber nics that resulted in it not powering on the optics. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 5851765cca21e973a7f4850fbaf1ef55e0cb1965 Author: Alexander Duyck Date: Wed Jan 21 14:42:07 2009 -0800 igb: igb should not flag lltx Igb has flags enabling lltx but this is a holdover from the earlier e1000 driver which the igb driver was based off of. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 52d07b1f5039f51101a589856d9058e9cc8ce5dc Author: Harvey Harrison Date: Mon Jan 19 17:27:06 2009 -0800 bnx2: annotate bp->phy_lock functions It looks like the locking is OK as the locks were being taken before the various phy setup functions, add the annotations as they release and reacquire the phy_lock. Signed-off-by: Harvey Harrison Signed-off-by: David S. Miller commit 7be2df451fa916f93e37763a58d33483feb0909f Author: Herbert Xu Date: Wed Jan 21 14:39:13 2009 -0800 cxgb3: Replace LRO with GRO This patch makes cxgb3 invoke the GRO hooks instead of LRO. As GRO has a compatible external interface to LRO this is a very straightforward replacement. I've kept the ioctl controls for per-queue LRO switches. However, we should not encourage anyone to use these. Because of that, I've also kept the skb construction code in cxgb3. Hopefully we can phase out those per-queue switches and then kill this too. Signed-off-by: Herbert Xu Acked-by: Divy Le Ray Signed-off-by: David S. Miller commit 749c10f931923451a4c59b4435d182aa9ae27a4f Author: Timo Teras Date: Mon Jan 19 17:22:12 2009 -0800 gre: strict physical device binding Check the device on receive path and allow otherwise identical devices as long as the physical device differs. This is useful for NBMA tunnels, where you want to use different gre IP for each public IP available via different physical devices. Signed-off-by: Timo Teras Signed-off-by: David S. Miller commit 57a574993d94671b495cdbe8aeb78b745abfe14f Author: Roel Kluin Date: Mon Jan 19 17:14:21 2009 -0800 phylib: unsigneds go unnoticed both pdata->mdc and pdata->mdio are unsigned. Notice a negative return value. Signed-off-by: Roel Kluin Signed-off-by: David S. Miller commit 9f4d26d0f3016cf8813977d624751b94465fa317 Author: Mark McLoughlin Date: Mon Jan 19 17:09:49 2009 -0800 virtio_net: add link status handling Allow the host to inform us that the link is down by adding a VIRTIO_NET_F_STATUS which indicates that device status is available in virtio_net config. This is currently useful for simulating link down conditions (e.g. using proposed qemu 'set_link' monitor command) but would also be needed if we were to support device assignment via virtio. Signed-off-by: Mark McLoughlin Signed-off-by: Rusty Russell (added future masking) Signed-off-by: David S. Miller commit 357fe2c6d2b12482abd1c3f24a086a2f507f03fc Author: Vernon Sauder Date: Fri Jan 16 13:23:19 2009 +0000 smc91x: enable ethtool EEPROM interface Signed-off-by: Vernon Sauder Acked-by: Nicolas Pitre Signed-off-by: David S. Miller commit 31e2b7bd21035cb3d7cd567dfdf4f82817c4f6fb Author: Masakazu Mokuno Date: Thu Jan 15 22:52:55 2009 +0000 PS3: gelic: wireless: convert the wireless part to net_device_ops Convert the gelic wireless driver to net_device_ops Signed-off-by: Masakazu Mokuno Signed-off-by: David S. Miller commit 5384e8361a9bb7fca054b47c1dde7ac0e929407f Author: Masakazu Mokuno Date: Thu Jan 15 22:47:29 2009 +0000 PS3: gelic: convert the ethernet part to net_device_ops Convert the gelic driver to net_device_ops Signed-off-by: Masakazu Mokuno Signed-off-by: David S. Miller commit 3d16543d3235fefca351c10b30c1cca6536f2569 Author: Francois Romieu Date: Mon Jan 19 16:56:50 2009 -0800 tg3: remove extra casting Signed-off-by: Francois Romieu Signed-off-by: David S. Miller commit a9d8f9110d7e953c2f2b521087a4179677843c2a Author: Evgeniy Polyakov Date: Mon Jan 19 16:46:02 2009 -0800 inet: Allowing more than 64k connections and heavily optimize bind(0) time. With simple extension to the binding mechanism, which allows to bind more than 64k sockets (or smaller amount, depending on sysctl parameters), we have to traverse the whole bind hash table to find out empty bucket. And while it is not a problem for example for 32k connections, bind() completion time grows exponentially (since after each successful binding we have to traverse one bucket more to find empty one) even if we start each time from random offset inside the hash table. So, when hash table is full, and we want to add another socket, we have to traverse the whole table no matter what, so effectivelly this will be the worst case performance and it will be constant. Attached picture shows bind() time depending on number of already bound sockets. Green area corresponds to the usual binding to zero port process, which turns on kernel port selection as described above. Red area is the bind process, when number of reuse-bound sockets is not limited by 64k (or sysctl parameters). The same exponential growth (hidden by the green area) before number of ports reaches sysctl limit. At this time bind hash table has exactly one reuse-enbaled socket in a bucket, but it is possible that they have different addresses. Actually kernel selects the first port to try randomly, so at the beginning bind will take roughly constant time, but with time number of port to check after random start will increase. And that will have exponential growth, but because of above random selection, not every next port selection will necessary take longer time than previous. So we have to consider the area below in the graph (if you could zoom it, you could find, that there are many different times placed there), so area can hide another. Blue area corresponds to the port selection optimization. This is rather simple design approach: hashtable now maintains (unprecise and racely updated) number of currently bound sockets, and when number of such sockets becomes greater than predefined value (I use maximum port range defined by sysctls), we stop traversing the whole bind hash table and just stop at first matching bucket after random start. Above limit roughly corresponds to the case, when bind hash table is full and we turned on mechanism of allowing to bind more reuse-enabled sockets, so it does not change behaviour of other sockets. Signed-off-by: Evgeniy Polyakov Tested-by: Denys Fedoryschenko Signed-off-by: David S. Miller commit 5c0999b72b34541a3734a9138c43d5c024a42d47 Author: Herbert Xu Date: Mon Jan 19 15:20:57 2009 -0800 igb: Replace LRO with GRO This patch makes igb invoke the GRO hooks instead of LRO. As GRO has a compatible external interface to LRO this is a very straightforward replacement. Three things of note: 1) I've kept the LRO Kconfig option until we decide to enable GRO across the board at which point it can also be killed. 2) The poll_controller stuff is broken in igb as it tries to do the same work as the normal poll routine. Since poll_controller can be called in the middle of a poll, this can't be good. I noticed this because poll_controller can invoke the GRO hooks without flushing held GRO packets. However, this should be harmless (assuming the poll_controller bug above doesn't kill you first :) since the next ->poll will clear the backlog. The only time when we'll have a problem is if we're already executing the GRO code on the same ring, but that's no worse than what happens now. 3) I kept the ip_summed check before calling GRO so that we're on par with previous behaviour. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 649aa95d75cbadb9f440c1b8d04c666461de326f Author: Harvey Harrison Date: Sun Jan 18 22:03:01 2009 -0800 typhoon: replace users of __constant_{endian} The base versions handle constant folding just fine, use them directly. Signed-off-by: Harvey Harrison Acked-by: David Dillow Signed-off-by: David S. Miller commit da3bc07171dff957906cbe2ad5abb443eccf57c4 Author: Herbert Xu Date: Sun Jan 18 21:50:16 2009 -0800 sfc: Replace LRO with GRO This patch makes sfc invoke the GRO hooks instead of LRO. As GRO has a compatible external interface to LRO this is a very straightforward replacement. Everything should appear identical to the user except that the offload is now controlled by the GRO ethtool option instead of LRO. I've kept the lro module parameter as is since that's for compatibility only. I have eliminated efx_rx_mk_skb as the GRO layer can take care of all packets regardless of whether GRO is enabled or not. So the only case where we don't call GRO is if the packet checksum is absent. This is to keep the behaviour changes of the patch to a minimum. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 78b6f4ce58d1c85190003840912cc9097cbb8146 Author: Herbert Xu Date: Sun Jan 18 21:49:45 2009 -0800 ixgbe: Replace LRO with GRO This patch makes ixgbe invoke the GRO hooks instead of LRO. As GRO has a compatible external interface to LRO this is a very straightforward replacement. As GRO uses the napi structure to track the held packets, I've modified the code paths involved to pass that along. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit f3f3abb62ccb1a1c77bcce855c04e12356e6ac95 Author: Gerrit Renker Date: Fri Jan 16 23:36:33 2009 +0000 dccp: Debugging functions for feature negotiation Since all feature-negotiation processing now takes place in feat.c, functions for producing verbose debugging output are concentrated there. New functions to print out values, entry records, and options are provided, and also a macro is defined to not always have the function name in the output line. Thanks a lot to Wei Yongjun and Giuseppe Galeota for help and discussion with an earlier revision of this patch. Signed-off-by: Gerrit Renker Acked-by: Ian McDonald Signed-off-by: David S. Miller commit 883ca833e5fb814fb03426c9d35e5489ce43e8da Author: Gerrit Renker Date: Fri Jan 16 23:36:32 2009 +0000 dccp: Initialisation and type-checking of feature sysctls This patch takes care of initialising and type-checking sysctls related to feature negotiation. Type checking is important since some of the sysctls now directly impact the feature-negotiation process. The sysctls are initialised with the known default values for each feature. For the type-checking the value constraints from RFC 4340 are used: * Sequence Window uses the specified Wmin=32, the maximum is ulong (4 bytes), tested and confirmed that it works up to 4294967295 - for Gbps speed; * Ack Ratio is between 0 .. 0xffff (2-byte unsigned integer); * CCIDs are between 0 .. 255; * request_retries, retries1, retries2 also between 0..255 for good measure; * tx_qlen is checked to be non-negative; * sync_ratelimit remains as before. Notes: ------ 1. Die s@sysctl_dccp_feat@sysctl_dccp@g since the sysctls are now in feat.c. 2. As pointed out by Arnaldo, the pattern of type-checking repeats itself in other places, sometimes with exactly the same kind of definitions (e.g. "static int zero;"). It may be a good idea (kernel janitors?) to consolidate type checking. For the sake of keeping the changeset small and in order not to affect other subsystems, I have not strived to generalise here. Signed-off-by: Gerrit Renker Acked-by: Ian McDonald Signed-off-by: David S. Miller commit 792b48780e8b6435d017cef4b5c304876a48653e Author: Gerrit Renker Date: Fri Jan 16 23:36:31 2009 +0000 dccp: Implement both feature-local and feature-remote Sequence Window feature This adds full support for local/remote Sequence Window feature, from which the * sequence-number-validity (W) and * acknowledgment-number-validity (W') windows derive as specified in RFC 4340, 7.5.3. Specifically, the following is contained in this patch: * integrated new socket fields into dccp_sk; * updated the update_gsr/gss routines with regard to these fields; * updated handler code: the Sequence Window feature is located at the TX side, so the local feature is meant if the handler-rx flag is false; * the initialisation of `rcv_wnd' in reqsk is removed, since - rcv_wnd is not used by the code anywhere; - sequence number checks are not done in the LISTEN state (cf. 7.5.3); - dccp_check_req checks the Ack number validity more rigorously; * the `struct dccp_minisock' became empty and is now removed. Signed-off-by: Gerrit Renker Acked-by: Ian McDonald Signed-off-by: David S. Miller commit f90f92eed74251034f251e3cdf4fa5c4c1f09df0 Author: Gerrit Renker Date: Fri Jan 16 23:36:30 2009 +0000 dccp: Initialisation framework for feature negotiation This initialises feature negotiation from two tables, which are in turn are initialised from sysctls. As a novel feature, specifics of the implementation (e.g. that short seqnos and ECN are not yet available) are advertised for robustness. Signed-off-by: Gerrit Renker Acked-by: Ian McDonald Signed-off-by: David S. Miller commit 5cda9364f1fbc330f0d82f534505a8e375d0a66c Author: Divy Le Ray Date: Sun Jan 18 21:29:40 2009 -0800 cxgb3: ease msi-x settings conditions The driver currently drops to line interrupt mode if it did not get all the msi-x vectors it requested. Allow msi-x settings when a minimal amount of vectors is provided. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit c405b828161286729b6a5a729159114dca122923 Author: Herbert Xu Date: Wed Jan 14 20:37:59 2009 -0800 e1000e: Invoke VLAN GRO handler Now that VLAN has GRO support as well, we can call its GRO handler as well. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 288379f050284087578b77e04f040b57db3db3f8 Author: Ben Hutchings Date: Mon Jan 19 16:43:59 2009 -0800 net: Remove redundant NAPI functions Following the removal of the unused struct net_device * parameter from the NAPI functions named *netif_rx_* in commit 908a7a1, they are exactly equivalent to the corresponding *napi_* functions and are therefore redundant. Signed-off-by: Ben Hutchings Acked-by: Neil Horman Signed-off-by: David S. Miller commit 627af770c63acddc2402dd19fec70df5c3ad8ab7 Author: Cesar Eduardo Barros Date: Wed Jan 14 20:34:24 2009 -0800 sc92031: add a link to the datasheet Signed-off-by: Cesar Eduardo Barros Signed-off-by: David S. Miller commit 5ec99fdf8e1a6ee90fce22c2fce94871ab44e8ba Author: Cesar Eduardo Barros Date: Wed Jan 14 20:34:04 2009 -0800 sc92031: use device id directly instead of made-up name Instead of making up a name for the device ids, put them directly in the device id table. Also move the vendor id to pci_ids.h. Signed-off-by: Cesar Eduardo Barros Signed-off-by: David S. Miller commit f08d7c36ccde73ea098dfda8ab63540978e9beb5 Author: Cesar Eduardo Barros Date: Wed Jan 14 20:33:44 2009 -0800 sc92031: inline SC92031_DESCRIPTION SC92031_DESCRIPTION is only used in one place. Signed-off-by: Cesar Eduardo Barros Signed-off-by: David S. Miller commit 3230d2b00e6dacffabe3fd013f033606bcf08795 Author: Cesar Eduardo Barros Date: Wed Jan 14 20:33:27 2009 -0800 sc92031: remove meaningless version string The version string makes no sense anymore, since this driver is only maintained within the kernel. Signed-off-by: Cesar Eduardo Barros Signed-off-by: David S. Miller commit eb5c8bc1442a03755ae75d99b59ccea6bbf25a34 Author: Cesar Eduardo Barros Date: Wed Jan 14 20:33:07 2009 -0800 sc92031: more useful banner in kernel log The banner currently printed when loading the module is mostly useless. Replace it with a more informative one, printed after probing the device. Output format copied from 8139cp/8139too. Signed-off-by: Cesar Eduardo Barros Signed-off-by: David S. Miller commit 4101dec9ca64d40f0d673f0a40ba46ba2c60e117 Author: Jan Engelhardt Date: Wed Jan 14 13:52:18 2009 -0800 net: constify VFTs Signed-off-by: Jan Engelhardt Signed-off-by: David S. Miller commit 991990a12de42281f81b4e3a6471586d2d0caf6a Author: Krzysztof Hałasa Date: Thu Jan 8 22:52:11 2009 +0100 WAN: Convert generic HDLC drivers to netdev_ops. Also remove unneeded last_rx update from Synclink drivers. Synclink part mostly by Stephen Hemminger. Signed-off-by: Krzysztof Hałasa Signed-off-by: David S. Miller commit dff3fde7be8f08c78914fca3d25e1cffe7625faa Author: Krzysztof Hałasa Date: Thu Jan 8 19:55:57 2009 +0100 WAN: Allow hw HDLC drivers to override dev->get_stats. Use the internal get_stats() by default. Fixes LMC and wanXL drivers. Signed-off-by: Krzysztof Hałasa Signed-off-by: David S. Miller commit 7cdc15f5f9db71e9c92422918ab9f8df0d31f81f Author: Krzysztof Hałasa Date: Thu Jan 8 19:46:54 2009 +0100 WAN: Generic HDLC now uses IFF_WAN_HDLC private flag. Signed-off-by: Krzysztof Hałasa Signed-off-by: David S. Miller commit a962dc2520d85c278768f5f6028f300152fca7fa Author: Inaky Perez-Gonzalez Date: Fri Jan 9 16:43:49 2009 +0000 wimax/i2400m: convert to net_device_ops Signed-off-by: Inaky Perez-Gonzalez Signed-off-by: David S. Miller commit 2171dc1815fcc5cc08d227155d65bb268070f6a5 Author: Frank Blaschka Date: Fri Jan 9 03:43:59 2009 +0000 claw: convert to net_device_ops claw convert to net_device_ops. Signed-off-by: Frank Blaschka commit 4edd73b5cf466ab2c9d406fd6768cb3203abfbe5 Author: Frank Blaschka Date: Fri Jan 9 03:43:58 2009 +0000 netiucv: convert to net_device_ops netiucv convert to net_device_ops. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 69b3aa609cab34928931b86632316d065ba17ba3 Author: Frank Blaschka Date: Fri Jan 9 03:43:57 2009 +0000 ctcm: convert to net_device_ops ctcm convert to net_device_ops. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 0e0b46d80f8768c465c14994aba91ee714b0d7b7 Author: Frank Blaschka Date: Fri Jan 9 03:43:56 2009 +0000 lcs: convert to net_device_ops lcs convert to net_device_ops. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit ba270ede101ad7439de7d4e92b71eece26db5c26 Author: Stephen Hemminger Date: Fri Jan 9 13:01:42 2009 +0000 dmascc: convert to internal net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 6095e08126790592699d8aeef4d31b263a4176a4 Author: Stephen Hemminger Date: Fri Jan 9 13:01:41 2009 +0000 dmascc: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit ddbe9a686805c36a0e68451ebb8cb51b21d0c718 Author: Stephen Hemminger Date: Fri Jan 9 13:01:40 2009 +0000 mkiss: convert to internal network device stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit ff908cf83498010e832819cf50a23e16c43b1373 Author: Stephen Hemminger Date: Fri Jan 9 13:01:39 2009 +0000 scc: convert to internal net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 3f75f7482f7687b8ffe9e0ddad560797a9f9ad6e Author: Stephen Hemminger Date: Fri Jan 9 13:01:38 2009 +0000 yam: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 3c94acb7ee343e49075c8f3c72c1920633fc230c Author: Stephen Hemminger Date: Fri Jan 9 13:01:37 2009 +0000 yam: convert to internal net_device_stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 2d8b223d81a385a746befc7facf93680f4185533 Author: Stephen Hemminger Date: Fri Jan 9 13:01:36 2009 +0000 hdlcdrv: convert to net_device_ops Signed-off-by: Stephen Hemminger Acked-by: Thomas Sailer Signed-off-by: David S. Miller commit 5a7616af604caf0d436a1ed0d4298bb25cd77d67 Author: Stephen Hemminger Date: Fri Jan 9 13:01:35 2009 +0000 hdlcdrv: convert to internal net_device_stats Signed-off-by: Stephen Hemminger Acked-by: Thomas Sailer Signed-off-by: David S. Miller commit 52db625079e8f231a3e53e89871bd5adb66e8464 Author: Stephen Hemminger Date: Fri Jan 9 13:01:34 2009 +0000 dmascc: convert to network_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 13c0582d91ab63087a30addcfe42874541ca2689 Author: Stephen Hemminger Date: Fri Jan 9 13:01:33 2009 +0000 dmascc: convert to internal network device stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 283767e70501a02e676c99964e5a3f09ec993469 Author: Stephen Hemminger Date: Fri Jan 9 13:01:32 2009 +0000 bpqether: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f57505fd7ce559bacf5cde26a79ea355fa3bc1ce Author: Stephen Hemminger Date: Fri Jan 9 13:01:31 2009 +0000 bpqether: convert to internal net_device_stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 9772a252b5b2ffbcf163cc07a443a444bf500040 Author: Stephen Hemminger Date: Fri Jan 9 13:01:30 2009 +0000 baycom: convert to net_device_ops Signed-off-by: Stephen Hemminger Acked-by: Thomas Sailer Signed-off-by: David S. Miller commit cd94f08658e15972d6ca8b53501efa48841f1b5b Author: Stephen Hemminger Date: Fri Jan 9 13:01:29 2009 +0000 baycom: convert to internal net_device_stats Signed-off-by: Stephen Hemminger Acked-by: Thomas Sailer Signed-off-by: David S. Miller commit b3672a7394d2db85bd8c0f445df485fc09a0cef7 Author: Stephen Hemminger Date: Fri Jan 9 13:01:28 2009 +0000 6pack: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit bc0443fc38f802c5b7a7489b4a31577f1fadd4e4 Author: Stephen Hemminger Date: Fri Jan 9 13:01:27 2009 +0000 znet: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 69d651692f16c5e883f6af3d0eb36bdac5438f9c Author: Stephen Hemminger Date: Fri Jan 9 13:01:26 2009 +0000 3c559: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f1608f859a3fba95a3b0ae70f2528b81c6928d77 Author: Stephen Hemminger Date: Fri Jan 9 13:01:25 2009 +0000 tms380tr: convert to net_device_ops Conver this related group of drivers to new API Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit efda072393fb4213e43d92bdd20cf180a06a8eb0 Author: Stephen Hemminger Date: Fri Jan 9 13:01:24 2009 +0000 olympic: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit dcc59a9789fee98782aa2f3215bbea071bd643b1 Author: Stephen Hemminger Date: Fri Jan 9 13:01:23 2009 +0000 olympic: convert to internal network device stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit be18827815bc62f64797da05bcba9ba69101524d Author: Stephen Hemminger Date: Fri Jan 9 13:01:22 2009 +0000 lanstreamer: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 37423fff4f02fcf6867971dfd678e99a34efeab3 Author: Stephen Hemminger Date: Fri Jan 9 13:01:21 2009 +0000 lanstreamer: convert to internal network stats Use internal network_device_stats to keep track of statistics. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c86d87402966dc3f1996d17ef6bc2b676b46bb60 Author: Stephen Hemminger Date: Fri Jan 9 13:01:20 2009 +0000 ibmtr: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 9fd3238e95046b61d518ddacaa767fa09f31b0d0 Author: Stephen Hemminger Date: Fri Jan 9 13:01:19 2009 +0000 ibmtr: convert to internal network_device_stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 48b47a5e306c1c119ee81ccd24d487c2df656410 Author: Stephen Hemminger Date: Fri Jan 9 13:01:18 2009 +0000 3c59x: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 4394e6533da7f652a19e08009fff713f4168915e Author: Stephen Hemminger Date: Fri Jan 9 13:01:17 2009 +0000 3c527: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 90e64c6ad2a5dd3ecad1b59e466d42945fe22eb2 Author: Stephen Hemminger Date: Fri Jan 9 13:01:16 2009 +0000 3c523: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f3701c2f0e2ede7ae265fcf627f01f2a795ac41b Author: Stephen Hemminger Date: Fri Jan 9 13:01:15 2009 +0000 3c515: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 3186ae8f3f5a30ecfed9faa76ce113830da39fbd Author: Stephen Hemminger Date: Fri Jan 9 13:01:14 2009 +0000 3c509: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 1722de5098cb5a680945cb68c57be5b2bf67b52d Author: Stephen Hemminger Date: Fri Jan 9 13:01:13 2009 +0000 3c507: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit e6c42b782684cd582599d5c177516ee27d50deb8 Author: Stephen Hemminger Date: Fri Jan 9 13:01:12 2009 +0000 3c505: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 878f64856d152ea4bab7dc3c279d0ee117901e1c Author: Stephen Hemminger Date: Fri Jan 9 13:01:11 2009 +0000 3c501: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a1799af4d7deefccdaa9d222a886fa1373dbb49a Author: Stephen Hemminger Date: Fri Jan 9 13:01:10 2009 +0000 com20020: convert to net_devic_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit bca5b8939f107e498b3fdc92b3a2d286a868d347 Author: Stephen Hemminger Date: Fri Jan 9 13:01:09 2009 +0000 arcnet: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 5803c5122acb31ebf5f76b1a9925e2c72c4436e1 Author: Stephen Hemminger Date: Fri Jan 9 13:01:08 2009 +0000 arcnet: convert to internal stats Use pre-existing network_device_stats inside network_device rather than own private structure. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 60961ce4d09db7c1ba49da3375123a18845ec864 Author: Stephen Hemminger Date: Fri Jan 9 13:01:07 2009 +0000 appletalk: remove unneeded stubs With net_device_ops if set_mac_address is null, then error is -EOPNOTSUPPORTED. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 3170c6568776a58e1eeec8ff949a65f5cf5d7ceb Author: Stephen Hemminger Date: Fri Jan 9 13:01:06 2009 +0000 rose: convert to network_device_ops Signed-off-by: Stephen Hemminger Acked-by: Ralf Baechle Signed-off-by: David S. Miller commit d289d120b46d9b6c68448b1d1c6d3edb94cdbde6 Author: Stephen Hemminger Date: Fri Jan 9 13:01:05 2009 +0000 rose: convert to internal net_device_stats Signed-off-by: Stephen Hemminger Acked-by: Ralf Baechle Signed-off-by: David S. Miller commit 0f6c5c8e79781974c0e660fd8bfc659b101b44fd Author: Stephen Hemminger Date: Fri Jan 9 13:01:04 2009 +0000 netrom: convert to net_device_ops Signed-off-by: Stephen Hemminger Acked-by: Ralf Baechle Signed-off-by: David S. Miller commit b51414b69148433a79af5dc93463a0489492a788 Author: Stephen Hemminger Date: Fri Jan 9 13:01:03 2009 +0000 netrom: convert to internal net_device_stats Signed-off-by: Stephen Hemminger Acked-by: Ralf Baechle Signed-off-by: David S. Miller commit 004b3225c016efc90cbfe43cdf69c6331462bc56 Author: Stephen Hemminger Date: Fri Jan 9 13:01:02 2009 +0000 lec: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 162619e59ab456aa689080726cb2ada24c1dfddd Author: Stephen Hemminger Date: Fri Jan 9 13:01:01 2009 +0000 lec: convert to internal network_device_stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 1a6afe8a733a3edaa1816c10ec2a7353ae0ff47b Author: Stephen Hemminger Date: Fri Jan 9 13:01:00 2009 +0000 clip: convert to internal network_device_stats Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 0ba25ff4c669e5395110ba6ab4958a97a9f96922 Author: Stephen Hemminger Date: Fri Jan 9 13:00:59 2009 +0000 br2684: convert to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 410e9d8f9ce962923b52096d40781a569803c760 Author: Stephen Hemminger Date: Fri Jan 9 13:00:58 2009 +0000 atm: br2684 internal stats Now that stats are in net_device, use them. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a17ac45a5da76f851faf0b6502f66c1205159469 Author: Krzysztof Helt Date: Wed Jan 21 15:14:09 2009 +0100 ALSA: ad1816a: enable hardware timer Enable hardware timer with 10 usec resolution. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit aa9c293ae46d71f5add0761bce8db67b162e3f29 Author: Krzysztof Helt Date: Wed Jan 21 15:08:03 2009 +0100 ALSA: do not create OPL3 timers if there is no OPL3 irq wired Most cards have OPL3 FM synthetiser but they do not have OPL3 interrupt wired to a sound chip or CPU. Do not create OPL3 timers for such cards as the timers are useless witthout interrupt. This patch removes OPL3 timers for following alsa drivers: snd-ad1816a, snd-opti93x, snd-opti92x, snd-sc6000, snd-cmi8330. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 80c509fdd74f3b158267374cc55156965c8bf930 Author: Steve Sakoman Date: Tue Jan 20 23:05:27 2009 -0800 ASoC: Complete Beagleboard support Commit dc06102a0c8b5aa0dd7f9a40ce241e793c252a87 in the asoc tree did not include the necessary Kconfig and Makefile changes. This patch completes the support for Beagleboard Signed-off-by: Steve Sakoman Acked-by: Jarkko Nikula Signed-off-by: Mark Brown commit c9864fd30a28aceef5293f28559c4a2f5a20d7d5 Author: Krzysztof Helt Date: Wed Jan 21 08:19:27 2009 +0100 ALSA: sscape: use common MPU401 macros Remove local macros which redefines the common ones. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 48972cc5101dee24243c1b53d409cc27880e7a29 Author: Krzysztof Helt Date: Wed Jan 21 08:18:16 2009 +0100 ALSA: cmi8330: add OPL3 support Add OPL3 handling to the driver and volume control for FM synthesis. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 08989930f91e4802b94e03eb54e5385bac112811 Author: Takashi Iwai Date: Wed Jan 21 07:43:23 2009 +0100 ALSA: hda - Remove old models for STAC9872 from the document Signed-off-by: Takashi Iwai commit 1e137f929bb490ff615ea475ac3904d58b0cdd5e Author: Takashi Iwai Date: Wed Jan 21 07:41:22 2009 +0100 ALSA: hda - Clean up old VAIO hack codes for STAC9872 Get rid of old VAIO static hack codes for STAC9872 and use the BIOS auto-parser for all models. Signed-off-by: Takashi Iwai commit d30e6caac2faade5e11ab7e0b5548236b5a5d854 Merge: e64f14f... 65557f3... Author: Takashi Iwai Date: Wed Jan 21 07:34:08 2009 +0100 Merge branch 'topic/hda' into next/hda commit 56692396447ca3fee061c26f22590a1046fd2d6b Merge: 927b0ae... 8a9dee5... Author: Mark Brown Date: Tue Jan 20 20:37:19 2009 +0000 Merge branch 'for-2.6.29' into for-2.6.30 commit 927b0aea93bb324d743e575659e10d6d76818e4b Author: Ian Molton Date: Mon Jan 19 17:23:11 2009 +0000 ASoC: Fix WM9705 capture switch name This patch fixes the acpture switch name so that it better reflects its purpose. Signed-off-by: Ian Molton Signed-off-by: Mark Brown commit 75d91f9bc6d36b8d0ceef1cb75a4ac2b5c8a51d0 Author: Timur Tabi Date: Mon Jan 19 11:57:46 2009 -0600 ASoC: Allow Freescale MPC8610 audio drivers to be compiled as modules Change the Kconfig and Makefile options for Freescale MPC8610 audio drivers so that they can be compiled as modules, and simplify the Kconfig choices so that only the platform is selected. Also fix the naming of the driver files to conform to ALSA standards. [Removed extraneous SND_SOC dependency -- broonie] Signed-off-by: Timur Tabi Signed-off-by: Mark Brown commit e64f14f4e570d6ec5bc88abac92a3a27150756d7 Author: Takashi Iwai Date: Tue Jan 20 18:32:55 2009 +0100 ALSA: hda - Allow digital-only I/O on ALC262 codec Some laptops like VAIO have multiple codecs and uses ALC262 only for the SPIDF output without analog I/O. So far, the codec-parser assumes the presence of analog I/O and returned an error for such a case. This patch adds some hacks to allow the digital-only configuration for ALC262. Signed-off-by: Takashi Iwai commit 8c441982fdc00f77b7aa609061c6411f47bcceda Author: Takashi Iwai Date: Tue Jan 20 18:30:20 2009 +0100 ALSA: hda - Assign proper digital I/O type for STAC/IDT Assign the proper PCM digital I/O type (HDA_PCM_TYPE_*) for the digital I/O on STAC/IDT codecs. HDA_PCM_TYPE_HDMI is assigned for the HDMI I/O. A similar framework is implemented to patch_realtek.c, but it's not set up and still using only HDA_PCM_TYPE_SPDIF yet. Signed-off-by: Takashi Iwai commit 2297bd6e526ce1469279284ffda9140f8d60ea84 Author: Takashi Iwai Date: Tue Jan 20 18:24:13 2009 +0100 ALSA: hda - Check HDMI jack types in the auto configuration Add dig_out_type and dig_in_type fields to autocfg struct. A proper HDA_PCM_TYPE_* value is assigned to these fields according to the pin-jack location type value. Signed-off-by: Takashi Iwai commit 41b5b01afb71226653282951965d5efa9d7b843d Author: Takashi Iwai Date: Tue Jan 20 18:21:23 2009 +0100 ALSA: hda - Don't break the PCM creation loop Don't break the loop in snd_hda_codec_build_pcms() even if the item has no substreams. It's possible that it's an empty item and the next item containing the valid substreams (e.g. realtek codecs may create the analog and alt-analog but no digitl streams). Signed-off-by: Takashi Iwai commit caa10b6e808a4d65eb0306f0006308244f2b8d79 Author: Takashi Iwai Date: Tue Jan 20 17:19:01 2009 +0100 ALSA: hda - Improve auto-probing of STAC9872 codec Use the standard STAC/IDT auto-probing routine for non-static STAC9872 codec probing. Signed-off-by: Takashi Iwai commit 1b52ae701fedf97f9984e73b6a1fe2444230871b Author: Takashi Iwai Date: Tue Jan 20 17:17:29 2009 +0100 ALSA: hda - Detect non-SPDIF digital I/O Accept non-SPDIF digital I/O pins as the digital pins. These are usually corresponding to HDMI I/O. Signed-off-by: Takashi Iwai commit 89ce9e87083216389d2ff5740cc60f835537d8d0 Author: Takashi Iwai Date: Tue Jan 20 17:15:57 2009 +0100 ALSA: hda - Add debug prints for digital I/O pin detections Add the debug prints for digital I/O pin detections in snd_hda_parse_pin_def_config() function. Signed-off-by: Takashi Iwai commit 7c7767ebe2fa847c91a0dd5551ca422aba359473 Author: Takashi Iwai Date: Tue Jan 20 15:28:38 2009 +0100 ALSA: hda - Halve too large volume scales for STAC/IDT codecs STAC/IDT codecs have often too large volume scales such as -96dB, and exposing this as is results in too large scale in percentage representation. This patch adds the check of the volume scale and halves the volume range if it's too large automatically. Signed-off-by: Takashi Iwai commit 29fdbec2dcb1ce364812778271056aa9516ff3ed Author: Takashi Iwai Date: Tue Jan 20 13:07:55 2009 +0100 ALSA: hda - Add extra volume offset to standard volume amp macros Added the volume offset to base for the standard volume controls to handle elements with too big volume scales like -96dB..0dB. For such elements, you can set the base volume to reduce the range. Signed-off-by: Takashi Iwai commit b2a19d02396c92294abcddee5bd9bd49cc4e4d1c Author: Mark Brown Date: Sat Jan 17 19:14:26 2009 +0000 ASoC: Staticise PCM operations tables The PCM operations tables are not exported directly but are instead included in the platform structure so should be declared static. Signed-off-by: Mark Brown commit 91432e976ff1323e5dd6f52498969602953c6ee9 Author: Ian Molton Date: Sat Jan 17 17:44:23 2009 +0000 ASoC: fixes to caching implementations This patch takes fixes a number of bugs in the caching code used by several ASoC codec drivers. Mostly off-by-one fixes. Signed-off-by: Ian Molton Signed-off-by: Mark Brown commit 28796eaf806502b9bd86cbacf8edbc14c80c14b0 Author: Ian Molton Date: Sat Jan 17 15:11:06 2009 +0000 ASoC: machine support for Toshiba e740 PDA This patch provides suupport for the wm9705 AC97 codec on the Toshiba e740. Note: The e740 has a hard headphone switch that turns the speaker off and is not software detectable or controlable. Also both headphone and speaker amps share a common output enable. Signed-off-by: Ian Molton Signed-off-by: Mark Brown commit 2c782f5981a022f7a238d550af5daa75c8acf382 Author: Mark Brown Date: Fri Jan 16 16:35:52 2009 +0000 ASoC: Implement support for CLK_POUT as MCLK on Zylonite The Zylonite supports switching the MCLK for the WM9713 between the AC97CLK and CLK_POUT outputs of the PXA processor via switch SW15 on the board. This patch adds support for configuring the system to use CLK_POUT. Unfortunately it is not possible to read the state of SW15 from software so this feature is controlled by a module option 'clk_pout' which should be set to a non-zero value to enable the use of CLK_POUT. Signed-off-by: Mark Brown commit cade9f8a9cf1cd41f6f9e8850c6a0465a21248c3 Author: Jaroslav Kysela Date: Mon Jan 19 12:08:58 2009 +0100 ALSA: Release v1.0.19 Signed-off-by: Jaroslav Kysela Signed-off-by: Takashi Iwai commit f3a374e55a60f7ca57335c24ef875731b6683147 Author: Takashi Iwai Date: Mon Jan 19 14:30:48 2009 +0100 ALSA: ca0106 - Add quirk for GA-G1975X mobo Giga-byte GA-G1975X mobo has a CA0106 on-board chip. Reference: bnc#395807 https://bugzilla.novell.com/show_bug.cgi?id=395807 Signed-off-by: Takashi Iwai commit 6e9ed0cc4b963fde66ab47d9fb19147631e44555 Author: Américo Wang Date: Mon Jan 19 02:00:38 2009 +0800 slob: clean up the code - Use NULL instead of plain 0; - Rename slob_page() to is_slob_page(); - Define slob_page() to convert void* to struct slob_page*; - Rename slob_new_page() to slob_new_pages(); - Define slob_free_pages() accordingly. Compile tests only. Signed-off-by: WANG Cong Signed-off-by: Matt Mackall Cc: Christoph Lameter Signed-off-by: Pekka Enberg commit cd89596f0ccfa3ccb8a81ce47782231cf7ea7296 Author: David P. Quigley Date: Fri Jan 16 09:22:04 2009 -0500 SELinux: Unify context mount and genfs behavior Context mounts and genfs labeled file systems behave differently with respect to setting file system labels. This patch brings genfs labeled file systems in line with context mounts in that setxattr calls to them should return EOPNOTSUPP and fscreate calls will be ignored. Signed-off-by: David P. Quigley Acked-by: Eric Paris Signed-off-by: James Morris commit 11689d47f0957121920c9ec646eb5d838755853a Author: David P. Quigley Date: Fri Jan 16 09:22:03 2009 -0500 SELinux: Add new security mount option to indicate security label support. There is no easy way to tell if a file system supports SELinux security labeling. Because of this a new flag is being added to the super block security structure to indicate that the particular super block supports labeling. This flag is set for file systems using the xattr, task, and transition labeling methods unless that behavior is overridden by context mounts. Signed-off-by: David P. Quigley Acked-by: Eric Paris Signed-off-by: James Morris commit 0d90a7ec48c704025307b129413bc62451b20ab3 Author: David P. Quigley Date: Fri Jan 16 09:22:02 2009 -0500 SELinux: Condense super block security structure flags and cleanup necessary code. The super block security structure currently has three fields for what are essentially flags. The flags field is used for mount options while two other char fields are used for initialization and proc flags. These latter two fields are essentially bit fields since the only used values are 0 and 1. These fields have been collapsed into the flags field and new bit masks have been added for them. The code is also fixed to work with these new flags. Signed-off-by: David P. Quigley Acked-by: Eric Paris Signed-off-by: James Morris commit 8693290b9038f32b6b9bafd97b7e18465d62655b Author: Andreas Bergmeier Date: Sun Jan 18 18:48:03 2009 +0100 ALSA: usb-audio - Quirk for Serato phono Ignore errors (wrong usb interface data) found when using the serato scratch live box with alsa Thus the alsa controls can be accessed (beware: they don't work though - but at least it's one ugly error message less) Signed-off-by: Andreas Bergmeier Signed-off-by: Takashi Iwai commit 9c3da0991754d480328eeaa2b90cb231a1cea9b6 Author: Harvey Harrison Date: Sat Jan 17 17:11:57 2009 -0800 IB: Remove __constant_{endian} uses The base versions handle constant folding just fine, use them directly. The replacements are OK in the include/ files as they are not exported to userspace so we don't need the __ prefixed versions. This patch does not affect code generation at all. Signed-off-by: Harvey Harrison Signed-off-by: Roland Dreier commit 9ef344f89ac41116d4ab138b0941c784a3ab8cf4 Author: Krzysztof Helt Date: Fri Jan 16 22:47:30 2009 +0100 ALSA: wss-lib: remove "pops" before each played sound A WSS codec is autocalibrated each time before playing sound. Do only one calibration during codec initialization. Complete snd_wss_calibrate_mute to mute loopback volume as well. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit d1a020050c6ce1a0794ff73582ccf47e4db536f7 Merge: dc61b66... 641b487... Author: Takashi Iwai Date: Sat Jan 17 12:01:12 2009 +0100 Merge branch 'topic/usb-mixer-cache' into next/usb-audio commit c42f69bb064333624dcc1452ed109441c3c9e7b4 Author: Mark Brown Date: Fri Jan 16 16:31:03 2009 +0000 ASoC: Ignore output frequency for WM9713 PLL The WM9713 driver does not support configuring the PLL output frequency so the output frequency parameter is irrelevant. Allow users to set it to zero by ignoring it. Signed-off-by: Mark Brown commit 74296a8ed6aa3c5bf672808ada690de7ba323ecc Author: Ingo Molnar Date: Fri Jan 16 17:43:50 2009 +0100 irq: provide debug_poll_all_shared_irqs() method under CONFIG_DEBUG_SHIRQ Provide a shared interrupt debug facility under CONFIG_DEBUG_SHIRQ: it uses the existing irqpoll facilities to iterate through all registered interrupt handlers and call those which can handle shared IRQ lines. This can be handy for suspend/resume debugging: if we call this function early during resume we can trigger crashes in those drivers which have incorrect assumptions about when exactly their ISRs will be called during suspend/resume. Signed-off-by: Ingo Molnar commit 5a2dd72abdae75ea2960145e0549635ce4e0be96 Merge: efdc64f... 7cb36b6... Author: Ingo Molnar Date: Fri Jan 16 17:46:22 2009 +0100 Merge branch 'linus' into irq/genirq commit 2905a5df4a1600bc3c9ecace2fa65404196d1fda Merge: 0465c7a... 591046c... Author: Mark Brown Date: Fri Jan 16 16:40:35 2009 +0000 Merge branch 'for-2.6.29' into for-2.6.30 commit 0465c7aa6fbab89de820442aed449ceb8d9145a6 Author: Ian Molton Date: Thu Jan 8 21:16:05 2009 +0000 ASoC: machine driver for Toshiba e800 This patch adds support for the wm9712 ac97 codec as used in the Toshiba e800 PDA. It includes support for powering up / down the external headphone and speaker amplifiers on this machine. Signed-off-by: Ian Molton Signed-off-by: Mark Brown commit a7e2e735dcf98717150d3c8eaa731de8038af05a Author: Ian Molton Date: Thu Jan 8 21:03:55 2009 +0000 ASoC: machine driver for Toshiba e750 This patch adds support for the wm9705 ac97 codec as used in the Toshiba e750 PDA. It includes support for powering up / down the external headphone and speaker amplifiers on this machine. Signed-off-by: Ian Molton Signed-off-by: Mark Brown commit 2aceefefc891e85d336c1d95d9d89fd785f5d44c Author: Ian Molton Date: Fri Jan 16 11:04:18 2009 +0000 ASoC: Driver for the WM9705 AC97 codec. This driver adds support for the wm9705 ac97 codec. The driver supports audio input and output. Signed-off-by: Ian Molton Signed-off-by: Mark Brown commit ceacc2c1c85ac498ca4cf297bdfe5b4aaa9fd0e0 Author: Peter Zijlstra Date: Fri Jan 16 14:46:40 2009 +0100 sched: make plist a library facility Ingo Molnar wrote: > here's a new build failure with tip/sched/rt: > > LD .tmp_vmlinux1 > kernel/built-in.o: In function `set_curr_task_rt': > sched.c:(.text+0x3675): undefined reference to `plist_del' > kernel/built-in.o: In function `pick_next_task_rt': > sched.c:(.text+0x37ce): undefined reference to `plist_del' > kernel/built-in.o: In function `enqueue_pushable_task': > sched.c:(.text+0x381c): undefined reference to `plist_del' Eliminate the plist library kconfig and make it available unconditionally. Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 34cb61359b503d7aff6447acb037a5efd6ce93b2 Author: Ingo Molnar Date: Fri Jan 16 13:36:06 2009 +0100 sched: fix !CONFIG_SCHEDSTATS build failure Stephen Rothwell reported this linux-next build failure with !CONFIG_SCHEDSTATS: | In file included from kernel/sched.c:1703: | kernel/sched_fair.c: In function 'adaptive_gran': | kernel/sched_fair.c:1324: error: 'struct sched_entity' has no member named 'avg_wakeup' The start_runtime and avg_wakeup metrics are now not just for statistics, but also for scheduling - so they always need to be available. (Also move out the nr_migrations fields - for future perfcounters usage.) Reported-by: Stephen Rothwell Signed-off-by: Ingo Molnar commit 2d68259db26ad57fd9643f1c69b5181ec9836ca9 Author: Magnus Damm Date: Fri Jan 16 17:14:38 2009 +0900 clockevents: let set_mode() setup delta information Allow the set_mode() clockevent callback to decide and fill in delta details such as shift, mult, max_delta_ns and min_delta_ns. With this change the clockevent can be registered without delta details which allows us to keep the parent clock disabled until the clockevent gets setup using set_mode(). Letting set_mode() fill in or update delta details allows us to save power by disabling the parent clock while the clockevent is unused. This may however make the parent clock rate change, so next time the clockevent gets enabled we need let set_mode() to update the detla details accordingly. Doing it at registration time is not enough. Furthermore, the delta details seem unused in the case of periodic-only clockevent drivers, so this change also allows registration of such drivers without the delta details filled in. Signed-off-by: Magnus Damm Signed-off-by: Thomas Gleixner commit 2165592b837e086f2b94835a2d81e6f3199c1319 Author: Daniel Mack Date: Fri Jan 16 11:03:19 2009 +0100 ALSA: snd-usb-caiaq: support for two more audio devices - Added support for two new audio devices from Native Instuments, 'Audio4DJ' and 'GuitarRig mobile' - Add missing statement about 'Session IO' in Kconfig help text - Version number bumped to 1.3.11 Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 61f3632fdcdcf547f6487f56b45976d7964756c4 Author: Haavard Skinnemoen Date: Wed Jan 14 13:32:53 2009 +0100 avr32: fix out-of-range rjmp instruction on large kernels Use .subsection to place fixups closer to their jump targets. This increases the maximum size of the kernel before we get link errors significantly. The problem here is that we don't have a "call"-ish pseudo-instruction to use instead of rjmp...we could add one, but that means we'll have to wait for a new toolchain release, wait until we're fairly sure most people are using it, etc... As an added bonus, it should decrease the RAM footprint slightly, though it might pollute the icache a bit more. Signed-off-by: Haavard Skinnemoen commit 8d29b7b9f81d6b83d869ff054e6c189d6da73f1f Author: Ben Nizette Date: Wed Jan 14 09:32:19 2009 +1100 avr32: Fix out-of-range rcalls in large kernels Replace handcoded rcall instructions with the call pseudo-instruction. For kernels too far over 1MB the rcall instruction can't reach and linking will fail. We already call the final linker with --relax which converts call pseudo-instructions to the right things anyway. This fixes arch/avr32/kernel/built-in.o: In function `syscall_exit_work': (.ex.text+0x198): relocation truncated to fit: R_AVR32_22H_PCREL against symbol `schedule' defined in .sched.text section in kernel/built-in.o arch/avr32/kernel/built-in.o: In function `fault_exit_work': (.ex.text+0x3b6): relocation truncated to fit: R_AVR32_22H_PCREL against symbol `schedule' defined in .sched.text section in kernel/built-in.o But I'm still left with arch/avr32/kernel/built-in.o:(.fixup+0x2): relocation truncated to fit: R_AVR32_22H_PCREL against `.text'+45a arch/avr32/kernel/built-in.o:(.fixup+0x8): relocation truncated to fit: R_AVR32_22H_PCREL against `.text'+8ea arch/avr32/kernel/built-in.o:(.fixup+0xe): relocation truncated to fit: R_AVR32_22H_PCREL against `.text'+abe arch/avr32/kernel/built-in.o:(.fixup+0x14): relocation truncated to fit: R_AVR32_22H_PCREL against `.text'+ac8 arch/avr32/kernel/built-in.o:(.fixup+0x1a): relocation truncated to fit: R_AVR32_22H_PCREL against `.text'+ad2 arch/avr32/kernel/built-in.o:(.fixup+0x20): relocation truncated to fit: R_AVR32_22H_PCREL against `.text'+adc arch/avr32/kernel/built-in.o:(.fixup+0x26): relocation truncated to fit: R_AVR32_22H_PCREL against `.text'+ae6 arch/avr32/kernel/built-in.o:(.fixup+0x2c): relocation truncated to fit: R_AVR32_22H_PCREL against `.text'+af0 arch/avr32/kernel/built-in.o:(.fixup+0x32): additional relocation overflows omitted from the output These are caused by a similar problem with 'rjmp' instructions. Unfortunately, there's no easy fix for these at the moment since we don't have a arbitrary-range 'jmp' instruction similar to 'call'. Signed-off-by: Ben Nizette Signed-off-by: Haavard Skinnemoen commit ac37373b6463d32955c6ac6b753d5e5b0946a791 Author: Hugo Villeneuve Date: Thu Jan 15 15:40:35 2009 -0500 ASoC: DaVinci: Fix SFFSDR compilation error. Remove dependency on sffsdr_fpga_set_codec_fs() when the SFFSDR FPGA module is not selected. Signed-off-by: Hugo Villeneuve Signed-off-by: Mark Brown commit 5f17e79cdf530b1a6090c65730e5656ac9c19eaa Author: Johannes Berg Date: Thu Jan 15 18:22:31 2009 +0100 ALSA: snd-aoa: handle master-amp if present Some machines have a master amp GPIO that needs to be toggled to get sound output, in addition to speaker/headphone/line-out amps. This makes snd-aoa handle it, if present in the device tree, thus making snd-aoa be able to output sound on PowerMac3,6, which was previously handled by snd-powermac which also doesn't use the master amp GPIO. Signed-off-by: Johannes Berg Signed-off-by: Takashi Iwai commit 45e513b689b8b0a01ec2b01cc21816e4780d7ea6 Author: Johannes Berg Date: Thu Jan 15 18:21:48 2009 +0100 ALSA: snd-aoa: handle older machines This patch changes snd-aoa to handle some older machines that are currently handled by snd-powermac. snd-aoa has a number of advantages though, notably it can autoload better and is generally a more modern driver. By hardcoding the accepted device-ids (last hunk of the patch) I'm trying to avoid regressions because this driver will otherwise load automatically and not let snd-powermac load. People who are unhappy with snd-powermac and have a device-id property in the device tree are encouraged to read this patch and make a patch to amend this as appropriate. Signed-off-by: Johannes Berg Signed-off-by: Takashi Iwai commit c0106d72b8d71696dbe9dc80e2c77d4ac63f7531 Merge: 5852973... eff317d... Author: Takashi Iwai Date: Thu Jan 15 18:27:20 2009 +0100 Merge branch 'topic/asoc' into next/asoc commit 641b4879444c0edb276fedca5c2fcbd2e5c70044 Author: Takashi Iwai Date: Thu Jan 15 17:05:24 2009 +0100 ALSA: usb-audio - Cache mixer values Cache mixer values in usb-audio driver to reduce too excessive accesses to the hardware. Signed-off-by: Takashi Iwai commit e52fb7c097238d34f4d8e2a596f8a3f85b0c0565 Author: Peter Zijlstra Date: Wed Jan 14 12:39:19 2009 +0100 sched: prefer wakers Prefer tasks that wake other tasks to preempt quickly. This improves performance because more work is available sooner. The workload that prompted this patch was a kernel build over NFS4 (for some curious and not understood reason we had to revert commit: 18de9735300756e3ca9c361ef58409d8561dfe0d to make any progress at all) Without this patch a make -j8 bzImage (of x86-64 defconfig) would take 3m30-ish, with this patch we're down to 2m50-ish. psql-sysbench/mysql-sysbench show a slight improvement in peak performance as well, tbench and vmark seemed to not care. It is possible to improve upon the build time (to 2m20-ish) but that seriously destroys other benchmarks (just shows that there's more room for tinkering). Much thanks to Mike who put in a lot of effort to benchmark things and proved a worthy opponent with a competing patch. Signed-off-by: Peter Zijlstra Signed-off-by: Mike Galbraith Signed-off-by: Ingo Molnar commit 831451ac4e44d3a20b581ce726ef1d1144373f7d Author: Peter Zijlstra Date: Wed Jan 14 12:39:18 2009 +0100 sched: introduce avg_wakeup Introduce a new avg_wakeup statistic. avg_wakeup is a measure of how frequently a task wakes up other tasks, it represents the average time between wakeups, with a limit of avg_runtime for when it doesn't wake up anybody. Signed-off-by: Peter Zijlstra Signed-off-by: Mike Galbraith Signed-off-by: Ingo Molnar commit 6047a007d0f6b7395cd158f3bdda34ab39a48821 Author: Pekka Enberg Date: Wed Jan 14 12:22:25 2009 +0200 SLUB: Use ->objsize from struct kmem_cache_cpu in slab_free() There's no reason to use ->objsize from struct kmem_cache in slab_free() for the SLAB_DEBUG_OBJECTS case. All it does is generate extra cache pressure as we try very hard not to touch struct kmem_cache in the fast-path. Signed-off-by: Pekka Enberg commit 398a153b16b09a68739928d4502455db9725ac86 Author: Gregory Haskins Date: Wed Jan 14 09:10:04 2009 -0500 sched: fix build error in kernel/sched_rt.c when RT_GROUP_SCHED && !SMP Ingo found a build error in the scheduler when RT_GROUP_SCHED was enabled, but SMP was not. This patch rearranges the code such that it is a little more streamlined and compiles under all permutations of SMP, UP and RT_GROUP_SCHED. It was boot tested on my 4-way x86_64 and it still passes preempt-test. Signed-off-by: Gregory Haskins commit b07430ac37103218b5c1e542490a1b98e6deb3d6 Author: Gregory Haskins Date: Wed Jan 14 08:55:39 2009 -0500 sched: de CPP-ify the scheduler code Signed-off-by: Gregory Haskins commit b1a0aac05f044e78a589bfd7a9e2334aa640eb45 Author: Takashi Iwai Date: Wed Jan 14 09:34:06 2009 +0100 ALSA: opti9xx - Fix build breakage by snd_card_create() conversion Add a missing variable declaration. Signed-off-by: Takashi Iwai commit dc61b66fc724f89d357c43e2319d2cb7bec1e517 Author: Andrea Borgia Date: Mon Jan 12 23:17:47 2009 +0100 ALSA: rename "Device" to "Toshiba SB-0500" via quirks Signed-off-by: Andrea Borgia Signed-off-by: Takashi Iwai commit 554b91edec1c588b889a7357ff201c0a450e31ff Author: Krzysztof Helt Date: Mon Jan 12 21:25:04 2009 +0100 ALSA: sscape: fix incorrect timeout after microcode upload A comment states that one should wait up to 5 secs while a waiting loop waits only 5 system ticks. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 0b0f0b1c2c87de299df6f92a8ffc0a73bd1bb960 Author: Yinghai Lu Date: Sun Jan 11 13:35:56 2009 -0800 sparseirq: use kstat_irqs_cpu on non-x86 architectures too so we could move kstat_irqs array to irq_desc struct. Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar commit 42bb8cc5e81028e217105299001070d57eb84ad7 Author: Andi Kleen Date: Fri Jan 9 12:17:40 2009 -0800 x86: hpet: allow force enable on ICH10 HPET Intel "Smackover" x58 BIOS don't have HPET enabled in the BIOS, so allow to force enable it at least. The register layout is the same as in other recent ICHs, so all the code can be reused. Using numerical PCI-ID because it's unlikely the PCI-ID will be used anywhere else. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar commit 183c6e0fb4e39c860960de4abd7541bd260491bb Author: Takashi Iwai Date: Mon Jan 12 15:19:08 2009 +0100 drivers/usb/gadget: Convert to snd_card_create() Convert from snd_card_new() to the new snd_card_create() function for gmidi. Signed-off-by: Takashi Iwai commit 6ff1871617a3ea1eeaf88b42f652f9a311826bad Author: Takashi Iwai Date: Mon Jan 12 15:18:28 2009 +0100 drivers/staging: Convert to snd_card_create() for go7007 Convert from snd_card_new to the new snd_card_create() for go7007. Signed-off-by: Takashi Iwai commit 758021bfa9ea25c58e62d2f68512628b19502ce7 Author: Takashi Iwai Date: Mon Jan 12 15:17:09 2009 +0100 drivers/media: Convert to snd_card_create() Convert from snd_card_new() to the new snd_card_create() function. Signed-off-by: Takashi Iwai commit 2fa51107c9aa80ae95b4524198442cdea82d08a3 Author: Takashi Iwai Date: Sun Dec 28 17:03:56 2008 +0100 ALSA: Return proper error code at probe in sound/pcmcia/* Signed-off-by: Takashi Iwai commit aa3d75d80de464cf23af1d068a5e22f1527b6957 Author: Takashi Iwai Date: Sun Dec 28 16:59:41 2008 +0100 ALSA: pdaudiocf - Fix missing free in the error path Added the missing snd_card_free() in the error path of probe callback. Signed-off-by: Takashi Iwai commit 51721f70acaca5aa056b07c5cbe58e62662c068c Author: Takashi Iwai Date: Sun Dec 28 16:55:08 2008 +0100 ALSA: Return proper error code at probe in sound/usb/* Some drivers in soudn/usb/* don't handle the error code properly from snd_card_create(). This patch fixes these places. Signed-off-by: Takashi Iwai commit 3e7fb9f7ec00fd7cefd0d8e83df0cff86ce12515 Author: Takashi Iwai Date: Sun Dec 28 16:47:30 2008 +0100 ALSA: Return proper error code at probe in sound/isa/* Some drivers in sound/isa/* don't handle the error code properly from snd_card_create(). This patch fixes these places. Signed-off-by: Takashi Iwai commit d453379bc5d34d7f55b55931245de5ac1896fd8d Author: Takashi Iwai Date: Sun Dec 28 16:45:34 2008 +0100 ALSA: Update description of snd_card_create() in documents Signed-off-by: Takashi Iwai commit bd7dd77c2a05c530684eea2e3af16449ae9c5d52 Author: Takashi Iwai Date: Sun Dec 28 16:45:02 2008 +0100 ALSA: Convert to snd_card_create() in other sound/* Convert from snd_card_new() to the new snd_card_create() function in other sound subdirectories. Signed-off-by: Takashi Iwai commit e58de7baf7de11f01a675cbbf6ecc8a2758b9ca5 Author: Takashi Iwai Date: Sun Dec 28 16:44:30 2008 +0100 ALSA: Convert to snd_card_create() in sound/pci/* Convert from snd_card_new() to the new snd_card_create() function in sound/pci/*. Signed-off-by: Takashi Iwai commit c95eadd2f1afd2ba643e85a8dfc9079a3f03ae47 Author: Takashi Iwai Date: Sun Dec 28 16:43:35 2008 +0100 ALSA: Convert to snd_card_create() in sound/isa/* Convert from snd_card_new() to the new snd_card_create() function. Signed-off-by: Takashi Iwai commit 53fb1e63599438bd5f6fbb852023d80916d83983 Author: Takashi Iwai Date: Sun Dec 28 16:32:08 2008 +0100 ALSA: Introduce snd_card_create() Introduced snd_card_create() function as a replacement of snd_card_new(). The new function returns a negative error code so that the probe callback can return the proper error code, while snd_card_new() can give only NULL check. The old snd_card_new() is still provided as an inline function but with __deprecated attribute. It'll be removed soon later. Signed-off-by: Takashi Iwai commit e3ee1e123183ca9847e74b7b8e2694c9e3b817a6 Merge: 5762ba1... c597650... Author: Ingo Molnar Date: Mon Jan 12 11:32:03 2009 +0100 Merge commit 'v2.6.29-rc1' into timers/hrtimers Conflicts: kernel/time/tick-common.c commit d178a1eb5c034df1f74a2b67bf311afa5d6b8e95 Author: Yinghai Lu Date: Sun Jan 11 00:35:42 2009 -0800 sparseirq: fix build with unknown irq_desc struct Ingo Molnar wrote: > > tip/kernel/fork.c: In function 'copy_signal': > tip/kernel/fork.c:825: warning: unused variable 'ret' > tip/drivers/char/random.c: In function 'get_timer_rand_state': > tip/drivers/char/random.c:584: error: dereferencing pointer to incomplete type > tip/drivers/char/random.c: In function 'set_timer_rand_state': > tip/drivers/char/random.c:594: error: dereferencing pointer to incomplete type > make[3]: *** [drivers/char/random.o] Error 1 irq_desc is defined in linux/irq.h, so include it in the genirq case. Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar commit dee4102a9a5882b4f7d5cc165ba29e8cc63cf92e Author: Yinghai Lu Date: Sun Jan 11 00:29:15 2009 -0800 sparseirq: use kstat_irqs_cpu instead Impact: build fix Ingo Molnar wrote: > tip/arch/blackfin/kernel/irqchip.c: In function 'show_interrupts': > tip/arch/blackfin/kernel/irqchip.c:85: error: 'struct kernel_stat' has no member named 'irqs' > make[2]: *** [arch/blackfin/kernel/irqchip.o] Error 1 > make[2]: *** Waiting for unfinished jobs.... > So could move kstat_irqs array to irq_desc struct. (s390, m68k, sparc) are not touched yet, because they don't support genirq Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar commit 199f7978730a4bbd88038fd84212b30759579f1a Author: Krzysztof Helt Date: Fri Jan 9 23:10:52 2009 +0100 ALSA: wss-lib: move AD1845 frequency setting into wss-lib This is required to allow the sscape driver to autodetect installed codec. Also, do not create a timer if detected codec has no hardware timer (e.g. AD1848). Signed-off-by: Krzysztof Helt Cc: Rene Herman Signed-off-by: Takashi Iwai commit 0a6d4e1dc9154c4376358663d74060d1e33d203e Merge: c597650... 1563513... Author: Ingo Molnar Date: Sun Jan 11 04:58:49 2009 +0100 Merge branch 'sched/latest' of git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins/linux-2.6-hacks into sched/rt commit d7e51e66899f95dabc89b4d4c6674a6e50fa37fc Author: Yinghai Lu Date: Wed Jan 7 15:03:13 2009 -0800 sparseirq: make some func to be used with genirq Impact: clean up sparseirq fallout on random.c Ingo suggested to change some ifdef from SPARSE_IRQ to GENERIC_HARDIRQS so we could some #ifdef later if all arch support genirq Signed-off-by: Yinghai Lu Acked-by: Matt Mackall Signed-off-by: Ingo Molnar commit e8b722f487589a1f60ca27adc695494f188d404e Merge: 01d0782... c597650... Author: Ingo Molnar Date: Sun Jan 11 04:45:50 2009 +0100 Merge commit 'v2.6.29-rc1' into irq/urgent commit 5852973c129cf7c7e6c229abb7250673fc2a50c9 Merge: 3e8e195... c6d1662... Author: Mark Brown Date: Fri Jan 9 11:03:55 2009 +0000 Merge branch 'for-2.6.29' into for-2.6.30 commit 3e8e1952e3a3dd59b11233a532ca68e6471742d9 Author: Ian Molton Date: Fri Jan 9 00:23:21 2009 +0000 ASoC: cleanup duplicated code. Many codec drivers were implementing cookie-cutter copies of the function that adds kcontrols to the codec. This patch moves this code to a common function snd_soc_add_controls() in soc-core.c and updates all drivers using copies of this function to use the new common version. [Edited to raise priority of error log message and document parameters. -- broonie] Signed-off-by: Ian Molton Signed-off-by: Mark Brown commit a6ba2b2dabb583e7820e567fb309d771b50cb9ff Author: Mark Brown Date: Thu Jan 8 15:16:16 2009 +0000 ASoC: Implement WM8350 headphone jack detection Signed-off-by: Mark Brown commit 8a2cd6180f8fa00111843c2f4a4f4361995358e0 Author: Mark Brown Date: Wed Jan 7 17:31:10 2009 +0000 ASoC: Add jack reporting interface This patch adds a jack reporting interface to ASoC. This wraps the ALSA core jack detection functionality and provides integration with DAPM to automatically update the power state of pins based on the jack state. Since embedded platforms can have multiple detecton methods used for a single jack (eg, separate microphone and headphone detection) the report function allows specification of which bits are being updated on a given report. The expected usage is that machine drivers will create jack objects and then configure jack detection methods to update that jack. Signed-off-by: Mark Brown commit 1649923dd52ce914be98bff0ae352344ef04f305 Author: Mark Brown Date: Wed Jan 7 18:25:13 2009 +0000 ASoC: Constify pin names for DAPM pin status APIs Signed-off-by: Mark Brown commit 3195954da9cdb1cadb2059921c62e69d376c624f Author: Andrea Borgia Date: Wed Jan 7 22:58:50 2009 +0100 ALSA: preliminary support for Toshiba SB-0500 The Toshiba Multimedia Center SB-0500 is a rebranded version of the Creative Technology SB Live! 24-bit External: it shares the same chipset and only has minor cosmetic differences. Remote controller works with alsa_usb module, basic audio is there and mixer controls are mostly untested. Signed-off-by: Andrea Borgia Signed-off-by: Takashi Iwai commit 01d07820a0df6b6134c1bb75b1e84c9d0cdab3be Author: KOSAKI Motohiro Date: Sun Jan 4 03:11:05 2009 +0900 sparseirq: make for_each_irq_desc() more robust Raja reported for_each_irq_desc() has possibility unsafeness: if anyone write folliwing code, for_each_irq_desc() doesn't work as intended: (right now this code does not exist at all) if (safe) for_each_irq_desc(irq, desc) { ... } else panic(); Reported-by: Raja R Harinath Signed-off-by: KOSAKI Motohiro Signed-off-by: Ingo Molnar commit ca9c1aaec4187fc9922cfb6b283fffef89286943 Author: Ian Molton Date: Tue Jan 6 20:11:51 2009 +0000 ASoC: dapm: Allow explictly named mixer controls This patch allows you to define the mixer paths as having the same name as the paths they represent. This is required to support codecs such as the wm9705 neatly without extra controls in the alsa mixer. Signed-off-by: Ian Molton commit d506fc322ec2af04fc47be83d796a1c9e1a16022 Author: Jani Nikula Date: Wed Jan 7 11:54:25 2009 +0200 ALSA: Add support for video out to the jack reporting API Add support for reporting new jack types SND_JACK_VIDEOOUT and SND_JACK_AVOUT (a combination of LINEOUT and VIDEOOUT) to the jack reporting API. Also add the corresponding SW_VIDEOOUT_INSERT switch to the input system header. Signed-off-by: Jani Nikula Signed-off-by: Mark Brown commit c8334dc8fb6413b363df3e1419e287f5b25bce32 Author: James Morris Date: Wed Jan 7 20:06:18 2009 +1100 maintainers: add security subsystem wiki Add url to the security subsystem wiki. Signed-off-by: James Morris commit bd8a71a7b0f50da9350d202d325c3926ffd6b189 Author: Mark Brown Date: Sat Jan 3 16:56:56 2009 +0000 ALSA: Reduce boilerplate for new jack types Use a lookup table rather than explicit code to map input subsystem jack types into ASoC ones, implemented as suggested by Takashi Iwai. Signed-off-by: Mark Brown commit 5762ba1873b0bb9faa631aaa02f533c2b9837f82 Author: Sebastien Dugue Date: Mon Dec 1 14:09:07 2008 +0100 hrtimers: allow the hot-unplugging of all cpus Impact: fix CPU hotplug hang on Power6 testbox On architectures that support offlining all cpus (at least powerpc/pseries), hot-unpluging the tick_do_timer_cpu can result in a system hang. This comes from the fact that if the cpu going down happens to be the cpu doing the tick, then as the tick_do_timer_cpu handover happens after the cpu is dead (via the CPU_DEAD notification), we're left without ticks, jiffies are frozen and any task relying on timers (msleep, ...) is stuck. That's particularly the case for the cpu looping in __cpu_die() waiting for the dying cpu to be dead. This patch addresses this by having the tick_do_timer_cpu handover happen earlier during the CPU_DYING notification. For this, a new clockevent notification type is introduced (CLOCK_EVT_NOTIFY_CPU_DYING) which is triggered in hrtimer_cpu_notify(). Signed-off-by: Sebastien Dugue Cc: Signed-off-by: Ingo Molnar commit 1563513d34ed4b12ef32bc2adde4a53ce05701a1 Author: Gregory Haskins Date: Mon Dec 29 09:39:53 2008 -0500 RT: fix push_rt_task() to handle dequeue_pushable properly A panic was discovered by Chirag Jog where a BUG_ON sanity check in the new "pushable_task" logic would trigger a panic under certain circumstances: http://lkml.org/lkml/2008/9/25/189 Gilles Carry discovered that the root cause was attributed to the pushable_tasks list getting corrupted in the push_rt_task logic. This was the result of a dropped rq lock in double_lock_balance allowing a task in the process of being pushed to potentially migrate away, and thus corrupt the pushable_tasks() list. I traced back the problem as introduced by the pushable_tasks patch that went in recently. There is a "retry" path in push_rt_task() that actually had a compound conditional to decide whether to retry or exit. I missed the meaning behind the rationale for the virtual "if(!task) goto out;" portion of the compound statement and thus did not handle it properly. The new pushable_tasks logic actually creates three distinct conditions: 1) an untouched and unpushable task should be dequeued 2) a migrated task where more pushable tasks remain should be retried 3) a migrated task where no more pushable tasks exist should exit The original logic mushed (1) and (3) together, resulting in the system dequeuing a migrated task (against an unlocked foreign run-queue nonetheless). To fix this, we get rid of the notion of "paranoid" and we support the three unique conditions properly. The paranoid feature is no longer relevant with the new pushable logic (since pushable naturally limits the loop) anyway, so lets just remove it. Reported-By: Chirag Jog Found-by: Gilles Carry Signed-off-by: Gregory Haskins commit 917b627d4d981dc614519d7b34ea31a976b14e12 Author: Gregory Haskins Date: Mon Dec 29 09:39:53 2008 -0500 sched: create "pushable_tasks" list to limit pushing to one attempt The RT scheduler employs a "push/pull" design to actively balance tasks within the system (on a per disjoint cpuset basis). When a task is awoken, it is immediately determined if there are any lower priority cpus which should be preempted. This is opposed to the way normal SCHED_OTHER tasks behave, which will wait for a periodic rebalancing operation to occur before spreading out load. When a particular RQ has more than 1 active RT task, it is said to be in an "overloaded" state. Once this occurs, the system enters the active balancing mode, where it will try to push the task away, or persuade a different cpu to pull it over. The system will stay in this state until the system falls back below the <= 1 queued RT task per RQ. However, the current implementation suffers from a limitation in the push logic. Once overloaded, all tasks (other than current) on the RQ are analyzed on every push operation, even if it was previously unpushable (due to affinity, etc). Whats more, the operation stops at the first task that is unpushable and will not look at items lower in the queue. This causes two problems: 1) We can have the same tasks analyzed over and over again during each push, which extends out the fast path in the scheduler for no gain. Consider a RQ that has dozens of tasks that are bound to a core. Each one of those tasks will be encountered and skipped for each push operation while they are queued. 2) There may be lower-priority tasks under the unpushable task that could have been successfully pushed, but will never be considered until either the unpushable task is cleared, or a pull operation succeeds. The net result is a potential latency source for mid priority tasks. This patch aims to rectify these two conditions by introducing a new priority sorted list: "pushable_tasks". A task is added to the list each time a task is activated or preempted. It is removed from the list any time it is deactivated, made current, or fails to push. This works because a task only needs to be attempted to push once. After an initial failure to push, the other cpus will eventually try to pull the task when the conditions are proper. This also solves the problem that we don't completely analyze all tasks due to encountering an unpushable tasks. Now every task will have a push attempted (when appropriate). This reduces latency both by shorting the critical section of the rq->lock for certain workloads, and by making sure the algorithm considers all eligible tasks in the system. [ rostedt: added a couple more BUG_ONs ] Signed-off-by: Gregory Haskins Acked-by: Steven Rostedt commit 4075134e40804821f90866d7de56802e4dcecb1e Author: Gregory Haskins Date: Mon Dec 29 09:39:53 2008 -0500 plist: fix PLIST_NODE_INIT to work with debug enabled It seems that PLIST_NODE_INIT breaks if used and DEBUG_PI_LIST is defined. Since there are no current users of PLIST_NODE_INIT, this has gone undetected. This patch fixes the build issue that enables the DEBUG_PI_LIST later in the series when we use it in init_task.h Signed-off-by: Gregory Haskins commit 967fc04671feea4dbf780c9e55a0bc8fcf68a14e Author: Gregory Haskins Date: Mon Dec 29 09:39:52 2008 -0500 sched: add sched_class->needs_post_schedule() member We currently run class->post_schedule() outside of the rq->lock, which means that we need to test for the need to post_schedule outside of the lock to avoid a forced reacquistion. This is currently not a problem as we only look at rq->rt.overloaded. However, we want to enhance this going forward to look at more state to reduce the need to post_schedule to a bare minimum set. Therefore, we introduce a new member-func called needs_post_schedule() which tests for the post_schedule condtion without actually performing the work. Therefore it is safe to call this function before the rq->lock is released, because we are guaranteed not to drop the lock at an intermediate point (such as what post_schedule() may do). We will use this later in the series [ rostedt: removed paranoid BUG_ON ] Signed-off-by: Gregory Haskins commit 8f45e2b516201d1bf681e6026fa5276385def565 Author: Gregory Haskins Date: Mon Dec 29 09:39:51 2008 -0500 sched: make double-lock-balance fair double_lock balance() currently favors logically lower cpus since they often do not have to release their own lock to acquire a second lock. The result is that logically higher cpus can get starved when there is a lot of pressure on the RQs. This can result in higher latencies on higher cpu-ids. This patch makes the algorithm more fair by forcing all paths to have to release both locks before acquiring them again. Since callsites to double_lock_balance already consider it a potential preemption/reschedule point, they have the proper logic to recheck for atomicity violations. Signed-off-by: Gregory Haskins commit 7e96fa5875d4a9be18d74d3ca7b90518d05bc426 Author: Gregory Haskins Date: Mon Dec 29 09:39:50 2008 -0500 sched: pull only one task during NEWIDLE balancing to limit critical section git-id c4acb2c0669c5c5c9b28e9d02a34b5c67edf7092 attempted to limit newidle critical section length by stopping after at least one task was moved. Further investigation has shown that there are other paths nested further inside the algorithm which still remain that allow long latencies to occur with newidle balancing. This patch applies the same technique inside balance_tasks() to limit the duration of this optional balancing operation. Signed-off-by: Gregory Haskins CC: Nick Piggin commit 777c2f389e463428fd7e2871051a84d7fe84b172 Author: Gregory Haskins Date: Mon Dec 29 09:39:50 2008 -0500 sched: only try to push a task on wakeup if it is migratable There is no sense in wasting time trying to push a task away that cannot move anywhere else. We gain no benefit from trying to push other tasks at this point, so if the task being woken up is non migratable, just skip the whole operation. This reduces overhead in the wakeup path for certain tasks. Signed-off-by: Gregory Haskins commit 74ab8e4f6412c0b2d730fe5de28dc21de8b92c01 Author: Gregory Haskins Date: Mon Dec 29 09:39:50 2008 -0500 sched: use highest_prio.next to optimize pull operations We currently take the rq->lock for every cpu in an overload state during pull_rt_tasks(). However, we now have enough information via the highest_prio.[curr|next] fields to determine if there is any tasks of interest to warrant the overhead of the rq->lock, before we actually take it. So we use this information to reduce lock contention during the pull for the case where the source-rq doesnt have tasks that preempt the current task. Signed-off-by: Gregory Haskins commit a8728944efe23417e38bf22063f06d9d8ee21d59 Author: Gregory Haskins Date: Mon Dec 29 09:39:49 2008 -0500 sched: use highest_prio.curr for pull threshold highest_prio.curr is actually a more accurate way to keep track of the pull_rt_task() threshold since it is always up to date, even if the "next" task migrates during double_lock. Therefore, stop looking at the "next" task object and simply use the highest_prio.curr. Signed-off-by: Gregory Haskins commit e864c499d9e57805ae1f9e7ea404dd223759cd53 Author: Gregory Haskins Date: Mon Dec 29 09:39:49 2008 -0500 sched: track the next-highest priority on each runqueue We will use this later in the series to reduce the amount of rq-lock contention during a pull operation Signed-off-by: Gregory Haskins commit 4d9842776a23e52ec4c60e0a79f5e1bbe91e463e Author: Gregory Haskins Date: Mon Dec 29 09:39:49 2008 -0500 sched: cleanup inc/dec_rt_tasks Move some common definitions up to the function prologe to simplify the body logic. Signed-off-by: Gregory Haskins commit efdc64f0c792ea744bcc9203f35b908e66d42f41 Author: Wang Chen Date: Mon Dec 29 13:35:11 2008 +0800 genirq: check chip->ack before calling Impact: fix theoretical NULL dereference The generic irq layer doesn't know whether irq_chip has ack routine on some architectures or not. Upon that, before calling chip->ack, we should check that it's not NULL. Signed-off-by: Wang Chen Signed-off-by: Ingo Molnar commit 0ce74d9296c971b2355c26984ad0bc538e34dd6c Merge: 1cc4fff... 3c92ec8... Author: Ingo Molnar Date: Mon Dec 29 09:42:58 2008 +0100 Merge branch 'linus' into timers/hrtimers Conflicts: sound/drivers/pcsp/pcsp.c Semantic conflict: sound/core/hrtimer.c commit 1cc4fff0b360aeffeedb7d6db5089d88dd861700 Author: Frederic Weisbecker Date: Mon Dec 22 02:24:48 2008 +0100 hrtimers: increase clock min delta threshold while interrupt hanging Impact: avoid timer IRQ hanging slow systems While using the function graph tracer on a virtualized system, the hrtimer_interrupt can hang the system on an infinite loop. This can be caused in several situations: - the hardware is very slow and HZ is set too high - something intrusive is slowing the system down (tracing under emulation) ... and the next clock events to program are always before the current time. This patch implements a reasonable compromise: if such a situation is detected, we share the CPUs time in 1/4 to process the hrtimer interrupts. This is enough to let the system running without serious starvation. It has been successfully tested under VirtualBox with 1000 HZ and 100 HZ with function graph tracer launched. On both cases, the clock events were increased until about 25 ms periodic ticks, which means 40 HZ. So we change a hard to debug hang into a warning message and a system that still manages to limp along. Signed-off-by: Frederic Weisbecker Signed-off-by: Ingo Molnar