diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-18 08:50:34 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-18 08:50:34 +1000 |
| commit | 24ae35fe61e5374c34148d29f1a442ed9d343304 (patch) | |
| tree | 123d6112822d6f362a462da6b0e7172390a82773 /include | |
| parent | e270f8b480c4f8b1f8f358f1d5163f476afd775b (diff) | |
| parent | 2c1497bbc8fdee897341ab48ee9c9209b421b8c0 (diff) | |
Merge remote-tracking branch 'ipsec/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/xfrm.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 6793a30c66b1..7e7e2b0d2915 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -979,10 +979,6 @@ struct xfrm_dst { struct flow_cache_object flo; struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX]; int num_pols, num_xfrms; -#ifdef CONFIG_XFRM_SUB_POLICY - struct flowi *origin; - struct xfrm_selector *partner; -#endif u32 xfrm_genid; u32 policy_genid; u32 route_mtu_cached; @@ -998,12 +994,6 @@ static inline void xfrm_dst_destroy(struct xfrm_dst *xdst) dst_release(xdst->route); if (likely(xdst->u.dst.xfrm)) xfrm_state_put(xdst->u.dst.xfrm); -#ifdef CONFIG_XFRM_SUB_POLICY - kfree(xdst->origin); - xdst->origin = NULL; - kfree(xdst->partner); - xdst->partner = NULL; -#endif } #endif |