diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-12 17:17:10 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-12 18:08:55 -0500 |
commit | bef55aebd560c5a6f8883c421abccee39978c58c (patch) | |
tree | b1adbe59af8817ee6ef3009fe8c296d3c87fc067 /net/decnet/dn_nsp_out.c | |
parent | 1958b856c1a59c0f1e892b92debb8c9fe4f364dc (diff) |
decnet: Convert to use flowidn where applicable.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet/dn_nsp_out.c')
-rw-r--r-- | net/decnet/dn_nsp_out.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c index b3d66742a01f..bd78836a81eb 100644 --- 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) | |||
78 | struct sock *sk = skb->sk; | 78 | struct sock *sk = skb->sk; |
79 | struct dn_scp *scp = DN_SK(sk); | 79 | struct dn_scp *scp = DN_SK(sk); |
80 | struct dst_entry *dst; | 80 | struct dst_entry *dst; |
81 | struct flowi fl; | 81 | struct flowidn fld; |
82 | 82 | ||
83 | skb_reset_transport_header(skb); | 83 | skb_reset_transport_header(skb); |
84 | scp->stamp = jiffies; | 84 | scp->stamp = jiffies; |
@@ -91,13 +91,13 @@ try_again: | |||
91 | return; | 91 | return; |
92 | } | 92 | } |
93 | 93 | ||
94 | memset(&fl, 0, sizeof(fl)); | 94 | memset(&fld, 0, sizeof(fld)); |
95 | fl.flowi_oif = sk->sk_bound_dev_if; | 95 | fld.flowidn_oif = sk->sk_bound_dev_if; |
96 | fl.fld_src = dn_saddr2dn(&scp->addr); | 96 | fld.saddr = dn_saddr2dn(&scp->addr); |
97 | fl.fld_dst = dn_saddr2dn(&scp->peer); | 97 | fld.daddr = dn_saddr2dn(&scp->peer); |
98 | dn_sk_ports_copy(&fl, scp); | 98 | dn_sk_ports_copy(&fld, scp); |
99 | fl.flowi_proto = DNPROTO_NSP; | 99 | fld.flowidn_proto = DNPROTO_NSP; |
100 | if (dn_route_output_sock(&sk->sk_dst_cache, &fl, sk, 0) == 0) { | 100 | if (dn_route_output_sock(&sk->sk_dst_cache, &fld, sk, 0) == 0) { |
101 | dst = sk_dst_get(sk); | 101 | dst = sk_dst_get(sk); |
102 | sk->sk_route_caps = dst->dev->features; | 102 | sk->sk_route_caps = dst->dev->features; |
103 | goto try_again; | 103 | goto try_again; |