packages: kernel/kernel-imq.patch - up for 2.6.38
arekm
arekm at pld-linux.org
Tue Mar 15 08:24:02 CET 2011
Author: arekm Date: Tue Mar 15 07:24:02 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up for 2.6.38
---- Files affected:
packages/kernel:
kernel-imq.patch (1.11 -> 1.12)
---- Diffs:
================================================================
Index: packages/kernel/kernel-imq.patch
diff -u packages/kernel/kernel-imq.patch:1.11 packages/kernel/kernel-imq.patch:1.12
--- packages/kernel/kernel-imq.patch:1.11 Wed Aug 25 19:02:44 2010
+++ packages/kernel/kernel-imq.patch Tue Mar 15 08:23:57 2011
@@ -1087,10 +1087,10 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/stat.h>
-@@ -1931,7 +1934,11 @@
- int rc = NETDEV_TX_OK;
+@@ -2083,7 +2083,11 @@
+ if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
+ skb_dst_drop(skb);
- if (likely(!skb->next)) {
- if (!list_empty(&ptype_all))
+ if (!list_empty(&ptype_all)
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
@@ -1099,7 +1099,7 @@
+ )
dev_queue_xmit_nit(skb, dev);
- /*
+ skb_orphan_try(skb);
@@ -2027,8 +2034,7 @@
return queue_index;
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-imq.patch?r1=1.11&r2=1.12&f=u
More information about the pld-cvs-commit
mailing list