diff options
| author | tuexen <tuexen@FreeBSD.org> | 2015-01-10 13:56:26 +0000 |
|---|---|---|
| committer | tuexen <tuexen@FreeBSD.org> | 2015-01-10 13:56:26 +0000 |
| commit | aed8b33869bae7070020e714656c5e971d5d8bdb (patch) | |
| tree | fb7f19042ff4f075b423805574c8ea2b99388164 | |
| parent | ac02dc452c17f4503acbf317c5993b555331c279 (diff) | |
| download | FreeBSD-src-aed8b33869bae7070020e714656c5e971d5d8bdb.zip FreeBSD-src-aed8b33869bae7070020e714656c5e971d5d8bdb.tar.gz | |
Retire SCTP_BUF_EXTEND_SIZE. This patch was suggested by
Robert Watson.
| -rw-r--r-- | sys/netinet/sctp_bsd_addr.c | 12 | ||||
| -rw-r--r-- | sys/netinet/sctp_input.c | 13 | ||||
| -rw-r--r-- | sys/netinet/sctp_os_bsd.h | 2 |
3 files changed, 2 insertions, 25 deletions
diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c index 520670f..f7ea441 100644 --- a/sys/netinet/sctp_bsd_addr.c +++ b/sys/netinet/sctp_bsd_addr.c @@ -381,17 +381,7 @@ sctp_get_mbuf_for_msg(unsigned int space_needed, int want_header, return (m); } if (allonebuf) { - int siz; - - if (SCTP_BUF_IS_EXTENDED(m)) { - siz = SCTP_BUF_EXTEND_SIZE(m); - } else { - if (want_header) - siz = MHLEN; - else - siz = MLEN; - } - if (siz < space_needed) { + if (SCTP_BUF_SIZE(m) < space_needed) { m_freem(m); return (NULL); } diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index 395bb13..66193d5 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -5967,19 +5967,6 @@ out: return; } -#if 0 -static void -sctp_print_mbuf_chain(struct mbuf *m) -{ - for (; m; m = SCTP_BUF_NEXT(m)) { - SCTP_PRINTF("%p: m_len = %ld\n", (void *)m, SCTP_BUF_LEN(m)); - if (SCTP_BUF_IS_EXTENDED(m)) - SCTP_PRINTF("%p: extend_size = %d\n", (void *)m, SCTP_BUF_EXTEND_SIZE(m)); - } -} - -#endif - #ifdef INET void sctp_input_with_port(struct mbuf *i_pak, int off, uint16_t port) diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h index 53427ce..2468c8a 100644 --- a/sys/netinet/sctp_os_bsd.h +++ b/sys/netinet/sctp_os_bsd.h @@ -299,7 +299,7 @@ typedef struct callout sctp_os_timer_t; #define SCTP_BUF_RESV_UF(m, size) m->m_data += size #define SCTP_BUF_AT(m, size) m->m_data + size #define SCTP_BUF_IS_EXTENDED(m) (m->m_flags & M_EXT) -#define SCTP_BUF_EXTEND_SIZE(m) (m->m_ext.ext_size) +#define SCTP_BUF_SIZE M_SIZE #define SCTP_BUF_TYPE(m) (m->m_type) #define SCTP_BUF_RECVIF(m) (m->m_pkthdr.rcvif) #define SCTP_BUF_PREPEND M_PREPEND |
