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

[mv-sheeva.git] / net / decnet / dn_nsp_out.c

diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c
index 2ef115277bea86a68e644a6c004690ccdb807184..bd78836a81eb3fe1965d5abdd4fcff62e11b9f4b 100644 (file)
--- a/net/decnet/dn_nsp_out.c
+++ b/net/decnet/dn_nsp_out.c
@@ -78,7 +78,7 @@ static void dn_nsp_send(struct sk_buff *skb)
        struct sock *sk = skb->sk;
        struct dn_scp *scp = DN_SK(sk);
        struct dst_entry *dst;
-       struct flowi fl;
+       struct flowidn fld;
 
        skb_reset_transport_header(skb);
        scp->stamp = jiffies;
@@ -91,13 +91,13 @@ try_again:
                return;
        }
 
-       memset(&fl, 0, sizeof(fl));
-       fl.oif = sk->sk_bound_dev_if;
-       fl.fld_src = dn_saddr2dn(&scp->addr);
-       fl.fld_dst = dn_saddr2dn(&scp->peer);
-       dn_sk_ports_copy(&fl, scp);
-       fl.proto = DNPROTO_NSP;
-       if (dn_route_output_sock(&sk->sk_dst_cache, &fl, sk, 0) == 0) {
+       memset(&fld, 0, sizeof(fld));
+       fld.flowidn_oif = sk->sk_bound_dev_if;
+       fld.saddr = dn_saddr2dn(&scp->addr);
+       fld.daddr = dn_saddr2dn(&scp->peer);
+       dn_sk_ports_copy(&fld, scp);
+       fld.flowidn_proto = DNPROTO_NSP;
+       if (dn_route_output_sock(&sk->sk_dst_cache, &fld, sk, 0) == 0) {
                dst = sk_dst_get(sk);
                sk->sk_route_caps = dst->dev->features;
                goto try_again;