netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
	Steffen Klassert <steffen.klassert@secunet.com>,
	netdev@vger.kernel.org
Subject: pull request (net-next): ipsec-next 2013-04-11
Date: Thu, 11 Apr 2013 09:56:07 +0200	[thread overview]
Message-ID: <1365666969-22645-1-git-send-email-steffen.klassert@secunet.com> (raw)

1)  Allow to avoid copying DSCP during encapsulation
    by setting a SA flag. From Nicolas Dichtel.

2) Constify the netlink dispatch table, no need to modify it
   at runtime. From Mathias Krause.

Please pull or let me know if there are problems.

Thanks!

The following changes since commit 6fac41157252220678b210fcb13e2c3dad7a912a:

  bnx2x: use the default NAPI weight (2013-03-05 23:40:01 -0500)

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 05600a799f6c67b139f2bc565e358b913b230cf5:

  xfrm_user: constify netlink dispatch table (2013-03-06 07:02:46 +0100)

----------------------------------------------------------------
Mathias Krause (1):
      xfrm_user: constify netlink dispatch table

Nicolas Dichtel (1):
      xfrm: allow to avoid copying DSCP during encapsulation

 include/net/xfrm.h           |    1 +
 include/uapi/linux/xfrm.h    |    3 +++
 net/ipv4/ipcomp.c            |    1 +
 net/ipv4/xfrm4_mode_tunnel.c |    8 ++++++--
 net/ipv6/xfrm6_mode_tunnel.c |    7 +++++--
 net/xfrm/xfrm_state.c        |    1 +
 net/xfrm/xfrm_user.c         |   17 +++++++++++++++--
 7 files changed, 32 insertions(+), 6 deletions(-)

             reply	other threads:[~2013-04-11  7:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-11  7:56 Steffen Klassert [this message]
2013-04-11  7:56 ` [PATCH 1/2] xfrm: allow to avoid copying DSCP during encapsulation Steffen Klassert
2013-04-11  7:56 ` [PATCH 2/2] xfrm_user: constify netlink dispatch table Steffen Klassert
2013-04-11 20:15 ` pull request (net-next): ipsec-next 2013-04-11 David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1365666969-22645-1-git-send-email-steffen.klassert@secunet.com \
    --to=steffen.klassert@secunet.com \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).