Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1e535f75a4191d9c99ffb604aa12f88d172245f6
commit 1e535f75a4191d9c99ffb604aa12f88d172245f6
Author: VMiklos <[EMAIL PROTECTED]>
Date: Sun Sep 23 15:24:34 2007 +0200
rt2500-1.1.0_b4-27-i686
updated linux2622.patch
closes #2433
diff --git a/source/network-extra/rt2500/FrugalBuild
b/source/network-extra/rt2500/FrugalBuild
index 66cbeec..f2d5eff 100644
--- a/source/network-extra/rt2500/FrugalBuild
+++ b/source/network-extra/rt2500/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=rt2500
pkgver=1.1.0_b4
-pkgrel=26
+pkgrel=27
pkgdesc="Driver for wireless cards that are based on the Ralink rt2400 and
rt2500 chipsets."
_F_sourceforge_dirname="rt2400"
Finclude kernel-module sourceforge
@@ -14,7 +14,7 @@ up2date="lynx -dump $url/Downloads|grep 2500.*download$|sed
's/.*2500-\(.*\)\.t.
source=($source rt2500-1.1.0_b4-linux26{20,22}.patch)
sha1sums=('dd9a747c819a6507ea3ef9e803d4fae1074d84df' \
'32d014a546b6b4cda9b81f95e184a0e8f05c5698' \
- 'fb25d996030d6fb803d9ae0a41a6aceed5b57c43')
+ '095285562700f45e0c4cb000e0f7ddc37c1ea4d0')
build()
{
diff --git a/source/network-extra/rt2500/rt2500-1.1.0_b4-linux2622.patch
b/source/network-extra/rt2500/rt2500-1.1.0_b4-linux2622.patch
index 249fe2f..863d050 100644
--- a/source/network-extra/rt2500/rt2500-1.1.0_b4-linux2622.patch
+++ b/source/network-extra/rt2500/rt2500-1.1.0_b4-linux2622.patch
@@ -1,11 +1,54 @@
---- Module/rtmp_data.c.orig 2007-07-10 15:16:31.000000000 +0200
-+++ Module/rtmp_data.c 2007-07-10 15:16:51.000000000 +0200
+diff -Nurd Module.orig/rtmp_data.c Module/rtmp_data.c
+--- Module.orig/rtmp_data.c 2006-06-17 22:12:58.000000000 +0200
++++ Module/rtmp_data.c 2007-07-15 21:26:25.000000000 +0200
@@ -1196,7 +1196,7 @@
skb->dev = pAdapter->net_dev;
memcpy(skb_put(skb, pRxD->DataByteCnt), pData, pRxD->DataByteCnt);
- skb->mac.raw = skb->data;
-+ skb_reset_mac_header(skb);
++ skb_reset_mac_header(skb);
skb->pkt_type = PACKET_OTHERHOST;
skb->protocol = htons(ETH_P_802_2);
skb->ip_summed = CHECKSUM_NONE;
+diff -Nurd Module.orig/rtmp.h Module/rtmp.h
+--- Module.orig/rtmp.h 2007-07-15 20:37:46.000000000 +0200
++++ Module/rtmp.h 2007-07-15 21:26:25.000000000 +0200
+@@ -62,6 +62,13 @@
+ #endif /*(LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */
+ #endif /* pci_name */
+
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22))
++#define pci_module_init pci_register_driver
++#endif
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))
++#define skb_reset_mac_header(skb) (skb->mac.raw = skb->data)
++#endif
+
+ // Krellan: Limit range of user TxPower settings from -31 to +0 dBm.
+ // We could accept -31 to +31 dBm, relative to 0 dBm which is defined
+diff -Nurd Module.orig/rtmp_main.c Module/rtmp_main.c
+--- Module.orig/rtmp_main.c 2007-07-15 20:37:46.000000000 +0200
++++ Module/rtmp_main.c 2007-07-15 21:26:52.000000000 +0200
+@@ -340,7 +340,11 @@
+ NICDisableInterrupt(pAd);
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
++ status = request_irq(pAd->pPci_Dev->irq, &RTMPIsr, IRQF_SHARED,
net_dev->name, net_dev);
++#else
+ status = request_irq(pAd->pPci_Dev->irq, &RTMPIsr, SA_SHIRQ,
net_dev->name, net_dev);
++#endif
+ if (status)
+ {
+ goto out_module_put;
+@@ -950,7 +954,8 @@
+ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+ int status;
+
+- pci_enable_device(pdev);
++ if (pci_enable_device(pdev))
++ return -EIO;
+
+ printk(KERN_NOTICE "%s: got resume request\n", dev->name);
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
