Merge branch 'ufs-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / net / mpls / af_mpls.c

diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index 088e2b459d0f01a6d33b7a5166c3dc0a394523e9..7b05fd1497ceddea47c2c7917f5ee58f6ff2d560 100644 (file)
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -1418,7 +1418,7 @@ static void mpls_ifup(struct net_device *dev, unsigned int flags)
                                continue;
                        alive++;
                        nh_flags &= ~flags;
-                       WRITE_ONCE(nh->nh_flags, flags);
+                       WRITE_ONCE(nh->nh_flags, nh_flags);
                } endfor_nexthops(rt);
 
                WRITE_ONCE(rt->rt_nhn_alive, alive);
@@ -2005,10 +2005,7 @@ static int resize_platform_label_table(struct net *net, size_t limit)
        unsigned index;
 
        if (size) {
-               labels = kzalloc(size, GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY);
-               if (!labels)
-                       labels = vzalloc(size);
-
+               labels = kvzalloc(size, GFP_KERNEL);
                if (!labels)
                        goto nolabels;
        }