Permalink
Switch branches/tags
Commits on Oct 2, 2009
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (46 commits)
      cnic: Fix NETDEV_UP event processing.
      uvesafb/connector: Disallow unpliviged users to send netlink packets
      pohmelfs/connector: Disallow unpliviged users to configure pohmelfs
      dst/connector: Disallow unpliviged users to configure dst
      dm/connector: Only process connector packages from privileged processes
      connector: Removed the destruct_data callback since it is always kfree_skb()
      connector/dm: Fixed a compilation warning
      connector: Provide the sender's credentials to the callback
      connector: Keep the skb in cn_callback_data
      e1000e/igb/ixgbe: Don't report an error if devices don't support AER
      net: Fix wrong sizeof
      net: splice() from tcp to pipe should take into account O_NONBLOCK
      net: Use sk_mark for routing lookup in more places
      sky2: irqname based on pci address
      skge: use unique IRQ name
      IPv4 TCP fails to send window scale option when window scale is zero
      net/ipv4/tcp.c: fix min() type mismatch warning
      Kconfig: STRIP: Remove stale bits of STRIP help text
      NET: mkiss: Fix typo
      tg3: Remove prev_vlan_tag from struct tx_ring_info
      ...
    torvalds committed Oct 2, 2009
  2. cnic: Fix NETDEV_UP event processing.

    This fixes the problem of not handling the NETDEV_UP event properly
    during hot-plug or modprobe of bnx2 after cnic.  The handling was
    skipped by mistakenly using "else if" to check for the event.
    
    Also update version to 2.0.1.
    
    Signed-off-by: Michael Chan <mchan@broadcom.com>
    Signed-off-by: Benjamin Li <benli@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Michael Chan committed with davem330 Oct 2, 2009
  3. uvesafb/connector: Disallow unpliviged users to send netlink packets

    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Philipp Reisner committed with davem330 Oct 2, 2009
  4. pohmelfs/connector: Disallow unpliviged users to configure pohmelfs

    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Philipp Reisner committed with davem330 Oct 2, 2009
  5. dst/connector: Disallow unpliviged users to configure dst

    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Philipp Reisner committed with davem330 Oct 2, 2009
  6. dm/connector: Only process connector packages from privileged processes

    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Philipp Reisner committed with davem330 Oct 2, 2009
  7. connector: Removed the destruct_data callback since it is always kfre…

    …e_skb()
    
    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    Acked-by: Lars Ellenberg <lars.ellenberg@linbit.com>
    Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Philipp Reisner committed with davem330 Oct 2, 2009
  8. connector/dm: Fixed a compilation warning

    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    Acked-by: Lars Ellenberg <lars.ellenberg@linbit.com>
    Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Philipp Reisner committed with davem330 Oct 2, 2009
  9. connector: Provide the sender's credentials to the callback

    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    Acked-by: Lars Ellenberg <lars.ellenberg@linbit.com>
    Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Philipp Reisner committed with davem330 Oct 2, 2009
  10. connector: Keep the skb in cn_callback_data

    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    Acked-by: Lars Ellenberg <lars.ellenberg@linbit.com>
    Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Philipp Reisner committed with davem330 Oct 2, 2009
  11. e1000e/igb/ixgbe: Don't report an error if devices don't support AER

    The only error returned by pci_{en,dis}able_pcie_error_reporting() is
    -EIO which simply means that Advanced Error Reporting is not supported.
    There is no need to report that, so remove the error check from e1000e,
    igb and ixgbe.
    
    Signed-off-by: Frans Pop <elendil@planet.nl>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Frans Pop committed with davem330 Oct 2, 2009
  12. net: Fix wrong sizeof

    Which is why I have always preferred sizeof(struct foo) over
    sizeof(var).
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Randy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Jean Delvare committed with davem330 Oct 2, 2009
  13. net: splice() from tcp to pipe should take into account O_NONBLOCK

    tcp_splice_read() doesnt take into account socket's O_NONBLOCK flag
    
    Before this patch :
    
    splice(socket,0,pipe,0,128*1024,SPLICE_F_MOVE);
    causes a random endless block (if pipe is full) and
    splice(socket,0,pipe,0,128*1024,SPLICE_F_MOVE | SPLICE_F_NONBLOCK);
    will return 0 immediately if the TCP buffer is empty.
    
    User application has no way to instruct splice() that socket should be in blocking mode
    but pipe in nonblock more.
    
    Many projects cannot use splice(tcp -> pipe) because of this flaw.
    
    http://git.samba.org/?p=samba.git;a=history;f=source3/lib/recvfile.c;h=ea0159642137390a0f7e57a123684e6e63e47581;hb=HEAD
    http://lkml.indiana.edu/hypermail/linux/kernel/0807.2/0687.html
    
    Linus introduced  SPLICE_F_NONBLOCK in commit 29e3509
    (splice: add SPLICE_F_NONBLOCK flag )
    
      It doesn't make the splice itself necessarily nonblocking (because the
      actual file descriptors that are spliced from/to may block unless they
      have the O_NONBLOCK flag set), but it makes the splice pipe operations
      nonblocking.
    
    Linus intention was clear : let SPLICE_F_NONBLOCK control the splice pipe mode only
    
    This patch instruct tcp_splice_read() to use the underlying file O_NONBLOCK
    flag, as other socket operations do.
    
    Users will then call :
    
    splice(socket,0,pipe,0,128*1024,SPLICE_F_MOVE | SPLICE_F_NONBLOCK );
    
    to block on data coming from socket (if file is in blocking mode),
    and not block on pipe output (to avoid deadlock)
    
    First version of this patch was submitted by Octavian Purdila
    
    Reported-by: Volker Lendecke <vl@samba.org>
    Reported-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: Octavian Purdila <opurdila@ixiacom.com>
    Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
    Acked-by: Jens Axboe <jens.axboe@oracle.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Eric Dumazet committed with davem330 Oct 1, 2009
  14. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/mason/btrfs-unstable
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: fix data space leak fix
      Btrfs: remove duplicates of filemap_ helpers
      Btrfs: take i_mutex before generic_write_checks
      Btrfs: fix arguments to btrfs_wait_on_page_writeback_range
      Btrfs: fix deadlock with free space handling and user transactions
      Btrfs: fix error cases for ioctl transactions
      Btrfs: Use CONFIG_BTRFS_POSIX_ACL to enable ACL code
      Btrfs: introduce missing kfree
      Btrfs: Fix setting umask when POSIX ACLs are not enabled
      Btrfs: proper -ENOSPC handling
    torvalds committed Oct 2, 2009
