diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-05-22 12:38:32 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-06-07 07:49:12 +0200 |
| commit | eddb13416b7f5e1ea35e499c1c2c05e988a50e92 (patch) | |
| tree | cf0b6baba70d486a1f3aa855a473147969099171 /cpukit/libnetworking/sys | |
| parent | network: Include missing <inttypes.h> (diff) | |
| download | rtems-eddb13416b7f5e1ea35e499c1c2c05e988a50e92.tar.bz2 | |
network: Do not use MSIZE
Do not use the MSIZE for the legacy network stack. Instead use
_SYS_MBUF_LEGACY_MSIZE.
Update #2833.
Diffstat (limited to 'cpukit/libnetworking/sys')
| -rw-r--r-- | cpukit/libnetworking/sys/mbuf.h | 7 | ||||
| -rw-r--r-- | cpukit/libnetworking/sys/socketvar.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/cpukit/libnetworking/sys/mbuf.h b/cpukit/libnetworking/sys/mbuf.h index 48e9e40c2e..c54b760b3e 100644 --- a/cpukit/libnetworking/sys/mbuf.h +++ b/cpukit/libnetworking/sys/mbuf.h @@ -39,14 +39,15 @@ #endif /* - * Mbufs are of a single size, MSIZE (machine/machparam.h), which + * Mbufs are of a single size, _SYS_MBUF_LEGACY_MSIZE (machine/machparam.h), which * includes overhead. An mbuf may add a single "mbuf cluster" of size * MCLBYTES (also in machine/machparam.h), which has no additional overhead * and is used instead of the internal data area; this is done when * at least MINCLSIZE of data must be stored. */ -#define MLEN (MSIZE - sizeof(struct m_hdr)) /* normal data len */ +#define _SYS_MBUF_LEGACY_MSIZE 128 +#define MLEN (_SYS_MBUF_LEGACY_MSIZE - sizeof(struct m_hdr)) /* normal data len */ #define MHLEN (MLEN - sizeof(struct pkthdr)) /* data len w/pkthdr */ #define MINCLSIZE (MHLEN + MLEN) /* smallest amount to put in cluster */ #define M_MAXCOMPRESS (MHLEN / 2) /* max amount to copy for compression */ @@ -59,7 +60,7 @@ * cltom(x) -- Convert cluster # to ptr to beginning of cluster */ #define mtod(m, t) ((t)((m)->m_data)) -#define dtom(x) ((struct mbuf *)((intptr_t)(x) & ~(MSIZE-1))) +#define dtom(x) ((struct mbuf *)((intptr_t)(x) & ~(_SYS_MBUF_LEGACY_MSIZE-1))) #define mtocl(x) (((uintptr_t)(x) - (uintptr_t)mbutl) >> MCLSHIFT) #define cltom(x) ((caddr_t)((u_long)mbutl + ((u_long)(x) << MCLSHIFT))) diff --git a/cpukit/libnetworking/sys/socketvar.h b/cpukit/libnetworking/sys/socketvar.h index 13b3674746..bc3709c03b 100644 --- a/cpukit/libnetworking/sys/socketvar.h +++ b/cpukit/libnetworking/sys/socketvar.h @@ -160,7 +160,7 @@ struct socket { /* adjust counters in sb reflecting allocation of m */ #define sballoc(sb, m) { \ (sb)->sb_cc += (m)->m_len; \ - (sb)->sb_mbcnt += MSIZE; \ + (sb)->sb_mbcnt += _SYS_MBUF_LEGACY_MSIZE; \ if ((m)->m_flags & M_EXT) \ (sb)->sb_mbcnt += (m)->m_ext.ext_size; \ } @@ -168,7 +168,7 @@ struct socket { /* adjust counters in sb reflecting freeing of m */ #define sbfree(sb, m) { \ (sb)->sb_cc -= (m)->m_len; \ - (sb)->sb_mbcnt -= MSIZE; \ + (sb)->sb_mbcnt -= _SYS_MBUF_LEGACY_MSIZE; \ if ((m)->m_flags & M_EXT) \ (sb)->sb_mbcnt -= (m)->m_ext.ext_size; \ } |