diff options
Diffstat (limited to 'net/decnet/af_decnet.c')
-rw-r--r-- | net/decnet/af_decnet.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index aafd15a01575..ea3b6ee21fc9 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c | |||
@@ -908,7 +908,7 @@ static int __dn_connect(struct sock *sk, struct sockaddr_dn *addr, int addrlen, | |||
908 | struct socket *sock = sk->sk_socket; | 908 | struct socket *sock = sk->sk_socket; |
909 | struct dn_scp *scp = DN_SK(sk); | 909 | struct dn_scp *scp = DN_SK(sk); |
910 | int err = -EISCONN; | 910 | int err = -EISCONN; |
911 | struct flowi fl; | 911 | struct flowidn fld; |
912 | 912 | ||
913 | if (sock->state == SS_CONNECTED) | 913 | if (sock->state == SS_CONNECTED) |
914 | goto out; | 914 | goto out; |
@@ -947,13 +947,13 @@ static int __dn_connect(struct sock *sk, struct sockaddr_dn *addr, int addrlen, | |||
947 | memcpy(&scp->peer, addr, sizeof(struct sockaddr_dn)); | 947 | memcpy(&scp->peer, addr, sizeof(struct sockaddr_dn)); |
948 | 948 | ||
949 | err = -EHOSTUNREACH; | 949 | err = -EHOSTUNREACH; |
950 | memset(&fl, 0, sizeof(fl)); | 950 | memset(&fld, 0, sizeof(fld)); |
951 | fl.flowi_oif = sk->sk_bound_dev_if; | 951 | fld.flowidn_oif = sk->sk_bound_dev_if; |
952 | fl.fld_dst = dn_saddr2dn(&scp->peer); | 952 | fld.daddr = dn_saddr2dn(&scp->peer); |
953 | fl.fld_src = dn_saddr2dn(&scp->addr); | 953 | fld.saddr = dn_saddr2dn(&scp->addr); |
954 | dn_sk_ports_copy(&fl, scp); | 954 | dn_sk_ports_copy(&fld, scp); |
955 | fl.flowi_proto = DNPROTO_NSP; | 955 | fld.flowidn_proto = DNPROTO_NSP; |
956 | if (dn_route_output_sock(&sk->sk_dst_cache, &fl, sk, flags) < 0) | 956 | if (dn_route_output_sock(&sk->sk_dst_cache, &fld, sk, flags) < 0) |
957 | goto out; | 957 | goto out; |
958 | sk->sk_route_caps = sk->sk_dst_cache->dev->features; | 958 | sk->sk_route_caps = sk->sk_dst_cache->dev->features; |
959 | sock->state = SS_CONNECTING; | 959 | sock->state = SS_CONNECTING; |