summaryrefslogtreecommitdiffstats
path: root/net/xfrm
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-10-241-1/+3
|\
| * xfrm: Fix state threshold configuration from userspaceMichael Rossberg2015-09-291-1/+3
* | dst: Pass net into dst->outputEric W. Biederman2015-10-081-1/+1
* | ipv4, ipv6: Pass net into __ip_local_out and __ip6_local_outEric W. Biederman2015-10-081-1/+1
* | dst: Pass a sk into .local_outEric W. Biederman2015-10-081-1/+1
* | net: Pass net into dst_output and remove dst_output_okfnEric W. Biederman2015-10-082-2/+2
* | xfrm: Only compute net once in xfrm_policy_queue_processEric W. Biederman2015-10-081-4/+3
* | inet: constify ip_route_output_flow() socket argumentEric Dumazet2015-09-251-3/+3
* | netfilter: Add blank lines in callers of netfilter hooksEric W. Biederman2015-09-171-0/+1
* | netfilter: Pass net into okfnEric W. Biederman2015-09-171-6/+6
* | netfilter: Pass struct net into the netfilter hooksEric W. Biederman2015-09-171-1/+2
* | net: Merge dst_output and dst_output_skEric W. Biederman2015-09-172-2/+2
* | xfrm: Remove unused afinfo method init_dstEric W. Biederman2015-09-171-2/+0
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2015-09-032-15/+17
|\
| * xfrm: Add oif to dst lookupsDavid Ahern2015-08-111-10/+14
| * net/xfrm: use kmemdup rather than duplicating its implementationAndrzej Hajda2015-08-111-4/+2
| * xfrm: Fix a typoJakub Wilk2015-07-211-1/+1
* | ipsec: Replace seqniv with seqivHerbert Xu2015-08-171-7/+7
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2015-06-244-30/+40
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-06-013-2/+19
| |\
| * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2015-05-283-30/+28
| |\ \
| | * | xfrm: optimise to search the inexact policy listLi RongQing2015-05-181-3/+8
| | * | xfrm: move the checking for old xfrm_policy hold_queue to beginningLi RongQing2015-05-051-3/+3
| | * | xfrm: remove the unnecessary checking before call xfrm_pol_holdLi RongQing2015-05-051-4/+3
| | * | xfrm: slightly optimise xfrm_inputLi RongQing2015-04-241-5/+5
| | * | xfrm: fix the return code when xfrm_*_register_afinfo failedLi RongQing2015-04-233-3/+3
| | * | xfrm: optimise the use of walk list header in xfrm_policy/state_walkLi RongQing2015-04-232-2/+4
| | * | xfrm: remove the xfrm_queue_purge definitionLi RongQing2015-04-231-10/+2
| * | | net: make skb_dst_pop routine staticYing Xue2015-05-121-0/+12
| |/ /
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2015-06-222-9/+59
|\ \ \ | |_|/ |/| |
| * | xfrm: Define ChaCha20-Poly1305 AEAD XFRM algo for IPsec usersMartin Willi2015-06-041-0/+12
| * | ipsec: Add IV generator information to xfrm_stateHerbert Xu2015-05-281-9/+31
| * | xfrm: Add IV generator information to xfrm_algo_descHerbert Xu2015-05-281-0/+16
| |/
* | xfrm: Override skb->mark with tunnel->parm.i_key in xfrm_inputAlexander Duyck2015-05-281-1/+16
* | xfrm: Always zero high-order sequence number bitsHerbert Xu2015-05-211-0/+2
* | xfrm: fix a race in xfrm_state_lookup_byspiLi RongQing2015-04-291-1/+1
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-04-141-5/+5
|\
| * xfrm: fix xfrm_input/xfrm_tunnel_check oopsAlexey Dobriyan2015-04-071-5/+5
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2015-04-091-0/+5
|\ \
| * | xfrm: Do not parse 32bits compiled xfrm netlink msg on 64bits hostFan Du2015-03-031-0/+5
* | | netfilter: Pass socket pointer down through okfn().David Miller2015-04-071-8/+8
* | | xfrm: simplify xfrm_address_t useJiri Benc2015-03-311-4/+4
| |/ |/|
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2015-03-161-6/+6
|\ \ | |/ |/|
| * xfrm: release dst_orig in case of error in xfrm_lookup()huaibin Wang2015-02-121-6/+6
* | netlink: make nlmsg_end() and genlmsg_end() voidJohannes Berg2015-01-181-9/+18
* | net: xfrm: xfrm_algo: Remove unused functionRickard Strandqvist2015-01-121-5/+0
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2014-12-082-27/+37
|\
| * xfrm: Use __xfrm_policy_link in xfrm_policy_insertHerbert Xu2014-11-131-3/+2
| * xfrm: Do not hash socket policiesHerbert Xu2014-11-131-18/+26
| * xfrm: add XFRMA_REPLAY_VAL attribute to SA messagesdingzhi2014-11-031-4/+8