Changeset 15979 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Jan 15, 2009 9:22:17 PM (16 years ago)

Author:

vboxsync

Message:

I got positive report from Lubomir who was running this patch. It seems to fix the second issue in tracker/2885

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (2 diffs)

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

@@ -478 +478 @@
     }
 
+#ifndef VBOXNETFLT_SG_SUPPORT
+    {
+        /*
+         * Get rid of fragmented packets, they cause too much trouble.
+         */
+        struct sk_buff *pCopy = skb_copy(pBuf, GFP_ATOMIC);
+        kfree_skb(pBuf);
+        if (!pCopy)
+        {
+            LogRel(("VBoxNetFlt: Failed to allocate packet buffer, dropping the packet.\n"));
+            return 0;
+        }
+        pBuf = pCopy;
+    }
+#endif
+
     /* Add the packet to transmit queue and schedule the bottom half. */
     skb_queue_tail(&pThis->u.s.XmitQueue, pBuf);
@@ -552 +568 @@
 {
     uint32_t fSrc = pBuf->pkt_type == PACKET_OUTGOING ? INTNETTRUNKDIR_HOST : INTNETTRUNKDIR_WIRE;
-
-#ifndef VBOXNETFLT_SG_SUPPORT
-    /*
-     * Get rid of fragmented packets, they cause too much trouble.
-     */
-    struct sk_buff *pCopy = skb_copy(pBuf, GFP_KERNEL);
-    kfree_skb(pBuf);
-    if (!pCopy)
-    {
-        LogRel(("VBoxNetFlt: Failed to allocate packet buffer, dropping the packet.\n"));
-        return;
-    }
-    pBuf = pCopy;
-#endif
 
     if (VBOX_SKB_IS_GSO(pBuf))