1. 22 Aug, 2012 2 commits
  2. 20 Aug, 2012 2 commits
  3. 13 Aug, 2012 1 commit
    • Wu Fengguang's avatar
      netfilter: PTR_RET can be used · 19e303d6
      Wu Fengguang authored
      This quiets the coccinelle warnings:
      net/bridge/netfilter/ebtable_filter.c:107:1-3: WARNING: PTR_RET can be used
      net/bridge/netfilter/ebtable_nat.c:107:1-3: WARNING: PTR_RET can be used
      net/ipv6/netfilter/ip6table_filter.c:65:1-3: WARNING: PTR_RET can be used
      net/ipv6/netfilter/ip6table_mangle.c:100:1-3: WARNING: PTR_RET can be used
      net/ipv6/netfilter/ip6table_raw.c:44:1-3: WARNING: PTR_RET can be used
      net/ipv6/netfilter/ip6table_security.c:62:1-3: WARNING: PTR_RET can be used
      net/ipv4/netfilter/iptable_filter.c:72:1-3: WARNING: PTR_RET can be used
      net/ipv4/netfilter/iptable_mangle.c:107:1-3: WARNING: PTR_RET can be used
      net/ipv4/netfilter/iptable_raw.c:51:1-3: WARNING: PTR_RET can be used
      net/ipv4/netfilter/iptable_security.c:70:1-3: WARNING: PTR_RET can be used
      Signed-off-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
  4. 09 Aug, 2012 5 commits
    • Julian Anastasov's avatar
      ipvs: add pmtu_disc option to disable IP DF for TUN packets · 3654e611
      Julian Anastasov authored
      	Disabling PMTU discovery can increase the output packet
      rate but some users have enough resources and prefer to fragment
      than to drop traffic. By default, we copy the DF bit but if
      pmtu_disc is disabled we do not send FRAG_NEEDED messages anymore.
      Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
      Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
    • Julian Anastasov's avatar
      ipvs: implement passive PMTUD for IPIP packets · f2edb9f7
      Julian Anastasov authored
      	IPVS is missing the logic to update PMTU in routing
      for its IPIP packets. We monitor the dst_mtu and can return
      FRAG_NEEDED messages but if the tunneled packets get ICMP
      error we can not rely on other traffic to save the lowest
      	The following patch adds ICMP handling for IPIP
      packets in incoming direction, from some remote host to
      our local IP used as saddr in the outer header. By this
      way we can forward any related ICMP traffic if it is for IPVS
      TUN connection. For the special case of PMTUD we update the
      routing and if client requested DF we can forward the
      	To properly update the routing we have to bind
      the cached route (dest->dst_cache) to the selected saddr
      because ipv4_update_pmtu uses saddr for dst lookup.
      Add IP_VS_RT_MODE_CONNECT flag to force such binding with
      second route.
      	Update ip_vs_tunnel_xmit to provide IP_VS_RT_MODE_CONNECT
      and change the code to copy DF. For now we prefer not to
      force PMTU discovery (outer DF=1) because we don't have
      configuration option to enable or disable PMTUD. As we
      do not keep any packets to resend, we prefer not to
      play games with packets without DF bit because the sender
      is not informed when they are rejected.
      	Also, change ops->update_pmtu to be called only
      for local clients because there is no point to update
      MTU for input routes, in our case skb->dst->dev is lo.
      It seems the code is copied from ipip.c where the skb
      dst points to tunnel device.
      Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
      Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
    • Claudiu Ghioc's avatar
      ipvs: fixed sparse warning · 2b2d2808
      Claudiu Ghioc authored
      Removed the following sparse warnings, wether CONFIG_SYSCTL
      is defined or not:
      *       warning: symbol 'ip_vs_control_net_init_sysctl' was not
      	declared. Should it be static?
      *       warning: symbol 'ip_vs_control_net_cleanup_sysctl' was
      	not declared. Should it be static?
      Signed-off-by: default avatarClaudiu Ghioc <claudiu.ghioc@gmail.com>
      Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
    • Julian Anastasov's avatar
      ipvs: generalize app registration in netns · be97fdb5
      Julian Anastasov authored
      	Get rid of the ftp_app pointer and allow applications
      to be registered without adding fields in the netns_ipvs structure.
      v2: fix coding style as suggested by Pablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
      Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
    • Julian Anastasov's avatar
      ipvs: ip_vs_ftp depends on nf_conntrack_ftp helper · aaea4ed7
      Julian Anastasov authored
      	The FTP application indirectly depends on the
      nf_conntrack_ftp helper for proper NAT support. If the
      module is not loaded, IPVS can resize the packets for the
      command connection, eg. PASV response but the SEQ adjustment
      logic in ipv4_confirm is not called without helper.
      Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
      Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
  5. 27 Jul, 2012 7 commits
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 173f8654
      Linus Torvalds authored
      Pull ext4 updates from Ted Ts'o:
       "The usual collection of bug fixes and optimizations.  Perhaps of
        greatest note is a speed up for parallel, non-allocating DIO writes,
        since we no longer take the i_mutex lock in that case.
        For bug fixes, we fix an incorrect overhead calculation which caused
        slightly incorrect results for df(1) and statfs(2).  We also fixed
        bugs in the metadata checksum feature."
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (23 commits)
        ext4: undo ext4_calc_metadata_amount if we fail to claim space
        ext4: don't let i_reserved_meta_blocks go negative
        ext4: fix hole punch failure when depth is greater than 0
        ext4: remove unnecessary argument from __ext4_handle_dirty_metadata()
        ext4: weed out ext4_write_super
        ext4: remove unnecessary superblock dirtying
        ext4: convert last user of ext4_mark_super_dirty() to ext4_handle_dirty_super()
        ext4: remove useless marking of superblock dirty
        ext4: fix ext4 mismerge back in January
        ext4: remove dynamic array size in ext4_chksum()
        ext4: remove unused variable in ext4_update_super()
        ext4: make quota as first class supported feature
        ext4: don't take the i_mutex lock when doing DIO overwrites
        ext4: add a new nolock flag in ext4_map_blocks
        ext4: split ext4_file_write into buffered IO and direct IO
        ext4: remove an unused statement in ext4_mb_get_buddy_page_lock()
        ext4: fix out-of-date comments in extents.c
        ext4: use s_csum_seed instead of i_csum_seed for xattr block
        ext4: use proper csum calculation in ext4_rename
        ext4: fix overhead calculation used by ext4_statfs()
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm · cea8f46c
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "First ARM push of this merge window, post me coming back from holiday.
        This is what has been in linux-next for the last few weeks.  Not much
        to say which isn't described by the commit summaries."
      * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (32 commits)
        ARM: 7463/1: topology: Update cpu_power according to DT information
        ARM: 7462/1: topology: factorize the update of sibling masks
        ARM: 7461/1: topology: Add arch_scale_freq_power function
        ARM: 7456/1: ptrace: provide separate functions for tracing syscall {entry,exit}
        ARM: 7455/1: audit: move syscall auditing until after ptrace SIGTRAP handling
        ARM: 7454/1: entry: don't bother with syscall tracing on ret_from_fork path
        ARM: 7453/1: audit: only allow syscall auditing for pure EABI userspace
        ARM: 7452/1: delay: allow timer-based delay implementation to be selected
        ARM: 7451/1: arch timer: implement read_current_timer and get_cycles
        ARM: 7450/1: dcache: select DCACHE_WORD_ACCESS for little-endian ARMv6+ CPUs
        ARM: 7449/1: use generic strnlen_user and strncpy_from_user functions
        ARM: 7448/1: perf: remove arm_perf_pmu_ids global enumeration
        ARM: 7447/1: rwlocks: remove unused branch labels from trylock routines
        ARM: 7446/1: spinlock: use ticket algorithm for ARMv6+ locking implementation
        ARM: 7445/1: mm: update CONTEXTIDR register to contain PID of current process
        ARM: 7444/1: kernel: add arch-timer C3STOP feature
        ARM: 7460/1: remove asm/locks.h
        ARM: 7439/1: head.S: simplify initial page table mapping
        ARM: 7437/1: zImage: Allow DTB command line concatenation with ATAG_CMDLINE
        ARM: 7436/1: Do not map the vectors page as write-through on UP systems
    • Russell King's avatar
    • Linus Torvalds's avatar
      Merge tag 'tty-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · c1e7179a
      Linus Torvalds authored
      Pull TTY/Serial patches from Greg Kroah-Hartman:
       "Here's the "tiny" set of patches for 3.6-rc1 for the tty layer and
        serial drivers.  They were cherry-picked from the tty-next branch of
        the tty git tree, as they are small and "obvious" fixes.  The larger
        changes, as mentioned before, will be saved for the 3.7-rc1 merge
        All of these changes have been in the linux-next releases for quite a
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      * tag 'tty-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        pch_uart: Fix parity setting issue
        pch_uart: Fix rx error interrupt setting issue
        pch_uart: Fix missing break for 16 byte fifo
        tty ldisc: Close/Reopen race prevention should check the proper flag
        pch_uart: Add eg20t_port lock field, avoid recursive spinlocks
        vt: fix race in vt_waitactive()
        serial/of-serial: Add LPC3220 standard UART compatible string
        serial/8250: Add LPC3220 standard UART type
        serial_core: Update buffer overrun statistics.
        serial: samsung: Fixed wrong comparison for baudclk_rate
    • Linus Torvalds's avatar
      Merge branch 'kmap_atomic' of git://github.com/congwang/linux · 84eda280
      Linus Torvalds authored
      Pull final kmap_atomic cleanups from Cong Wang:
       "This should be the final round of cleanup, as the definitions of enum
        km_type finally get removed from the whole tree.  The patches have
        been in linux-next for a long time."
      * 'kmap_atomic' of git://github.com/congwang/linux:
        pipe: remove KM_USER0 from comments
        vmalloc: remove KM_USER0 from comments
        feature-removal-schedule.txt: remove kmap_atomic(page, km_type)
        tile: remove km_type definitions
        um: remove km_type definitions
        asm-generic: remove km_type definitions
        avr32: remove km_type definitions
        frv: remove km_type definitions
        powerpc: remove km_type definitions
        arm: remove km_type definitions
        highmem: remove the deprecated form of kmap_atomic
        tile: remove usage of enum km_type
        frv: remove the second parameter of kmap_atomic_primary()
        jbd2: remove the second argument of kmap_atomic
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · b387e41e
      Linus Torvalds authored
      Pull powerpc fixes from Benjamin Herrenschmidt:
       "Here's a handful of powerpc patches, a couple of regression fixes for
        problems introduced in the main batch in this merge window, a couple
        of defconfig updates, and some trivials.
        The radeonfb one is something that was long standing in SLES which I
        forgot to pickup earlier."
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/ftrace: Trace function graph entry before updating index
        radeonfb: Add quirk for the graphics adapter in some JSxx
        powerpc: Lack of firmware flash support is not an error
        powerpc: Enable pseries hardware RNG and crypto modules
        powerpc: Update g5_defconfig
        powerpc/kvm/bookehv: Fix build regression
        powerpc: Set stack limit properly in crit_transfer_to_handler
    • Linus Torvalds's avatar
      Merge tag 'cpumask-for-linus' of... · 43a1141b
      Linus Torvalds authored
      Merge tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
      Pull cpumask changes from Rusty Russell:
       "Trivial comment changes to cpumask code.  I guess it's getting boring."
      Boring is good.
      * tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
        cpumask: cpulist_parse() comments correction
        init: add comments to keep initcall-names in sync with initcall levels
        cpumask: add a few comments of cpumask functions
  6. 26 Jul, 2012 23 commits