Commits on Oct 1, 2009
  1. spi-imx: strip down chipselect function to only drive the chipselect

    spi_imx_chipselect() made things that should be (and mostly are) done by
    spi_imx_setupxfer.  Only setting the tx and rx functions was missing.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
    Cc: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Uwe Kleine-König committed with torvalds Oct 1, 2009
  2. spi-imx: initialize complete config struct

    Otherwise the config function uses random data from the stack.  This
    didn't stick out because config is called once more in the chipselect
    function with correct parameters.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
    Cc: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Uwe Kleine-König committed with torvalds Oct 1, 2009
  3. spi-imx: no need to assert bits_per_word being initialized

    spi_imx_setup() is only called by spi_setup().  The latter does the
    initialization already.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
    Cc: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Uwe Kleine-König committed with torvalds Oct 1, 2009
  4. spi-imx: setup mode_bits we can handle

    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Cc: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    saschahauer committed with torvalds Oct 1, 2009
  5. spi-imx: fix initial chipselect settings

    We can only setup the gpio pins in spi_setup time when we know the
    SPI_CS_HIGH setting.
    
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Cc: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    saschahauer committed with torvalds Oct 1, 2009
  6. spi-imx: update state correctly

    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Cc: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    saschahauer committed with torvalds Oct 1, 2009
  7. spi-imx: rename source file to spi_imx.c

    This makes the filename match the Kconfig symbol and the driver name.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Cc: Sascha Hauer <s.hauer@pengutronix.de>
    Cc: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Uwe Kleine-König committed with torvalds Oct 1, 2009
  8. afs: remove cache.h

    It's just a wrapper for <linux/fscache.h>, so remove it.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Christoph Hellwig committed with torvalds Oct 1, 2009
  9. sscanf(): fix %*s%n

    When using %*s, sscanf should honor conversion specifiers immediately
    following the %*s.  For example, the following code should find the
    position of the end of the string "hello".
    
      int end;
      char buf[] = "hello    world";
      sscanf(buf, "%*s%n", &end);
      printf("%d\n", end);
    
    Ideally, sscanf would advance the fmt and str pointers the same as it
    would without the *, but the code for that is rather complicated and is
    not included in the patch.
    
    Signed-off-by: Andy Spencer <andy753421@gmail.com>
    Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Andy753421 committed with torvalds Oct 1, 2009
  10. serial: add parameter to force skipping the test for the TXEN bug

    Allow users to force skipping the TXEN test at init time. Applies
    to all serial ports. Intended for debugging only.
    
    There is a blacklist for devices where we need to skip the test but the
    list is not complete.  This lets users force skipping the test so we can
    determine if they need to be added to the list.
    
    Some HP machines with weird serial consoles have this problem and there
    may be more.
    
    Signed-off-by: Chuck Ebbert <cebbert@redhat.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Chuck Ebbert committed with torvalds Oct 1, 2009
  11. serial167: fix read buffer overflow

    Check whether index is within bounds before grabbing the element.
    
    Also, since NR_PORTS is defined ARRAY_SIZE(cy_port), cy_port[NR_PORTS] is
    out of bounds as well.
    
    [akpm@linux-foundation.org: cleanup, remove (long) casts]
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Cc: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    RoelKluin committed with torvalds Oct 1, 2009
  12. cyclades: fix read buffer overflow

    irq is declared with size NR_CARDS (4), but the loop containing this
    segment runs up until NR_ISA_ADDRS (16), possibly reading from irq[i] (and
    trying to use the result)
    
    Identified by the Parfait static scanner.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Acked-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    RoelKluin committed with torvalds Oct 1, 2009
  13. icom: convert space to tabs

    Convert spaces to tabs and remove wrong spaces
    
    Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
    Cc: Scott Kilau <Scott.Kilau@digi.com>
    Cc: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Breno Leitao committed with torvalds Oct 1, 2009
  14. serial_txx9: use container_of() instead of direct cast

    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Cc: Ralf Baechle <ralf@linux-mips.org>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Atsushi Nemoto committed with torvalds Oct 1, 2009
  15. s3cmci: add better support for no card detect or write protect available

    Add better support for omitting either the card detect or the write
    protect GPIOs if the board does not support it.  Add the fields
    no_wprotect and no_detect to the platform data which when set indicate the
    absence of the respective GPIOs.
    
    Note, this also fixes a minor bug where it tries to free IRQ0 if there is
    no detect gpio available.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Ben Dooks committed with torvalds Oct 1, 2009
  16. s3cmci: make SDIO IRQ hardware IRQ support build-time configurable

    We have found a couple of boards where the SDIO IRQ hardware support has
    failed to work properly, and thus we should make it configurable whether
    or not to be included in the driver.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Ben Dooks committed with torvalds Oct 1, 2009
  17. s3cmci: DMA fixes

    Fixes for the DMA transfer mode of the driver to try and improve the state
    of the code:
    
    - Ensure that dma_complete is set during the end of the command phase
      so that transfers do not stall awaiting the completion
    
    - Update the DMA debugging to provide a bit more useful information
      such as how many DMA descriptors where not processed and print the
      DMA addresses in hexadecimal.
    
    - Fix the DMA channel request code to actually request DMA for the
      S3CMCI block instead of whatever '0' signified.
    
    - Add fallback to PIO if we cannot get the DMA channel, as many of the
      devices with this block only have a limited number of DMA channels.
    
    - Only try and claim and free the DMA channel if we are trying to use it.
    
    This improves the driver DMA code to the point where it can now identify a
    card and read the partition table.  However the DMA can still stall when
    trying to move data between the host and memory.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Ben Dooks committed with torvalds Oct 1, 2009
  18. s3cmci: Kconfig selection for PIO/DMA/Both

    Add a selection for the data transfer mode of the s3cmci driver, allowing
    for either a configuration or rumtime selection of the use of the DMA or
    PIO transfer code.
    
    The PIO only mode is 476 bytes smaller than the driver with both methods
    compiled in.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Ben Dooks committed with torvalds Oct 1, 2009
  19. s3cmci: add SDIO IRQ support

    The controller supports SDIO IRQ detection so add support for hardware
    assisted SDIO interrupt detection for the SDIO core.  This improves the
    response time for SDIO interrupts and thus the transfer rate from devices
    such as the Marvel 8686.
    
    As a note, it does seem that the controller will miss an IRQ than is held
    asserted, so there are some manual checks to see if the SDIO interrupt is
    active after a transfer.
    
    Major testing on the S3C2440.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Ben Dooks committed with torvalds Oct 1, 2009
  20. s3cmci: add debugfs support for examining driver and hardware state

    Export driver state and hardware register state via debugfs entries
    created under a directory formed from dev_name() on the probed device when
    CONFIG_DEBUG_FS is set.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Ben Dooks committed with torvalds Oct 1, 2009
  21. s3cmci: fix direct write to interrupt mask

    The clear_imask() call should be used to clear the interrupt mask
    register, as it may end up clearing the SDIO interrupt bit if this is
    enabled.
    
    Change all writes of zero to SDIIMSK register to use clear_imask() ready
    for the SDIO updates.
    
    Signed-off-by: Ben Dooks <ben@simtec.co.uk>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Ben Dooks committed with torvalds Oct 1, 2009