xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:davem330/net

Browse Source 
Conflicts:
	net/batman-adv/soft-interface.c
This commit is contained in:
David S. Miller
2011-10-07 13:38:43 -04:00
parent 8083f0fc96 3ee72ca992
commit 88c5100c28
178 changed files with 1255 additions and 1000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/xfrm/xfrm_policy.c
View File

@@ -1349,14 +1349,16 @@ 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))
if (likely(xdst)) {
memset(&xdst->u.rt6.rt6i_table, 0,
sizeof(*xdst) - sizeof(struct dst_entry));
xdst->flo.ops = &xfrm_bundle_fc_ops;
else
} else
xdst = ERR_PTR(-ENOBUFS);
xfrm_policy_put_afinfo(afinfo);
return xdst;
}