diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-22 17:21:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-22 17:21:38 -0400 |
| commit | 1304a7343b30fc4f16045412efdbb4179a3d9255 (patch) | |
| tree | 83d667ac4f62e30f70305ce4cc7e030e3465f92e /net/xfrm | |
| parent | 1d76efe1577b4323609b1bcbfafa8b731eda071a (diff) | |
| parent | 23dcfa61bac244e1200ff9ad19c6e9144dcb6bb5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 6405764eaa82..2ed698c190b5 100644 --- 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) | |||
| 1358 | 1358 | ||
| 1359 | memset(dst + 1, 0, sizeof(*xdst) - sizeof(*dst)); | 1359 | memset(dst + 1, 0, sizeof(*xdst) - sizeof(*dst)); |
| 1360 | xdst->flo.ops = &xfrm_bundle_fc_ops; | 1360 | xdst->flo.ops = &xfrm_bundle_fc_ops; |
| 1361 | if (afinfo->init_dst) | ||
| 1362 | afinfo->init_dst(net, xdst); | ||
| 1361 | } else | 1363 | } else |
| 1362 | xdst = ERR_PTR(-ENOBUFS); | 1364 | xdst = ERR_PTR(-ENOBUFS); |
| 1363 | 1365 | ||