From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 21 Nov 2009 09:24:00 +0000 (+0100)
Subject: Update compat-wireless to 2.6.32-rc7 and removed not needed patches.
X-Git-Tag: v2.9-beta1~592
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=8de1f971ec57307a072bb27791657a13dddc3a9f

Update compat-wireless to 2.6.32-rc7 and removed not needed patches.
---

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 466add2eec..ddf7f95c92 100644
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -30,7 +30,7 @@ else
 	VERSUFIX=ipfire
 endif
 
-VER        = 2.6.32-rc6
+VER        = 2.6.32-rc7
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4c8eafa1c35d1ab9ca6fa66974abd802
+$(DL_FILE)_MD5 = c7b9f081895c23841509a363f9ae4da2
 
 install : $(TARGET)
 
@@ -77,9 +77,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
 
-#	Apply some wlan-card patches
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless_rt2500pci-skb_allignment.patch
-
 	cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) KMODDIR=kernel install-modules
 
 	# The makefile put the modules to a wrong place move back...
@@ -89,12 +86,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Set Regulatory Domain to "EU" (use Channel 1-14 max. 20db)
 	echo options cfg80211 ieee80211_regdom=EU > /etc/modprobe.d/cfg80211
 
-	# Remove original kernel modules (compat wireless use the
-	# place of newer kernels and so not overwrite it...)
-	-rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/ath?k
-	-rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/rtl818?.ko
-	-rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/net/ieee80211
-
 	-rm -rf $(DIR_APP)
 	@$(POSTBUILD)
 
diff --git a/src/patches/compat-wireless_rt2500pci-skb_allignment.patch b/src/patches/compat-wireless_rt2500pci-skb_allignment.patch
deleted file mode 100644
index ea32c1eaac..0000000000
--- a/src/patches/compat-wireless_rt2500pci-skb_allignment.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur linux-2.6.29-org/drivers/net/wireless/rt2x00/rt2x00queue.c linux-2.6.29/drivers/net/wireless/rt2x00/rt2x00queue.c
---- linux-2.6.29-org/drivers/net/wireless/rt2x00/rt2x00queue.c	2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29/drivers/net/wireless/rt2x00/rt2x00queue.c	2009-04-16 17:08:39.000000000 +0200
-@@ -105,6 +105,14 @@
- 	 */
- 	skb_push(skb, rt2x00dev->hw->extra_tx_headroom);
- 
-+    if( (int)skb->data & 3 ) {
-+        int align = (int)skb->data & 3;
-+        int len = skb->len;
-+        skb_push(skb, align);
-+        memmove(skb->data, skb->data+align, len);
-+        skb_trim(skb, len);
-+    }
-+
- 	skbdesc->skb_dma =
- 	    dma_map_single(rt2x00dev->dev, skb->data, skb->len, DMA_TO_DEVICE);
-