diff options
| author | tuexen <tuexen@FreeBSD.org> | 2014-02-20 20:14:43 +0000 |
|---|---|---|
| committer | tuexen <tuexen@FreeBSD.org> | 2014-02-20 20:14:43 +0000 |
| commit | a1eb8eb32cb756baa227140e09259e68cf98a6ab (patch) | |
| tree | a8f9f1fbab895e7625ad6228d3e00072a3a7054c /sys/netinet | |
| parent | 6c44c7062458d613fb2ff89ed156e73b4f0d35f1 (diff) | |
| download | FreeBSD-src-a1eb8eb32cb756baa227140e09259e68cf98a6ab.zip FreeBSD-src-a1eb8eb32cb756baa227140e09259e68cf98a6ab.tar.gz | |
Remove redundant code and fix a style error.
MFC after: 3 days
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/sctp_input.c | 6 | ||||
| -rw-r--r-- | sys/netinet/sctp_output.c | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index 287c3ed..6ea85f5 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -439,7 +439,6 @@ sctp_process_init_ack(struct mbuf *m, int iphlen, int offset, /* First verify that we have no illegal param's */ abort_flag = 0; - op_err = NULL; op_err = sctp_arethere_unrecognized_parameters(m, (offset + sizeof(struct sctp_init_chunk)), @@ -1553,8 +1552,7 @@ sctp_process_cookie_existing(struct mbuf *m, int iphlen, int offset, return (NULL); } - switch SCTP_GET_STATE - (asoc) { + switch (SCTP_GET_STATE(asoc)) { case SCTP_STATE_COOKIE_WAIT: case SCTP_STATE_COOKIE_ECHOED: /* @@ -1644,7 +1642,7 @@ sctp_process_cookie_existing(struct mbuf *m, int iphlen, int offset, * have simply lost the COOKIE-ACK */ break; - } /* end switch */ + } /* end switch */ sctp_stop_all_cookie_timers(stcb); /* * We ignore the return code here.. not sure if we should diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index 629109a..bd372eb 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -3671,7 +3671,6 @@ sctp_add_cookie(struct mbuf *init, int init_offset, int sig_offset; uint16_t cookie_sz; - mret = NULL; mret = sctp_get_mbuf_for_msg((sizeof(struct sctp_state_cookie) + sizeof(struct sctp_paramhdr)), 0, M_NOWAIT, 1, MT_DATA); @@ -8960,7 +8959,6 @@ sctp_send_cookie_ack(struct sctp_tcb *stcb) struct sctp_chunkhdr *hdr; struct sctp_tmit_chunk *chk; - cookie_ack = NULL; SCTP_TCB_LOCK_ASSERT(stcb); cookie_ack = sctp_get_mbuf_for_msg(sizeof(struct sctp_chunkhdr), 0, M_NOWAIT, 1, MT_HEADER); |
