summaryrefslogtreecommitdiffstats
path: root/net/xfrm
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2020-09-283-7/+43
|\
| * xfrm: Use correct address family in xfrm_state_findHerbert Xu2020-09-251-4/+7
| * xfrm: clone whole liftime_cur structure in xfrm_do_migrateAntony Antony2020-09-071-1/+1
| * xfrm: clone XFRMA_SEC_CTX in xfrm_do_migrateAntony Antony2020-09-071-0/+28
| * xfrm: clone XFRMA_SET_MARK in xfrm_do_migrateAntony Antony2020-09-071-0/+1
| * xfrmi: drop ignore_df check before updating pmtuSabrina Dubroca2020-08-271-1/+1
| * espintcp: restore IP CB before handing the packet to xfrmSabrina Dubroca2020-08-171-1/+5
* | treewide: Use fallthrough pseudo-keywordGustavo A. R. Silva2020-08-231-1/+1
* | Merge tag 'locking-urgent-2020-08-10' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2020-08-101-5/+5
|\ \ | |/ |/|
| * xfrm: policy: Use sequence counters with associated lockAhmed S. Darwish2020-07-291-5/+5
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netDavid S. Miller2020-08-023-47/+76
|\ \
| * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2020-07-313-47/+76
| |\ \ | | |/ | |/|
| | * espintcp: count packets dropped in espintcp_rcvSabrina Dubroca2020-07-301-0/+6
| | * espintcp: handle short messages instead of breaking the encap socketSabrina Dubroca2020-07-301-1/+24
| | * xfrm: policy: fix IPv6-only espintcp compilationSabrina Dubroca2020-07-171-2/+2
| | * espintcp: recv() should return 0 when the peer socket is closedSabrina Dubroca2020-07-171-1/+4
| | * espintcp: support non-blocking sendsSabrina Dubroca2020-07-171-13/+13
| | * xfrm: policy: match with both mark and mask on user interfacesXin Long2020-06-242-30/+27
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2020-07-304-34/+149
|\ \ \
| * | | xfrm: Make the policy hold queue work with VTI.Steffen Klassert2020-07-211-0/+11
| * | | xfrm: interface: use IS_REACHABLE to avoid some compile errorsXin Long2020-07-171-8/+8
| * | | xfrm: interface: not xfrmi_ipv6/ipip_handler twiceXin Long2020-07-141-4/+18
| * | | xfrm interface: store xfrmi contexts in a hash by if_idEyal Birger2020-07-131-9/+20
| * | | xfrm interface: avoid xi lookup in xfrmi_decode_session()Eyal Birger2020-07-131-10/+13
| * | | xfrm: interface: support IPIP and IPIP6 tunnels processing with .cb_handlerXin Long2020-07-091-0/+32
| * | | xfrm: interface: support IP6IP6 and IP6IP tunnels processing with .cb_handlerXin Long2020-07-091-0/+38
| * | | xfrm: add is_ipip to struct xfrm_input_afinfoXin Long2020-07-091-11/+13
| * | | xfrm: introduce oseq-may-wrap flagPetr Vaněk2020-06-241-4/+8
* | | | net/xfrm: switch xfrm_user_policy to sockptr_tChristoph Hellwig2020-07-241-3/+3
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netDavid S. Miller2020-07-111-0/+2
|\ \ \ \ | | |/ / | |/| |
| * | | net: xfrmi: implement header_ops->parse_protocol for AF_PACKETJason A. Donenfeld2020-06-301-0/+2
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netDavid S. Miller2020-06-253-5/+27
|\| |
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2020-06-193-5/+27
| |\ \
| | * | esp, ah: modernize the crypto algorithm selectionsEric Biggers2020-06-151-6/+9
| | * | esp: select CRYPTO_SEQIVEric Biggers2020-06-151-0/+1
| | * | esp, ah: consolidate the crypto algorithm selectionsEric Biggers2020-06-151-0/+20
| | * | xfrm: merge fixup for "remove output_finish indirection from xfrm_state_afinfo"Stephen Rothwell2020-06-051-4/+0
| | * | xfrm: Fix double ESP trailer insertion in IPsec crypto offload.Huy Nguyen2020-06-041-1/+3
* | | | bonding/xfrm: use real_dev instead of slave_devJarod Wilson2020-06-231-2/+3
| |_|/ |/| |
* | | xfrm: bail early on slave pass over skbJarod Wilson2020-06-221-17/+17
|/ /
* / treewide: replace '---help---' in Kconfig files with 'help'Masahiro Yamada2020-06-141-7/+7
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netDavid S. Miller2020-05-316-18/+37
|\
| * xfrm: fix a NULL-ptr deref in xfrm_local_errorXin Long2020-05-291-1/+2
| * xfrm: fix a warning in xfrm_policy_insert_listXin Long2020-05-251-6/+1
| * xfrm interface: fix oops when deleting a x-netns interfaceNicolas Dichtel2020-04-231-0/+21
| * xfrm: call xfrm_output_gso when inner_protocol is set in xfrm_outputXin Long2020-04-211-5/+7
| * xfrm: espintcp: save and call old ->sk_destructSabrina Dubroca2020-04-201-0/+2
| * xfrm: do pskb_pull properly in __xfrm_transport_prepXin Long2020-04-151-5/+3
| * xfrm: allow to accept packets with ipv6 NEXTHDR_HOP in xfrm_inputXin Long2020-04-151-1/+1
* | xfrm: remove output_finish indirection from xfrm_state_afinfoFlorian Westphal2020-05-061-0/+16