1. 01 Aug, 2011 4 commits
    • Gerrit Renker's avatar
      dccp: support for the exchange of NN options in established state 1/2 · d6916f87
      Gerrit Renker authored
      In contrast to static feature negotiation at the begin of a connection, this
      patch introduces support for exchange of dynamically changing options.
      
      Such an update/exchange is necessary in at least two cases:
       * CCID-2's Ack Ratio (RFC 4341, 6.1.2) which changes during the connection;
       * Sequence Window values that, as per RFC 4340, 7.5.2, should be sent "as
         the connection progresses".
      
      Both are non-negotiable (NN) features, which means that no new capabilities
      are negotiated, but rather that changes in known parameters are brought
      up-to-date at either end.
      
      Thse characteristics are reflected by the implementation:
       * only NN options can be exchanged after connection setup;
       * an ack is scheduled directly after activation to speed up the update;
       * CCIDs may request changes to an NN feature even if a negotiation for that
         feature is already underway: this is required by CCID-2, where changes in
         cwnd necessitate Ack Ratio changes, such that the previous Ack Ratio (which
         is still being negotiated) would cause irrecoverable RTO timeouts (thanks
         to work by Samuel Jero).	   
      Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
      Signed-off-by: default avatarSamuel Jero <sj323707@ohio.edu>
      Acked-by: default avatarIan McDonald <ian.mcdonald@jandi.co.uk>
      d6916f87
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 · 3da3f872
      Linus Torvalds authored
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (46 commits)
        mfd: Fix mismatch in twl4030 mutex lock-unlock
        mfd: twl6030-pwm.c needs MODULE_LICENSE
        mfd: Fix the omap-usb-host clock API usage on usbhs_disable()
        mfd: Acknowledge WM8994 IRQs before reporting
        mfd: Acknowlege all WM831x IRQs before we handle them
        mfd: Avoid two assignments if failures happen in tps65910_i2c_probe
        regulator: Storing tps65912 error codes in u8
        mfd: Don't leak init_data in tps65910_i2c_probe
        regulator: aat2870: Add AAT2870 regulator driver
        backlight: Add AAT2870 backlight driver
        mfd: Add AAT2870 mfd driver
        mfd: Remove dead code from max8997-irq
        mfd: Move TPS55910 Kconfig option
        mfd: Fix missing stmpe kerneldoc
        mfd: Fix off-by-one value range checking for tps65912_i2c_write
        mfd: Add devices for WM831x clocking module
        mfd: Remove comp{1,2}_threshold sysfs entries in tps65911_comparator_remove
        mfd: Don't ask about the TPS65912 core driver in Kconfig
        mfd: Fix off by one in WM831x IRQ code
        mfd: Add tps65921 support from twl-core
        ...
      3da3f872
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 968e75fc
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k/math-emu: Remove unnecessary code
        m68k/math-emu: Remove commented out old code
        m68k: Kill warning in setup_arch() when compiling for Sun3
        m68k/atari: Prefix GPIO_{IN,OUT} with CODEC_
        sparc: iounmap() and *_free_coherent() - Use lookup_resource()
        m68k/atari: Reserve some ST-RAM early on for device buffer use
        m68k/amiga: Chip RAM - Use lookup_resource()
        resources: Add lookup_resource()
        sparc: _sparc_find_resource() should check for exact matches
        m68k/amiga: Chip RAM - Offset resource end by CHIP_PHYSADDR
        m68k/amiga: Chip RAM - Use resource_size() to fix off-by-one error
        m68k/amiga: Chip RAM - Change chipavail to an atomic_t
        m68k/amiga: Chip RAM - Always allocate from the start of memory
        m68k/amiga: Chip RAM - Convert from printk() to pr_*()
        m68k/amiga: Chip RAM - Use tabs for indentation
      968e75fc
    • Trond Myklebust's avatar
      NFS: Re-enable compilation of nfs with !CONFIG_NFS_V4 || !CONFIG_NFS_V4_1 · a00ed25c
      Trond Myklebust authored
      Fix two recently introduced compile problems:
      
      Fix a typo in fs/nfs/pnfs.h
      
      Move the pnfs_blksize declaration outside the CONFIG_NFS_V4 section in
      struct nfs_server.
      Reported-by: default avatarJens Axboe <jaxboe@fusionio.com>
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a00ed25c
  2. 31 Jul, 2011 36 commits