diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-25 03:56:13 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-25 03:56:13 +0100 |
| commit | 795ad0819be4d5922b5140bdda6ff9d0368b0512 (patch) | |
| tree | e96992a37b3ebc611b7de7a745f28237ecf7a365 /net/xfrm | |
| parent | 549367162dfdc75d573f74f4e2891f2dba41582f (diff) | |
| download | kernel_samsung_smdk4412-795ad0819be4d5922b5140bdda6ff9d0368b0512.zip kernel_samsung_smdk4412-795ad0819be4d5922b5140bdda6ff9d0368b0512.tar.gz kernel_samsung_smdk4412-795ad0819be4d5922b5140bdda6ff9d0368b0512.tar.bz2 | |
first merge of networking with upstream
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 6b9e4e1..7c8e0cb 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -1349,16 +1349,14 @@ static inline struct xfrm_dst *xfrm_alloc_dst(struct net *net, int family) BUG(); } xdst = dst_alloc(dst_ops, NULL, 0, 0, 0); + memset(&xdst->u.rt6.rt6i_table, 0, sizeof(*xdst) - sizeof(struct dst_entry)); + xfrm_policy_put_afinfo(afinfo); - if (likely(xdst)) { - memset(&xdst->u.rt6.rt6i_table, 0, - sizeof(*xdst) - sizeof(struct dst_entry)); + if (likely(xdst)) xdst->flo.ops = &xfrm_bundle_fc_ops; - } else + else xdst = ERR_PTR(-ENOBUFS); - xfrm_policy_put_afinfo(afinfo); - return xdst; } |