22 Mar, 2006

40 commits

  • Signed-off-by: Uwe Zeisberger
    Signed-off-by: Adrian Bunk

    Uwe Zeisberger
     
  • Signed-off-by: Uwe Zeisberger
    Signed-off-by: Adrian Bunk

    Uwe Zeisberger
     
  • This is a trivial patch which fixes a typo on rwlock usage under
    Documentation/spinlocks.txt.

    Signed-Off-By: Lucas Correia Villa Real
    Signed-off-by: Adrian Bunk

    Lucas Correia Villa Real
     
  • Fix some comments to "UTF-8".

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: Adrian Bunk

    Alexey Dobriyan
     
  • This reverts commit 08f1d0b99f4e2203935d86640a7fec5c233b777c

    The "bt8xx/ conversion" for drivers/video/ hasn't actually percolated
    all the way to this tree, so the Makefile change escaped too soon.

    Build breakage noticed by Jeff Garzik

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • Jeff Garzik
     
  • - undo some Lindent damage by indenting member names
    - remove history at top of .c file, this is stored in the kernel
    repo changelog (in greater detail, even).

    Jeff Garzik
     
  • Jeff Garzik
     
  • drivers/net/skfp/fplustm.c: In function `enable_formac':
    drivers/net/skfp/fplustm.c:552: warning: large integer implicitly truncated to unsigned type
    drivers/net/skfp/fplustm.c:555: warning: large integer implicitly truncated to unsigned type

    These arguments were changed to `const', so the compiler can now see that it's
    doing and outw(..., 0xffffnnnn). Cast the arg to ushort.

    Signed-off-by: Andrew Morton
    Signed-off-by: Jeff Garzik

    Andrew Morton
     
  • All accessor's different methods are now selected with C code and unused
    ones statically optimized away at compile time instead of being selected
    with #if's and #ifdef's. This has many advantages such as allowing the
    compiler to validate the syntax of the whole code, making it cleaner and
    easier to understand, and ultimately allowing people to define
    configuration symbols in terms of variables if they really want to
    dynamically support multiple bus configurations at the same time (with
    the unavoidable performance cost).

    Signed-off-by: Nicolas Pitre
    Signed-off-by: Jeff Garzik

    Nicolas Pitre
     
  • Boards with multiple PHYs were not being handled properly by the pcnet32
    driver. This patch by Thomas Bogendoerfer with changes by me will allow
    Allied Telesyn 2700FTX and 2701FTX boards to use either the copper or
    the fiber interfaces. It has been tested on ia32 and ppc64 hardware.
    Philippe Seewer also tested and improved the patch.
    ethtool for pcnet32 already supports multiple phys.

    See also bugzilla bug 4219.

    Please apply to 2.6.16

    Signed-off-by: Don Fry
    Signed-off-by: Jeff Garzik

    Don Fry
     
  • Set version to 1.1

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • The hardware has additional error trap interrupt bits. I have never seen
    them trigger, but if they do, it looks like this might be useful.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • This patch decodes state and revovers from any races in the transmit
    timeout and NAPI logic. It should never trigger, but if it does then
    do the right thing.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • Small whitespace fixes.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • Add MSI support to sky2 driver.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • Change default coalescing parameters slightly, and allow wider
    range of values.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • Redo the interupt handling of sky2 driver based on the IRQ mangement
    documentation. All interrupts are handled by the device0 NAPI poll
    routine.

    Don't need to adjust interrupt mask in IRQ context, done only when
    changing device under RTNL. Therefore don't need hwlock anymore.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • Remove wake on lan support for now. It doesn't work right, and I
    don't have a machine with working suspend/resume to test or fix it.
    It will be re-enabled later.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • The Yukon EC/rev0 (A1) chipset requires a bunch of workarounds. I copied these
    from sk98lin. But since they never got tested and add more cruft to the code;
    any attempt at using driver as is on this version will probably fail.

    It looks like this was a early engineering sample chip revision, if it ever shows
    up on a real system. Produce an error message.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • When I/O is non-cache-coherent, we need to ensure that the I/O buffers
    we use don't share cache lines with other data.

    Signed-off-by: Dale Farnsworth
    Signed-off-by: Jeff Garzik

    Dale Farnsworth
     
  • Update version number

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • When a PCI error occurs, try and report more info.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • Reformat some code to make it easier to read. And whitespace
    fixes.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • Add mmio barriers at the appropriate places, don't have a platform
    that needs them, but this is where the documentation of the patch
    says to add them.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • Use kcalloc when allocating ring data structure.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • Cleanup of the part of the code that sets up DMA configuration.
    Should cause no real change in operation, just clearer.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • The SysKonnect Genesis and Yukon chip sets have restrictions on the possible
    control block area. The memory needs to not cross 4 Gig boundary, and it needs
    to be 8 byte aligned. This patch checks and fails to bring the device up
    if region is unacceptable.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • Improve performance of skge driver by not touching irq mask
    register as much. Since the interrupt source auto-masks, the driver
    can just leave it disabled until the end of the soft irq.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • Cleanup transmit buffers using NAPI. This allows the transmit routine
    to leave interrupts enabled, and that improves performance.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: Jeff Garzik

    Stephen Hemminger
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
    [CRYPTO] aes: Fixed array boundary violation
    [CRYPTO] tcrypt: Fix key alignment
    [CRYPTO] all: Add missing cra_alignmask
    [CRYPTO] all: Use kzalloc where possible
    [CRYPTO] api: Align tfm context as wide as possible
    [CRYPTO] twofish: Use rol32/ror32 where appropriate

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (235 commits)
    [NETFILTER]: Add H.323 conntrack/NAT helper
    [TG3]: Don't mark tg3_test_registers() as returning const.
    [IPV6]: Cleanups for net/ipv6/addrconf.c (kzalloc, early exit) v2
    [IPV6]: Nearly complete kzalloc cleanup for net/ipv6
    [IPV6]: Cleanup of net/ipv6/reassambly.c
    [BRIDGE]: Remove duplicate const from is_link_local() argument type.
    [DECNET]: net/decnet/dn_route.c: fix inconsequent NULL checking
    [TG3]: make drivers/net/tg3.c:tg3_request_irq() static
    [BRIDGE]: use LLC to send STP
    [LLC]: llc_mac_hdr_init const arguments
    [BRIDGE]: allow show/store of group multicast address
    [BRIDGE]: use llc for receiving STP packets
    [BRIDGE]: stp timer to jiffies cleanup
    [BRIDGE]: forwarding remove unneeded preempt and bh diasables
    [BRIDGE]: netfilter inline cleanup
    [BRIDGE]: netfilter VLAN macro cleanup
    [BRIDGE]: netfilter dont use __constant_htons
    [BRIDGE]: netfilter whitespace
    [BRIDGE]: optimize frame pass up
    [BRIDGE]: use kzalloc
    ...

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (81 commits)
    [PATCH] USB: omninet: fix up debugging comments
    [PATCH] USB serial: add navman driver
    [PATCH] USB: Fix irda-usb use after use
    [PATCH] USB: rtl8150 small fix
    [PATCH] USB: ftdi_sio: add Icom ID1 USB product and vendor ids
    [PATCH] USB: cp2101: add new device IDs
    [PATCH] USB: fix check_ctrlrecip to allow control transfers in state ADDRESS
    [PATCH] USB: vicam.c: fix a NULL pointer dereference
    [PATCH] USB: ZC0301 driver bugfix
    [PATCH] USB: add support for Creativelabs Silvercrest USB keyboard
    [PATCH] USB: storage: new unusual_devs.h entry: Mitsumi 7in1 Card Reader
    [PATCH] USB: storage: unusual_devs.h entry 0420:0001
    [PATCH] USB: storage: another unusual_devs.h entry
    [PATCH] USB: storage: sandisk unusual_devices entry
    [PATCH] USB: fix initdata issue in isp116x-hcd
    [PATCH] USB: usbcore: usb_set_configuration oops (NULL ptr dereference)
    [PATCH] USB: usbcore: Don't assume a USB configuration includes any interfaces
    [PATCH] USB: ub 03 drop stall clearing
    [PATCH] USB: ub 02 remove diag
    [PATCH] USB: ub 01 remove first_open
    ...

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (23 commits)
    [PATCH] sysfs: fix a kobject leak in sysfs_add_link on the error path
    [PATCH] sysfs: don't export dir symbols
    [PATCH] get_cpu_sysdev() signedness fix
    [PATCH] kobject_add_dir
    [PATCH] debugfs: Add debugfs_create_blob() helper for exporting binary data
    [PATCH] sysfs: fix problem with duplicate sysfs directories and files
    [PATCH] Kobject: kobject.h: fix a typo
    [PATCH] Kobject: provide better warning messages when people do stupid things
    [PATCH] Driver core: add macros notice(), dev_notice()
    [PATCH] firmware: fix BUG: in fw_realloc_buffer
    [PATCH] sysfs: kzalloc conversion
    [PATCH] fix module sysfs files reference counting
    [PATCH] add EXPORT_SYMBOL_GPL_FUTURE() to USB subsystem
    [PATCH] add EXPORT_SYMBOL_GPL_FUTURE() to RCU subsystem
    [PATCH] add EXPORT_SYMBOL_GPL_FUTURE()
    [PATCH] Clean up module.c symbol searching logic
    [PATCH] kobj_map semaphore to mutex conversion
    [PATCH] kref: avoid an atomic operation in kref_put()
    [PATCH] handle errors returned by platform_get_irq*()
    [PATCH] driver core: platform_get_irq*(): return -ENXIO on error
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
    README: bzip2 is not new
    Documentation/Changes: remove outdated translation references
    remove dead Radeon URL
    SCSI_AACRAID: add a help text
    update the i386 defconfig
    MAINTAINERS: remove the LANMEDIA entry
    Move ip2.c and ip2main.c to drivers/char/ip2/ where the other files

    Linus Torvalds
     
  • * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
    [MIPS] Update defconfigs.
    [MIPS] Separate CPU entries in /proc/cpuinfo with a blank line.
    [MIPS] sys_mmap2 offset argument should always be shifted 12, not PAGE_SHIFT.
    [MIPS] TX49XX has prefetch.
    [MIPS] Kill tlb-andes.c.
    [MIPS] War on whitespace: cleanup initial spaces followed by tabs.
    [MIPS] Makefile crapectomy.
    [MIPS] Reformat __xchg().
    [MIPS] Mention Broadcom part number for BigSur board
    [MIPS] Remove CONFIG_BUILD_ELF64.
    [MIPS] Further sparsification for 32-bit compat code.
    [MIPS] fix wrong __user usage in _sysn32_rt_sigsuspend
    [MIPS] Signal cleanup
    [MIPS] Reformat all of signal32.c with tabs instead of space for consistency
    [MIPS] Delete unused sys32_waitpid.
    [MIPS] Make I/O helpers more customizable
    [MIPS] Symmetric Uniprocessor support for Qemu.
    [MIPS] sc-rm7k.c cleanup
    [MIPS] MIPS64 R2 optimizations for 64-bit endianess swapping.
    [MIPS] Add early console for Cobalt.

    Linus Torvalds
     
  • * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: (47 commits)
    IB/mthca: Query SRQ srq_limit fixes
    IPoIB: Get rid of useless test of queue length
    IB/mthca: Correct reported SRQ size in MemFree case.
    IB/mad: Fix oopsable race on device removal
    IB/srp: Coverity fix to srp_parse_options()
    IB/mthca: Coverity fix to mthca_init_eq_table()
    IB: Coverity fixes to sysfs.c
    IPoIB: Move ipoib_ib_dev_flush() to ipoib workqueue
    IPoIB: Fix build now that neighbour destructor is in neigh_params
    IB/uverbs: Use correct alt_pkey_index in modify QP
    IB/umad: Add support for large RMPP transfers
    IB/srp: Add SCSI host attributes to show target port
    IB/cm: Check cm_id state before handling a REP
    IB/mthca: Update firmware versions
    IB/mthca: Optimize large messages on Sinai HCAs
    IB/uverbs: Fix query QP return of sq_sig_all
    IB: Fix modify QP checking of "current QP state" attribute
    IPoIB: Fix multicast race between canceling and completing
    IPoIB: Clean up if posting receives fails
    IB/mthca: Use an enum for HCA page size
    ...

    Linus Torvalds
     
  • * master.kernel.org:/home/rmk/linux-2.6-arm:
    [ARM] Fix cosmetic typo in asm/irq.h
    [ARM] 3367/1: CLCD mode no longer supported on the RealView boards
    [ARM] 3366/1: Allow the 16bpp mode configuration in the CLCD control register

    Linus Torvalds
     
  • * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (112 commits)
    [libata] sata_mv: fix irq port status usage
    [PATCH] libata: move IDENTIFY info printing from ata_dev_read_id() to ata_dev_configure()
    [PATCH] libata: use local *id instead of dev->id in ata_dev_configure()
    [PATCH] libata: check Word 88 validity in ata_id_xfer_mask()
    [PATCH] libata: fix class handling in ata_bus_probe()
    [PATCH] ahci: enable prefetching for PACKET commands
    libata: turn on ATAPI by default
    [PATCH] sata_sil24: lengthen softreset timeout
    [PATCH] sata_sil24: exit early from softreset if SStatus reports no device
    [PATCH] libata: fix missing classes[] initialization in ata_bus_probe()
    [PATCH] libata: kill unused xfer_mode functions
    [PATCH] libata: reimplement ata_set_mode() using xfer_mask helpers
    [PATCH] libata: use xfer_mask helpers in ata_dev_set_mode()
    [PATCH] libata: use ata_id_xfermask() in ata_dev_configure()
    [PATCH] libata: add xfer_mask handling functions
    [PATCH] libata: improve xfer mask constants and update ata_mode_string()
    [PATCH] libata: rename ATA_FLAG_FLUSH_PIO_TASK to ATA_FLAG_FLUSH_PORT_TASK
    [PATCH] libata: kill unused pio_task and packet_task
    [PATCH] libata: convert pio_task and packet_task to port_task
    [PATCH] libata: implement port_task
    ...

    Linus Torvalds
     
  • This merges the DVB tree, but fixes up the history that had gotten
    screwed up by a broken commit.

    The history is fixed up by re-doing the commit properly (taking the
    resolve from the final result of the original), and then cherry-picking
    the commits that followed the broken merge.

    * dvb: (190 commits)
    V4L/DVB (3545): Fixed no_overlay option and quirks on saa7134 driver
    V4L/DVB (3543): Fix Makefile to adapt to bt8xx/ conversion
    V4L/DVB (3538): Bt8xx documentation update
    V4L/DVB (3537a): Whitespace cleanup
    V4L/DVB (3533): Add WSS (wide screen signalling) module parameters
    V4L/DVB (3532): Moved duplicated code of ALPS BSRU6 tuner to a standalone file.
    V4L/DVB (3530): Kconfig: remove VIDEO_AUDIO_DECODER
    V4L/DVB (3529): Kconfig: add menu items for cs53l32a and wm8775 A/D converters
    V4L/DVB (3528): Kconfig: fix ATSC frontend menu item names by manufacturer
    V4L/DVB (3527): VIDEO_CPIA2 must depend on USB
    V4L/DVB (3525): Kconfig: remove VIDEO_DECODER
    V4L/DVB (3524): Kconfig: add menu items for saa7115 and saa7127
    V4L/DVB (3494): Kconfig: select VIDEO_MSP3400 to build msp3400.ko
    V4L/DVB (3522): Fixed a trouble with other PAL standards
    V4L/DVB (3521): Avoid warnings at video-buf.c
    V4L/DVB (3514): SAA7113 doesn't have auto std chroma detection mode
    V4L/DVB (3513): Remove saa711x driver
    V4L/DVB (3509): Make a needlessly global function static.
    V4L/DVB (3506): Cinergy T2 dmx cleanup on disconnect
    V4L/DVB (3504): Medion 7134: Autodetect second bridge chip
    ...

    Signed-off-by: Linus Torvalds

    Linus Torvalds