Changeset 28025 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/linux

Timestamp:

Apr 7, 2010 6:37:43 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

59732

Message:

intnet, VBoxNet*, network device & drivers: GSO preps.

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux

Files:

• VBoxNetFlt-linux.c (modified) (5 diffs)
• files_vboxnetflt (modified) (2 diffs, 2 props)

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

@@ -34 +34 @@
 #include <VBox/log.h>
 #include <VBox/err.h>
+#include <VBox/intnetinline.h>
 #include <iprt/alloca.h>
 #include <iprt/assert.h>
@@ -358 +359 @@
 
     Assert(!skb_shinfo(pBuf)->frag_list);
-    pSG->pvOwnerData = NULL;
-    pSG->pvUserData = NULL;
-    pSG->pvUserData2 = NULL;
-    pSG->cUsers = 1;
-    pSG->fFlags = INTNETSG_FLAGS_TEMP;
-    pSG->cSegsAlloc = cSegs;
-
-   if (fSrc & INTNETTRUNKDIR_WIRE)
+
+    if (fSrc & INTNETTRUNKDIR_WIRE)
     {
         /*
@@ -373 +368 @@
         skb_push(pBuf, ETH_HLEN);
     }
-    pSG->cbTotal = pBuf->len;
+
+    INTNETSgInitTempSegs(pSG, pBuf->len, cSegs, 0 /*cSegsUsed*/);
+
 #ifdef VBOXNETFLT_SG_SUPPORT
     pSG->aSegs[0].cb = skb_headlen(pBuf);
@@ -387 +384 @@
         pSG->aSegs[i+1].Phys = NIL_RTHCPHYS;
     }
-    pSG->cSegsUsed = ++i;
+    ++i;
+
 #else
     pSG->aSegs[0].cb = pBuf->len;
     pSG->aSegs[0].pv = pBuf->data;
     pSG->aSegs[0].Phys = NIL_RTHCPHYS;
-    pSG->cSegsUsed = i = 1;
-#endif
-
+    i = 1;
+#endif
+
+    pSG->cSegsUsed = i;
 
 #ifdef PADD_RUNT_FRAMES_FROM_HOST
@@ -415 +414 @@
         pSG->cbTotal = 60;
         pSG->cSegsUsed++;
-    }
-#endif
+        Assert(i + 1 <= pSG->cSegsAlloc)
+    }
+#endif
+
     Log4(("vboxNetFltLinuxSkBufToSG: allocated=%d, segments=%d frags=%d next=%p frag_list=%p pkt_type=%x fSrc=%x\n",
           pSG->cSegsAlloc, pSG->cSegsUsed, skb_shinfo(pBuf)->nr_frags, pBuf->next, skb_shinfo(pBuf)->frag_list, pBuf->pkt_type, fSrc));

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt

@@ -1 +1 @@
 #!/bin/sh
-# $Id: $
+# $Id$
 ## @file
 # Shared file between Makefile.kmk and export_modules
@@ -55 +55 @@
     ${PATH_ROOT}/include/VBox/log.h=>include/VBox/log.h \
     ${PATH_ROOT}/include/VBox/intnet.h=>include/VBox/intnet.h \
+    ${PATH_ROOT}/include/VBox/intnetinline.h=>include/VBox/intnetinline.h \
     ${PATH_ROOT}/include/VBox/stam.h=>include/VBox/stam.h \
     ${PATH_ROOT}/include/VBox/sup.h=>include/VBox/sup.h \