Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cfd864231b9fdc92b5979ac1805f6d2ec969e8a2
commit cfd864231b9fdc92b5979ac1805f6d2ec969e8a2 Author: VMiklos <[EMAIL PROTECTED]> Date: Mon Sep 24 00:36:41 2007 +0200 rt2400-1.2.2_b3-9-i686 updated kernel2622.diff diff --git a/source/network-extra/rt2400/FrugalBuild b/source/network-extra/rt2400/FrugalBuild index c0badbe..250ed79 100644 --- a/source/network-extra/rt2400/FrugalBuild +++ b/source/network-extra/rt2400/FrugalBuild @@ -3,7 +3,7 @@ pkgname=rt2400 pkgver=1.2.2_b3 -pkgrel=8 +pkgrel=9 pkgdesc="Driver for wireless cards that are based on the Ralink rt2400 chipsets." Finclude kernel-module sourceforge url="http://rt2x00.serialmonkey.com/wiki/index.php"; @@ -14,7 +14,7 @@ source=($source rt2400-1.2.2_b3-cvs_fixes.diff \ rt2400-1.2.2_b3-kernel2622.diff) sha1sums=('b572d027c4433b964a7c613a31885a2e0853d92a' \ 'e0435cc51fececdc38bb64d17d25ce727a2ee8e3' \ - '355f7e94ce5477b775b1d2183e7d7d720ab71201') + 'a54f9b2cbc92ee2ca0f8cb79f5951ad915e40940') build() { diff --git a/source/network-extra/rt2400/rt2400-1.2.2_b3-kernel2622.diff b/source/network-extra/rt2400/rt2400-1.2.2_b3-kernel2622.diff index dd5dfc7..cc9b8bd 100644 --- a/source/network-extra/rt2400/rt2400-1.2.2_b3-kernel2622.diff +++ b/source/network-extra/rt2400/rt2400-1.2.2_b3-kernel2622.diff @@ -1,11 +1,53 @@ ---- Module/rtmp_data.c.orig 2007-07-10 15:33:35.000000000 +0200 -+++ Module/rtmp_data.c 2007-07-10 15:33:49.000000000 +0200 +--- Module/rt_config.h 2007/05/10 08:45:32 1.8 ++++ Module/rt_config.h 2007/06/18 19:39:09 1.9 +@@ -88,6 +88,22 @@ + #include <asm/irq.h> + #include <asm/uaccess.h> + ++#ifndef pci_name ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) ++#define pci_name(__pPci_Dev) (__pPci_Dev)->dev.bus_id ++#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */ ++#define pci_name(__pPci_Dev) (__pPci_Dev)->slot_name ++#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 ++ + #if WIRELESS_EXT > 12 + #include <net/iw_handler.h> /* New driver API */ + #endif /* WIRELESS_EXT > 12 */ +--- Module/rtmp.h 2007/04/25 05:28:43 1.10 ++++ Module/rtmp.h 2007/06/18 19:39:10 1.11 +@@ -55,14 +55,6 @@ + #define netdev_priv(_dev) ( _dev->priv ) + #endif + +-#ifndef pci_name +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) +-#define pci_name(__pPci_Dev) (__pPci_Dev)->dev.bus_id +-#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */ +-#define pci_name(__pPci_Dev) (__pPci_Dev)->slot_name +-#endif /*(LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */ +-#endif /* pci_name */ +- + // + // MACRO for debugging information + // +--- Module/rtmp_data.c 2007/03/21 04:12:20 1.6 ++++ Module/rtmp_data.c 2007/06/18 19:39:10 1.7 @@ -110,7 +110,7 @@ { skb->dev = pAd->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->protocol = htons(ETH_P_802_2); skb->ip_summed = CHECKSUM_NONE; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
