Changeset 28187 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Apr 12, 2010 9:30:36 AM (15 years ago)

Author:

vboxsync

Message:

NAT: warnings.

File:

• trunk/src/VBox/Devices/Network/slirp/bsd/kern/uipc_mbuf.c (modified) (8 diffs)

trunk/src/VBox/Devices/Network/slirp/bsd/kern/uipc_mbuf.c

@@ -584 +584 @@
 struct mbuf *
 #ifndef VBOX
-m_copym(struct mbuf *m, int off0, int len, int wait)
-#else
-m_copym(PNATState pData, struct mbuf *m, int off0, int len, int wait)
+m_copym(struct mbuf *m, int off0, int len, int fWait)
+#else
+m_copym(PNATState pData, struct mbuf *m, int off0, int len, int fWait)
 #endif
 {
@@ -596 +596 @@
         KASSERT(off >= 0, ("m_copym, negative off %d", off));
         KASSERT(len >= 0, ("m_copym, negative len %d", len));
-        MBUF_CHECKSLEEP(wait);
+        MBUF_CHECKSLEEP(fWait);
         if (off == 0 && m->m_flags & M_PKTHDR)
                 copyhdr = 1;
@@ -615 +615 @@
                 }
                 if (copyhdr)
-                        MGETHDR(n, wait, m->m_type);
+                        MGETHDR(n, fWait, m->m_type);
                 else
-                        MGET(n, wait, m->m_type);
+                        MGET(n, fWait, m->m_type);
                 *np = n;
                 if (n == NULL)
                         goto nospace;
                 if (copyhdr) {
-                        if (!m_dup_pkthdr(n, m, wait))
+                        if (!m_dup_pkthdr(n, m, fWait))
                                 goto nospace;
                         if (len == M_COPYALL)
@@ -1285 +1285 @@
 struct mbuf *
 #ifndef VBOX
-m_split(struct mbuf *m0, int len0, int wait)
-#else
-m_split(PNATState pData, struct mbuf *m0, int len0, int wait)
+m_split(struct mbuf *m0, int len0, int fWait)
+#else
+m_split(PNATState pData, struct mbuf *m0, int len0, int fWait)
 #endif
 {
@@ -1293 +1293 @@
         u_int len = len0, remain;
 
-        MBUF_CHECKSLEEP(wait);
+        MBUF_CHECKSLEEP(fWait);
         for (m = m0; m && len > m->m_len; m = m->m_next)
                 len -= m->m_len;
@@ -1300 +1300 @@
         remain = m->m_len - len;
         if (m0->m_flags & M_PKTHDR) {
-                MGETHDR(n, wait, m0->m_type);
+                MGETHDR(n, fWait, m0->m_type);
                 if (n == NULL)
                         return (NULL);
@@ -1312 +1312 @@
                         MH_ALIGN(n, 0);
 #ifndef VBOX
-                        n->m_next = m_split(m, len, wait);
-#else
-                        n->m_next = m_split(pData, m, len, wait);
+                        n->m_next = m_split(m, len, fWait);
+#else
+                        n->m_next = m_split(pData, m, len, fWait);
 #endif
                         if (n->m_next == NULL) {
@@ -1334 +1334 @@
                 return (n);
         } else {
-                MGET(n, wait, m->m_type);
+                MGET(n, fWait, m->m_type);
                 if (n == NULL)
                         return (NULL);