From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 18 Jun 2009 19:38:34 +0000 (+0200)
Subject: Update conpat.diff remove last skb->requeue part
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7a1e51b1c673dc58b1d073d5dbcb06140fe2aad5;p=openwrt%2Fstaging%2Fblogic.git

Update conpat.diff remove last skb->requeue part

This was needed as long as skb->requeue was accessed in this part.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/compat/compat.diff b/compat/compat.diff
index c309732f96d3..fe99decb3a9e 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -858,24 +858,6 @@
  
  	return ops;
  }
---- a/net/mac80211/wme.c
-+++ b/net/mac80211/wme.c
-@@ -97,6 +97,7 @@ u16 ieee80211_select_queue(struct net_device *dev, struct sk_buff *skb)
- 	if (unlikely(queue >= local->hw.queues))
- 		queue = local->hw.queues - 1;
- 
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28))
- 	/*
- 	 * Now we know the 1d priority, fill in the QoS header if
- 	 * there is one (and we haven't done this before).
-@@ -112,6 +113,7 @@ u16 ieee80211_select_queue(struct net_device *dev, struct sk_buff *skb)
- 		*p++ = ack_policy | tid;
- 		*p = 0;
- 	}
-+#endif
- 
- 	return queue;
- }
 --- a/net/rfkill/Makefile
 +++ b/net/rfkill/Makefile
 @@ -2,6 +2,6 @@