Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-08-22 14:21:38 -07:00
parent 1d76efe157 23dcfa61ba
commit 1304a7343b
886 changed files with 12092 additions and 7502 deletions
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1358,6 +1358,8 @@ static inline struct xfrm_dst *xfrm_alloc_dst(struct net *net, int family)

 		memset(dst + 1, 0, sizeof(*xdst) - sizeof(*dst));
 		xdst->flo.ops = &xfrm_bundle_fc_ops;
+		if (afinfo->init_dst)
+			afinfo->init_dst(net, xdst);
 	} else
 		xdst = ERR_PTR(-ENOBUFS);