diff options
| author | Jon Grimm <jgrimm@touki.austin.ibm.com> | 2003-06-21 01:16:47 -0500 |
|---|---|---|
| committer | Jon Grimm <jgrimm@touki.austin.ibm.com> | 2003-06-21 01:16:47 -0500 |
| commit | ccdf98ff4de0abb75ac6cf73ad0962ac3be5f51f (patch) | |
| tree | f3ab29fccf71862b1132c36bcfacf225f7962511 /net | |
| parent | f5633ef02d9f24878afdc40d49def37940c8580f (diff) | |
[SCTP] Hand merge bk pull conflict. sk->state now sk->sk_state.
Diffstat (limited to 'net')
| -rw-r--r-- | net/sctp/proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/proc.c b/net/sctp/proc.c index fb2227b8e7d2..9e1671d317d4 100644 --- a/net/sctp/proc.c +++ b/net/sctp/proc.c @@ -178,7 +178,7 @@ static int sctp_eps_seq_show(struct seq_file *seq, void *v) ep = sctp_ep(epb); sk = epb->sk; seq_printf(seq, "%8p %8p %-3d %-3d %-4d %-5d ", ep, sk, - sctp_sk(sk)->type, sk->state, hash, + sctp_sk(sk)->type, sk->sk_state, hash, epb->bind_addr.port); sctp_seq_dump_local_addrs(seq, epb); seq_printf(seq, "\n"); @@ -241,7 +241,7 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v) sk = epb->sk; seq_printf(seq, "%8p %8p %-3d %-3d %-2d %-4d %-5d %-5d ", - assoc, sk, sctp_sk(sk)->type, sk->state, + assoc, sk, sctp_sk(sk)->type, sk->sk_state, assoc->state, hash, epb->bind_addr.port, assoc->peer.port); sctp_seq_dump_local_addrs(seq, epb); |