1. 26 Jun, 2013 3 commits
    • Nicolas Dichtel's avatar
      sit: fix 4in4 + IPsec scenario · 963b89e8
      Nicolas Dichtel authored
      Since commit 32b8a8e5 "sit: add IPv4 over IPv4 support",
      tunnel->parms.iph.protocol is 0 when both 4in4 and 6in4 are setup, but
      xfrm_lookup() is called only when proto is != 0, thus we need to pass the real
      value.
      Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      963b89e8
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next · a77471ff
      David S. Miller authored
      Steffen Klassert says:
      
      ====================
      Just one patch this time.
      
      1) Drop packets when the matching SA is in larval state and add a
         statistic counter for that. From Fan Du.
      
      Please pull or let me know if there are problems.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a77471ff
    • Alexey Brodkin's avatar
      arc_emac: fix compile-time errors & warnings on PPC64 · a4a1139b
      Alexey Brodkin authored
      As reported by "kbuild test robot" there were some errors and warnings
      on attempt to build kernel with "make ARCH=powerpc allmodconfig".
      
      And this patch addresses both errors and warnings.
      Below is a list of introduced changes:
      1. Fix compile-time errors (misspellings in "dma_unmap_single") on PPC.
      2. Use DMA address instead of "skb->data" as a pointer to data buffer.
      This fixed warnings on pointer to int conversion on 64-bit systems.
      3. Re-implemented initial allocation of Rx buffers in "arc_emac_open" in
      the same way they're re-allocated during operation (receiving packets).
      So once again DMA address could be used instead of "skb->data".
      4. Explicitly use EMAC_BUFFER_SIZE for Rx buffers allocation.
      Signed-off-by: default avatarAlexey Brodkin <abrodkin@synopsys.com>
      
      Cc: netdev@vger.kernel.org
      Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
      Cc: Francois Romieu <romieu@fr.zoreil.com>
      Cc: Joe Perches <joe@perches.com>
      Cc: Vineet Gupta <vgupta@synopsys.com>
      Cc: Mischa Jonker <mjonker@synopsys.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Grant Likely <grant.likely@linaro.org>
      Cc: Rob Herring <rob.herring@calxeda.com>
      Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
      Cc: linux-kernel@vger.kernel.org
      Cc: devicetree-discuss@lists.ozlabs.org
      Cc: Florian Fainelli <florian@openwrt.org>
      Cc: David Laight <david.laight@aculab.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a4a1139b
  2. 25 Jun, 2013 37 commits