Page MenuHomeFreeBSD
Files F166843693

D43216.id131957.diff
No OneTemporary
Actions

D43216.id131957.diff
View Options

diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -236,10 +236,10 @@
{
volatile u_int *refcnt;
- KASSERT(m->m_flags & (M_EXT|M_EXTPG),
- ("%s: M_EXT|M_EXTPG not set on %p", __func__, m));
- KASSERT(!(n->m_flags & (M_EXT|M_EXTPG)),
- ("%s: M_EXT|M_EXTPG set on %p", __func__, n));
+ KASSERT(m->m_flags & (M_EXT | M_EXTPG),
+ ("%s: M_EXT | M_EXTPG not set on %p", __func__, m));
+ KASSERT(!(n->m_flags & (M_EXT | M_EXTPG)),
+ ("%s: M_EXT | M_EXTPG set on %p", __func__, n));
/*
* Cache access optimization.
@@ -569,7 +569,7 @@
copyhdr = 0;
}
n->m_len = min(len, m->m_len - off);
- if (m->m_flags & (M_EXT|M_EXTPG)) {
+ if (m->m_flags & (M_EXT | M_EXTPG)) {
n->m_data = m->m_data + off;
mb_dupcl(n, m);
} else
@@ -611,7 +611,7 @@
if (!m_dup_pkthdr(n, m, how))
goto nospace;
n->m_len = m->m_len;
- if (m->m_flags & (M_EXT|M_EXTPG)) {
+ if (m->m_flags & (M_EXT | M_EXTPG)) {
n->m_data = m->m_data;
mb_dupcl(n, m);
} else {
@@ -629,7 +629,7 @@
n = n->m_next;
n->m_len = m->m_len;
- if (m->m_flags & (M_EXT|M_EXTPG)) {
+ if (m->m_flags & (M_EXT | M_EXTPG)) {
n->m_data = m->m_data;
mb_dupcl(n, m);
} else {
@@ -1070,7 +1070,7 @@
n->m_pkthdr.rcvif = m0->m_pkthdr.rcvif;
n->m_pkthdr.len = m0->m_pkthdr.len - len0;
m0->m_pkthdr.len = len0;
- if (m->m_flags & (M_EXT|M_EXTPG))
+ if (m->m_flags & (M_EXT | M_EXTPG))
goto extpacket;
if (remain > MHLEN) {
/* m can't be the lead packet */
@@ -1096,7 +1096,7 @@
M_ALIGN(n, remain);
}
extpacket:
- if (m->m_flags & (M_EXT|M_EXTPG)) {
+ if (m->m_flags & (M_EXT | M_EXTPG)) {
n->m_data = m->m_data + len;
mb_dupcl(n, m);
} else {
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -2087,7 +2087,7 @@
}
n->m_len = mlen;
len_cp += n->m_len;
- if (m->m_flags & (M_EXT|M_EXTPG)) {
+ if (m->m_flags & (M_EXT | M_EXTPG)) {
n->m_data = m->m_data + off;
mb_dupcl(n, m);
} else
diff --git a/sys/netinet/tcp_pcap.c b/sys/netinet/tcp_pcap.c
--- a/sys/netinet/tcp_pcap.c
+++ b/sys/netinet/tcp_pcap.c
@@ -368,7 +368,7 @@
* In cases where that isn't possible, settle for what we can
* get.
*/
- if ((m->m_flags & (M_EXT|M_EXTPG)) &&
+ if ((m->m_flags & (M_EXT | M_EXTPG)) &&
tcp_pcap_take_cluster_reference()) {
n->m_data = m->m_data;
n->m_len = m->m_len;
diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c
--- a/sys/netinet/tcp_stacks/rack.c
+++ b/sys/netinet/tcp_stacks/rack.c
@@ -18455,7 +18455,7 @@
n->m_len = mlen;
soff += mlen;
len_cp += n->m_len;
- if (m->m_flags & (M_EXT|M_EXTPG)) {
+ if (m->m_flags & (M_EXT | M_EXTPG)) {
n->m_data = m->m_data + off;
mb_dupcl(n, m);
} else {

File Metadata

Mime Type
text/plain
Expires
Tue, Aug 18, 12:46 AM (7 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36880569
Default Alt Text
D43216.id131957.diff (2 KB)

Event Timeline