diff options
| author | David S. Miller <davem@davemloft.net> | 2013-02-14 19:29:20 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-14 19:29:20 +0100 |
| commit | e0376d004307e2b882afcf9e73b2ed5b66d57aee (patch) | |
| tree | 763b8c26622864855b7bf664ff5f30a62cd7d8f3 /net/ipv6/raw.c | |
| parent | bridge: make ifla_br_policy and br_af_ops static (diff) | |
| parent | xfrm: Allow inserting policies with matching mark and different priorities (diff) | |
| download | linux-e0376d004307e2b882afcf9e73b2ed5b66d57aee.tar.xz linux-e0376d004307e2b882afcf9e73b2ed5b66d57aee.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
1) Remove a duplicated call to skb_orphan() in pf_key, from Cong Wang.
2) Prepare xfrm and pf_key for algorithms without pf_key support,
from Jussi Kivilinna.
3) Fix an unbalanced lock in xfrm_output_one(), from Li RongQing.
4) Add an IPsec state resolution packet queue to handle
packets that are send before the states are resolved.
5) xfrm4_policy_fini() is unused since 2.6.11, time to remove it.
From Michal Kubecek.
6) The xfrm gc threshold was configurable just in the initial
namespace, make it configurable in all namespaces. From
Michal Kubecek.
7) We currently can not insert policies with mark and mask
such that some flows would be matched from both policies.
Allow this if the priorities of these policies are different,
the one with the higher priority is used in this case.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/raw.c')
0 files changed, 0 insertions, 0 deletions