netdev - pull request (net-next): ipsec-next 2013-11-01

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1383292257-4634-1-git-send-email-steffen.klassert@secunet.com>
Date:	Fri,  1 Nov 2013 08:50:53 +0100
From:	Steffen Klassert <steffen.klassert@...unet.com>
To:	David Miller <davem@...emloft.net>
Cc:	Herbert Xu <herbert@...dor.apana.org.au>,
	Steffen Klassert <steffen.klassert@...unet.com>,
	netdev@...r.kernel.org
Subject: pull request (net-next): ipsec-next 2013-11-01

This pull request has a trivial merge conflict between git commit
e7d8f6c ("xfrm: Add refcount handling to queued policies") and
git commit 4d53eff ("xfrm: Don't queue retransmitted packets if
the original is still on the host"). It can be solved as it is
currently done in linux-next.

1) Use vmalloc_node for ipcomp percpu scratches to get proper
   NUMA affinity, from Eric Dumazet

2) Avoid to retransmit packets if the original packet is
   still in the xfrm hold queue.

3) Remove unused padlen field from struct esp_data.
   From Mathias Krause.

4) Remove struct esp_data because now it consists of a single
   pointer. From Mathias Krause.

Please pull or let me know if there are problems.

Thanks!

The following changes since commit 5bf47256f5433a9a5782754664e5ea04acb0537d:

  Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge (2013-10-19 19:52:42 -0400)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git master

for you to fetch changes up to 1c5ad13f7c2b2afe30e43858d04fff979dc9d243:

  net: esp{4,6}: get rid of struct esp_data (2013-10-29 06:39:42 +0100)

----------------------------------------------------------------
Eric Dumazet (1):
      xfrm: use vmalloc_node() for percpu scratches

Mathias Krause (2):
      net: esp{4,6}: remove padlen from struct esp_data
      net: esp{4,6}: get rid of struct esp_data

Steffen Klassert (1):
      xfrm: Don't queue retransmitted packets if the original is still on the host

 include/net/esp.h      |   10 ----------
 net/ipv4/esp4.c        |   49 +++++++++++++++---------------------------------
 net/ipv6/esp6.c        |   48 +++++++++++++++--------------------------------
 net/xfrm/xfrm_ipcomp.c |    6 ++++--
 net/xfrm/xfrm_policy.c |    7 +++++++
 5 files changed, 41 insertions(+), 79 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html