29 Dec, 2008

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
    net: Allow dependancies of FDDI & Tokenring to be modular.
    igb: Fix build warning when DCA is disabled.
    net: Fix warning fallout from recent NAPI interface changes.
    gro: Fix potential use after free
    sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
    sfc: When disabling the NIC, close the device rather than unregistering it
    sfc: SFT9001: Add cable diagnostics
    sfc: Add support for multiple PHY self-tests
    sfc: Merge top-level functions for self-tests
    sfc: Clean up PHY mode management in loopback self-test
    sfc: Fix unreliable link detection in some loopback modes
    sfc: Generate unique names for per-NIC workqueues
    802.3ad: use standard ethhdr instead of ad_header
    802.3ad: generalize out mac address initializer
    802.3ad: initialize ports LACPDU from const initializer
    802.3ad: remove typedef around ad_system
    802.3ad: turn ports is_individual into a bool
    802.3ad: turn ports is_enabled into a bool
    802.3ad: make ntt bool
    ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
    ...

    Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
    to the conversion to %pI (in this networking merge) and the addition of
    doing IPv6 addresses (from the earlier merge of CIFS).

    Linus Torvalds
     

18 Dec, 2008

1 commit


08 Dec, 2008

1 commit


07 Dec, 2008

2 commits

  • Simply replace netdev->priv with netdev_priv().

    Signed-off-by: Wang Chen
    Acked-by: Greg Kroah-Hartman
    Signed-off-by: David S. Miller

    Wang Chen
     
  • In this driver, netdev's private data is wlandevice_t. And the
    wlandev(type of wlandevice_t) is exist before netdev be allocated. So
    use netdev->ml_priv to point to the private data.

    I am not sure whether I should consider the kernel version older than
    2.3.38. Because in those kernels, netdevice_t is "structure dev"
    instead of "structure net_device" and of course "dev->ml_priv" will
    cause compile error. But before my patch, in function wlan_setup(),
    there is a ether_setup(net_device) which already broke kernels which
    older than 2.3.38.

    Signed-off-by: Wang Chen
    Acked-by: Greg Kroah-Hartman
    Signed-off-by: David S. Miller

    Wang Chen
     

10 Nov, 2008

1 commit

  • The "Exclude staging drivers" question is there so that we don't build
    staging drivers for allyesconfig or allnoconfig settings, but it's very
    irritating when you've already said "no" to staging drivers earlier.

    There is absolutely no point in declining twice - once you've declined
    the staging drivers, you're done.

    So make the second question depend on the first question having been
    answered in the affirmative.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

08 Nov, 2008

2 commits


05 Nov, 2008

1 commit


02 Nov, 2008

1 commit

  • As it is, all instances of ->release() for files that have ->fasync()
    need to remember to evict file from fasync lists; forgetting that
    creates a hole and we actually have a bunch that *does* forget.

    So let's keep our lives simple - let __fput() check FASYNC in
    file->f_flags and call ->fasync() there if it's been set. And lose that
    crap in ->release() instances - leaving it there is still valid, but we
    don't have to bother anymore.

    Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     

24 Oct, 2008

2 commits

  • pcc_acpi is based on an old version
    of drivers/misc/panasonic-laptop.c

    Signed-off-by: Len Brown

    Len Brown
     
  • This was another merge problem that wasn't a data conflict, but due to
    independent changes in two branches that just didn't work together.

    The pcc-acpi staging driver used

    acpi_driver_data(device) = hotkey;

    to set driver data, but the ACPI merge made that invalid in commit
    db89b4f0dbab837d0f3de2c3e9427a8d5393afa3 ("ACPI: catch calls of
    acpi_driver_data on pointer of wrong type"), and now you're supposed to
    just do.

    device->driver_data = hotkey;

    instead.

    Fix it up.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

23 Oct, 2008

28 commits