diff options
| author | Julia Cartwright <julia@ni.com> | 2018-01-15 13:09:37 -0600 |
|---|---|---|
| committer | Julia Cartwright <julia@ni.com> | 2018-01-15 13:09:37 -0600 |
| commit | 223a1a424ccc1a22fa77500bb1bced246d5dd855 (patch) | |
| tree | 35a62e7275ac840c7b20faa8cc40fe9798bcc950 /net/xfrm/xfrm_policy.c | |
| parent | 0c37397b6b8708f3cae24a8faeed2d1c84760892 (diff) | |
| parent | 7bbc6ca4887794cc44b41412a35bdfbe0cbd1c50 (diff) | |
Merge tag 'v4.9.76' into v4.9-rt
This is the 4.9.76 stable release
Diffstat (limited to 'net/xfrm/xfrm_policy.c')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 8ce5711ea21b..f19e6a57e118 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -1393,6 +1393,7 @@ static struct xfrm_policy *clone_policy(const struct xfrm_policy *old, int dir) newp->xfrm_nr = old->xfrm_nr; newp->index = old->index; newp->type = old->type; + newp->family = old->family; memcpy(newp->xfrm_vec, old->xfrm_vec, newp->xfrm_nr*sizeof(struct xfrm_tmpl)); spin_lock_bh(&net->xfrm.xfrm_policy_lock); |