← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to net/decnet/af_decnet.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/decnet/af_decnet.c
908
908
        struct socket *sock = sk->sk_socket;
909
909
        struct dn_scp *scp = DN_SK(sk);
910
910
        int err = -EISCONN;
911
 
        struct flowi fl;
 
911
        struct flowidn fld;
912
912
 
913
913
        if (sock->state == SS_CONNECTED)
914
914
                goto out;
947
947
        memcpy(&scp->peer, addr, sizeof(struct sockaddr_dn));
948
948
 
949
949
        err = -EHOSTUNREACH;
950
 
        memset(&fl, 0, sizeof(fl));
951
 
        fl.oif = sk->sk_bound_dev_if;
952
 
        fl.fld_dst = dn_saddr2dn(&scp->peer);
953
 
        fl.fld_src = dn_saddr2dn(&scp->addr);
954
 
        dn_sk_ports_copy(&fl, scp);
955
 
        fl.proto = DNPROTO_NSP;
956
 
        if (dn_route_output_sock(&sk->sk_dst_cache, &fl, sk, flags) < 0)
 
950
        memset(&fld, 0, sizeof(fld));
 
951
        fld.flowidn_oif = sk->sk_bound_dev_if;
 
952
        fld.daddr = dn_saddr2dn(&scp->peer);
 
953
        fld.saddr = dn_saddr2dn(&scp->addr);
 
954
        dn_sk_ports_copy(&fld, scp);
 
955
        fld.flowidn_proto = DNPROTO_NSP;
 
956
        if (dn_route_output_sock(&sk->sk_dst_cache, &fld, sk, flags) < 0)
957
957
                goto out;
958
958
        sk->sk_route_caps = sk->sk_dst_cache->dev->features;
959
959
        sock->state = SS_CONNECTING;