Changeset 22008 in vbox

Timestamp:

Aug 5, 2009 6:52:05 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/VBoxNetFlt: disabled some unused code and minor failure case changes.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (9 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c

@@ -23 +23 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#if defined(DEBUG_ramshankar) && !defined(LOG_ENABLED)
-# define LOG_ENABLED
-#endif
-
 #define LOG_GROUP LOG_GROUP_NET_FLT_DRV
 #include <VBox/log.h>
@@ -339 +335 @@
 static int vboxNetFltSolarisNotifyReq(queue_t *pQueue);
 
-static int vboxNetFltSolarisUnitDataToRaw(PVBOXNETFLTINS pThis, mblk_t *pMsg, mblk_t **ppRawMsg);
+/*  static int vboxNetFltSolarisUnitDataToRaw(PVBOXNETFLTINS pThis, mblk_t *pMsg, mblk_t **ppRawMsg); */
 static int vboxNetFltSolarisRawToUnitData(mblk_t *pMsg, mblk_t **ppDlpiMsg);
 
@@ -350 +346 @@
 static int vboxNetFltSolarisMBlkToSG(PVBOXNETFLTINS pThis, mblk_t *pMsg, PINTNETSG pSG, unsigned cSegs, uint32_t fSrc);
 static int vboxNetFltSolarisRecv(PVBOXNETFLTINS pThis, vboxnetflt_stream_t *pStream, queue_t *pQueue, mblk_t *pMsg);
-static mblk_t *vboxNetFltSolarisFixChecksums(mblk_t *pMsg);
-static void vboxNetFltSolarisAnalyzeMBlk(mblk_t *pMsg);
+/* static mblk_t *vboxNetFltSolarisFixChecksums(mblk_t *pMsg); */
+/* static void vboxNetFltSolarisAnalyzeMBlk(mblk_t *pMsg); */
 
 
@@ -459 +455 @@
     }
 
-    if (g_VBoxNetFltSolarisMtx != NIL_RTSEMFASTMUTEX)
-    {
-        RTSemFastMutexDestroy(g_VBoxNetFltSolarisMtx);
-        g_VBoxNetFltSolarisMtx = NIL_RTSEMFASTMUTEX;
-    }
-
-    RTR0Term();
-
-    return mod_remove(&g_VBoxNetFltSolarisModLinkage);
+    rc = mod_remove(&g_VBoxNetFltSolarisModLinkage);
+    if (!rc)
+    {
+        if (g_VBoxNetFltSolarisMtx != NIL_RTSEMFASTMUTEX)
+        {
+            RTSemFastMutexDestroy(g_VBoxNetFltSolarisMtx);
+            g_VBoxNetFltSolarisMtx = NIL_RTSEMFASTMUTEX;
+        }
+
+        RTR0Term();
+    }
+
+    return rc;
 }
 
@@ -2531 +2531 @@
 }
 
-
+#if 0
 /**
  * Converts DLPI M_PROTO messages to the raw mode M_DATA format.
@@ -2627 +2627 @@
     return VINF_SUCCESS;
 }
-
+#endif
 
 /**
@@ -2899 +2899 @@
             return VINF_SUCCESS;
 
-        mblk_t *pFullMsg = allocb(cbMsg, BPRI_MED);
-        if (RT_LIKELY(pFullMsg))
-        {
-            mblk_t *pCur = pMsg;
-            while (pCur)
-            {
-                size_t cbBlock = MBLKL(pCur);
-                if (cbBlock > 0)
-                {
-                    bcopy(pCur->b_rptr, pFullMsg->b_wptr, cbBlock);
-                    pFullMsg->b_wptr += cbBlock;
-                }
-                pCur = pCur->b_cont;
-            }
-
+        mblk_t *pFullMsg = msgpullup(pMsg, -1 /* all data blocks */);
+        if (pFullMsg)
+        {
             freemsg(pMsg);
             pMsg = pFullMsg;
         }
         else
+        {
+            LogRel((DEVICE_NAME ":vboxNetFltSolarisRecv msgpullup failed.\n"));
             return VERR_NO_MEMORY;
+        }
     }
 
@@ -2967 +2958 @@
 }
 
-
+#if 0
 /**
  * Finalize the message to be fed into the internal network.
@@ -3174 +3165 @@
     }
 }
+#endif