summaryrefslogtreecommitdiffstats
path: root/include/net/xfrm.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2014-03-181-22/+28
|\
| * xfrm6: Remove xfrm_tunnel_notifierSteffen Klassert2014-03-141-8/+0
| * xfrm6: Add IPsec protocol multiplexerSteffen Klassert2014-03-141-0/+15
| * xfrm: Introduce xfrm_input_afinfo to access the the callbacks properlySteffen Klassert2014-03-141-12/+11
| * xfrm: rename struct xfrm_filterNicolas Dichtel2014-03-071-2/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-03-051-0/+11
|\ \ | |/ |/|
| * xfrm: Clone states properly on migrationSteffen Klassert2014-02-201-0/+11
* | xfrm4: Remove xfrm_tunnel_notifierSteffen Klassert2014-02-251-2/+0
* | xfrm: Add xfrm_tunnel_skb_cb to the skb common bufferSteffen Klassert2014-02-251-12/+38
* | xfrm4: Add IPsec protocol multiplexerSteffen Klassert2014-02-251-1/+30
* | ipsec: add support of limited SA dumpNicolas Dichtel2014-02-171-5/+5
* | xfrm: avoid creating temporary SA when there are no listenersHoria Geanta2014-02-131-0/+15
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-01-251-7/+9
|\
| * {pktgen, xfrm} Introduce xfrm_state_lookup_byspi for pktgenFan Du2014-01-031-0/+2
| * xfrm: export verify_userspi_info for pkfey and netlink interfaceFan Du2013-12-161-0/+1
| * xfrm: Namespacify xfrm state/policy locksFan Du2013-12-061-6/+5
| * xfrm: Using the right namespace to migrate key infoFan Du2013-12-061-1/+1
* | Merge git://git.infradead.org/users/eparis/auditLinus Torvalds2014-01-231-10/+10
|\ \ | |/ |/|
| * audit: convert all sessionid declaration to unsigned intEric Paris2014-01-131-10/+10
* | ipv6: Add a receive path hook for vti6 in xfrm6_mode_tunnel.Steffen Klassert2013-10-091-0/+2
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2013-09-301-5/+10
|\ \
| * | {ipv4,xfrm}: Introduce xfrm_tunnel_notifier for xfrm tunnel mode callbackFan Du2013-08-281-2/+8
* | | xfrm.h: Remove extern from function prototypesJoe Perches2013-09-231-185/+190
| |/ |/|
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-09-051-0/+6
|\ \ | |/ |/|
| * xfrm: revert ipv4 mtu determination to dst_mtuHannes Frederic Sowa2013-08-261-12/+0
| * xfrm: choose protocol family by skb protocolHannes Frederic Sowa2013-08-191-2/+2
| * xfrm: introduce helper for safe determination of mtuHannes Frederic Sowa2013-08-141-0/+12
| * xfrm: make local error reporting more robustHannes Frederic Sowa2013-08-141-0/+6
* | xfrm: constify mark argument of xfrm_find_acq()Mathias Krause2013-08-051-1/+1
|/
* xfrm: force a garbage collection after deleting a policyPaul Moore2013-05-311-0/+5
* xfrm: allow to avoid copying DSCP during encapsulationNicolas Dichtel2013-03-061-0/+1
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2013-02-141-2/+10
|\
| * xfrm: Add a state resolution packet queueSteffen Klassert2013-02-061-0/+7
| * pf_key/xfrm_algo: prepare pf_key and xfrm_algo for new algorithms without pfk...Jussi Kivilinna2013-02-011-2/+3
* | xfrm: Convert xfrm_addr_cmp() to boolean xfrm_addr_equal().YOSHIFUJI Hideaki / 吉藤英明2013-01-291-13/+12
* | xfrm: Use ipv6_addr_equal() where appropriate.YOSHIFUJI Hideaki / 吉藤英明2013-01-291-3/+10
|/
* xfrm: Remove unused definesSteffen Klassert2013-01-211-4/+0
* xfrm: Fix the gc threshold value for ipv4Steffen Klassert2012-11-131-1/+1
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-10-021-4/+4
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-09-151-0/+3
| |\
| * | netlink: Rename pid to portid to avoid confusionEric W. Biederman2012-09-101-3/+3
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-08-221-0/+2
| |\ \
| * | | xfrm: remove redundant parameter "int dir" in struct xfrm_mgr.acquireFan Du2012-08-151-1/+1
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi...Linus Torvalds2012-10-021-11/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | userns: Convert the audit loginuid to be a kuidEric W. Biederman2012-09-171-11/+12
* | | | xfrm: Workaround incompatibility of ESN and async cryptoSteffen Klassert2012-09-041-0/+3
| |_|/ |/| |
* | | net: ipv6: fix oops in inet_putpeer()Patrick McHardy2012-08-201-0/+2
| |/ |/|
* | Fix unexpected SA hard expiration after changing dateFan Du2012-08-021-0/+4
|/
* net/ipv4: VTI support rx-path hook in xfrm4_mode_tunnel.Saurabh2012-07-181-0/+2
* xfrm_user: Propagate netlink error codes properly.David S. Miller2012-06-271-6/+4
OpenPOWER on IntegriCloud