- added AHCI power management cleanups

[packages/kernel.git] / kernel-imq.patch

diff --git a/kernel-imq.patch b/kernel-imq.patch
index 086f5f0bf5e6c7ab50833f9d76b681b8206a020d..04760d23de903d959417523b1eeb6b7c881bbf29 100644 (file)
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1385,15 +1385,14 @@ index 3d13874..9842f21 100644
  
  #include "net-sysfs.h"
  
-@@ -2595,7 +2598,12 @@ static int xmit_one(struct sk_buff *skb, struct net_device *dev,
+@@ -2618,7 +2618,11 @@ static int xmit_one(struct sk_buff *skb,
        unsigned int len;
        int rc;
  
 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+      if (!list_empty(&ptype_all) &&
-+                              !(skb->imq_flags & IMQ_F_ENQUEUE))
++      if ((!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) && !(skb->imq_flags & IMQ_F_ENQUEUE))
 +#else
-       if (!list_empty(&ptype_all))
+       if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all))
 +#endif
                dev_queue_xmit_nit(skb, dev);