Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate redundant check for read-only mbuf data, since 

M_TRAILINGSPACE() does a more complete check on NetBSD.
This commit is contained in:
dyoung 2007-11-26 23:52:40 +00:00
parent 84a52560a3
commit 37bdac8857
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/ic/ath.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ath.c,v 1.89 2007/11/26 23:49:55 dyoung Exp $ */ /* $NetBSD: ath.c,v 1.90 2007/11/26 23:52:40 dyoung Exp $ */
/*- /*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $"); __FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
#endif #endif
#ifdef __NetBSD__ #ifdef __NetBSD__
__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.89 2007/11/26 23:49:55 dyoung Exp $"); __KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.90 2007/11/26 23:52:40 dyoung Exp $");
#endif #endif
/* /*
@ -3438,9 +3438,8 @@ again:
n = m->m_next; n = m->m_next;
if (n == NULL) if (n == NULL)
break; break;
if ((m->m_flags & M_RDONLY) == 0 && if (n->m_len < M_TRAILINGSPACE(m)) {
n->m_len < M_TRAILINGSPACE(m)) { memcpy(mtod(m, char *) + m->m_len, mtod(n, void *),
bcopy(mtod(n, void *), mtod(m, char *) + m->m_len,
n->m_len); n->m_len);
m->m_len += n->m_len; m->m_len += n->m_len;
m->m_next = n->m_next; m->m_next = n->m_next;

4
sys/dev/ic/ath_netbsd.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ath_netbsd.h,v 1.7 2007/11/26 23:48:37 dyoung Exp $ */ /* $NetBSD: ath_netbsd.h,v 1.8 2007/11/26 23:52:40 dyoung Exp $ */
/*- /*-
* Copyright (c) 2003, 2004 David Young * Copyright (c) 2003, 2004 David Young
@ -37,8 +37,6 @@ typedef struct ath_task {
void *t_context; void *t_context;
} ath_task_t; } ath_task_t;
#define M_RDONLY M_EXT /* XXX check different/additional flags? */
#define ATH_CALLOUT_INIT(__ch, __mpsafe) callout_init((__ch), 0) #define ATH_CALLOUT_INIT(__ch, __mpsafe) callout_init((__ch), 0)
#define TASK_INIT(__task, __zero, __func, __context) \ #define TASK_INIT(__task, __zero, __func, __context) \