Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[mirror_ubuntu-zesty-kernel.git] / net / atm / clip.c

diff --git a/net/atm/clip.c b/net/atm/clip.c
index d257da50fcfb92417cad07bfb60e0377b2f2f933..1d4be60e1390534ccafce68d2859404ce15fb0b9 100644 (file)
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -502,8 +502,6 @@ static int clip_setentry(struct atm_vcc *vcc, __be32 ip)
        struct atmarp_entry *entry;
        int error;
        struct clip_vcc *clip_vcc;
-       struct flowi fl = { .fl4_dst = ip,
-                           .fl4_tos = 1 };
        struct rtable *rt;
 
        if (vcc->push != clip_push) {
@@ -520,9 +518,9 @@ static int clip_setentry(struct atm_vcc *vcc, __be32 ip)
                unlink_clip_vcc(clip_vcc);
                return 0;
        }
-       error = ip_route_output_key(&init_net, &rt, &fl);
-       if (error)
-               return error;
+       rt = ip_route_output(&init_net, ip, 0, 1, 0);
+       if (IS_ERR(rt))
+               return PTR_ERR(rt);
        neigh = __neigh_lookup(&clip_tbl, &ip, rt->dst.dev, 1);
        ip_rt_put(rt);
        if (!neigh)