diff options
| author | David S. Miller | 2011-02-20 04:17:35 +0100 |
|---|---|---|
| committer | David S. Miller | 2011-02-20 04:17:35 +0100 |
| commit | da935c66bacb3ed9ada984b053297f87c2dff63a (patch) | |
| tree | 46278da2b312c73f1375b830d7e5912bf23abd78 /net/xfrm | |
| parent | ipv4: Implement __ip_dev_find using new interface address hash. (diff) | |
| parent | sctp: fix reporting of unknown parameters (diff) | |
| download | kernel-qcow2-linux-da935c66bacb3ed9ada984b053297f87c2dff63a.tar.gz kernel-qcow2-linux-da935c66bacb3ed9ada984b053297f87c2dff63a.tar.xz kernel-qcow2-linux-da935c66bacb3ed9ada984b053297f87c2dff63a.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/e1000e/netdev.c
net/xfrm/xfrm_policy.c
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 3f1257add4f3..7a8e2c77d08f 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -1340,10 +1340,13 @@ static inline struct xfrm_dst *xfrm_alloc_dst(struct net *net, int family) default: BUG(); } - xdst = dst_alloc(dst_ops, 0) ?: ERR_PTR(-ENOBUFS); + xdst = dst_alloc(dst_ops, 0); xfrm_policy_put_afinfo(afinfo); - xdst->flo.ops = &xfrm_bundle_fc_ops; + if (likely(xdst)) + xdst->flo.ops = &xfrm_bundle_fc_ops; + else + xdst = ERR_PTR(-ENOBUFS); return xdst; } |