diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 12:16:22 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 12:16:22 +1100 |
| commit | b80836a8923da3311869da13c08cbfee6ab00444 (patch) | |
| tree | e1323b6813ebe6533e6cbe941ecae15f5295fbaf /include/net | |
| parent | 1fb04e4eda04b1f9883c8fd23b0274f0f9902816 (diff) | |
| parent | 5537a0557c26b1005a8f6e59125bfe3f4e51226a (diff) | |
Merge remote-tracking branch 'ipsec-next/master'
Conflicts:
net/xfrm/xfrm_policy.c
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/xfrm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index b7635ef4d436..cd7c46ff6f1f 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1421,6 +1421,8 @@ struct xfrm_state *xfrm_stateonly_find(struct net *net, u32 mark, xfrm_address_t *saddr, unsigned short family, u8 mode, u8 proto, u32 reqid); +struct xfrm_state *xfrm_state_lookup_byspi(struct net *net, __be32 spi, + unsigned short family); int xfrm_state_check_expire(struct xfrm_state *x); void xfrm_state_insert(struct xfrm_state *x); int xfrm_state_add(struct xfrm_state *x); |