Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / ipmr.c

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 5c94c222e3f382a3fce0f9d4efb0e05fa29d9056..717ab7d6d7b6eb47d48f74b83623c45b820547d3 100644 (file)
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -415,10 +415,10 @@ static int vif_add(struct vifctl *vifc, int mrtsock)
                        return -ENOBUFS;
                break;
        case 0:
-               dev=ip_dev_find(vifc->vifc_lcl_addr.s_addr);
+               dev = ip_dev_find(vifc->vifc_lcl_addr.s_addr);
                if (!dev)
                        return -EADDRNOTAVAIL;
-               __dev_put(dev);
+               dev_put(dev);
                break;
        default:
                return -EINVAL;