r56 - unstable/rt2500/debian/patches
benh at alioth.debian.org
benh at alioth.debian.org
Sun Oct 14 18:55:26 UTC 2007
Author: benh
Date: 2007-10-14 18:55:26 +0000 (Sun, 14 Oct 2007)
New Revision: 56
Removed:
unstable/rt2500/debian/patches/002_clean.diff
unstable/rt2500/debian/patches/003_linux-headers.diff
unstable/rt2500/debian/patches/2.6.19.diff
unstable/rt2500/debian/patches/2.6.20.diff
unstable/rt2500/debian/patches/2.6.22.diff
Modified:
unstable/rt2500/debian/patches/series
Log:
Removed patches incorporated upstream.
Deleted: unstable/rt2500/debian/patches/002_clean.diff
===================================================================
--- unstable/rt2500/debian/patches/002_clean.diff 2007-10-14 18:54:33 UTC (rev 55)
+++ unstable/rt2500/debian/patches/002_clean.diff 2007-10-14 18:55:26 UTC (rev 56)
@@ -1,11 +0,0 @@
---- Module/Makefile 2006-06-17 22:12:58.000000000 +0200
-+++ Module/Makefile 2006-12-02 16:25:57.000000000 +0100
-@@ -113,7 +113,7 @@
- clean:
- @rm -f $(RESMAN_GLUE_OBJS) $(RESMAN_CORE_OBJS) .*.{cmd,flags}
- @rm -f $(MODULE_NAME).{o,ko,mod.{o,c}} built-in.o $(VERSION_HEADER) *~
-- @rm -fr .tmp_versions
-+ @rm -fr .tmp_versions Module.symvers
-
- modules_install:
- ifeq ($(PATCHLEVEL),4)
Deleted: unstable/rt2500/debian/patches/003_linux-headers.diff
===================================================================
--- unstable/rt2500/debian/patches/003_linux-headers.diff 2007-10-14 18:54:33 UTC (rev 55)
+++ unstable/rt2500/debian/patches/003_linux-headers.diff 2007-10-14 18:55:26 UTC (rev 56)
@@ -1,40 +0,0 @@
---- Utilitys/rt_tool.cpp
-+++ Utilitys/rt_tool.cpp
-@@ -3,6 +3,7 @@
- #include <string.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
-+#include <linux/if.h>
- #include <linux/wireless.h>
-
- #include "rt_tool.h"
---- Utilitys/addprofiledlg.cpp
-+++ Utilitys/addprofiledlg.cpp
-@@ -29,6 +29,7 @@
- #include <string.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
-+#include <linux/if.h>
- #include <linux/wireless.h>
- #include <ctype.h>
-
---- Utilitys/rt_tool.h
-+++ Utilitys/rt_tool.h
-@@ -3,6 +3,7 @@
-
- #include <sys/socket.h>
- #include <linux/types.h>
-+#include <linux/if.h>
- #include <linux/wireless.h>
-
- #define CONFIGURATION_UI_VERSION "1.2.1.0"
---- Utilitys/raconfig.cpp
-+++ Utilitys/raconfig.cpp
-@@ -7,6 +7,7 @@
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <unistd.h>
-+#include <linux/if.h>
- #include <linux/wireless.h>
- #include <asm/errno.h>
- #include <fcntl.h>
Deleted: unstable/rt2500/debian/patches/2.6.19.diff
===================================================================
--- unstable/rt2500/debian/patches/2.6.19.diff 2007-10-14 18:54:33 UTC (rev 55)
+++ unstable/rt2500/debian/patches/2.6.19.diff 2007-10-14 18:55:26 UTC (rev 56)
@@ -1,107 +0,0 @@
---- Module/rtmp.h 2006/11/28 08:00:02 1.41
-+++ Module/rtmp.h 2006/11/30 23:18:16 1.42
-@@ -1112,10 +1112,16 @@
- INT RT2500_close(
- IN struct net_device *net_dev);
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
- irqreturn_t RTMPIsr(
- IN INT irq,
- IN VOID *dev_instance,
- IN struct pt_regs *rgs);
-+#else
-+irqreturn_t RTMPIsr(
-+ IN INT irq,
-+ IN VOID *dev_instance);
-+#endif
-
- VOID RT2500_timer(
- IN unsigned long data);
---- Module/rtmp_info.c 2006/08/19 23:51:27 1.68
-+++ Module/rtmp_info.c 2006/12/27 21:09:31 1.69
- switch(cmd) {
-@@ -1650,23 +1651,29 @@
- break;
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+ #define customLength (erq->length - 1) // minux null character.
-+#else
-+ #define customLength (erq->length)
-+#endif
-+
- if(RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
- {
-- if (copy_from_user(Ssid.Ssid, erq->pointer, (erq->length - 1)))
-+ if (copy_from_user(Ssid.Ssid, erq->pointer, customLength))
- {
- Status = -EFAULT;
- break;
- }
-- Ssid.SsidLength = erq->length - 1; //minus null character.
-+ Ssid.SsidLength = customLength;
- }else{
- // This SEEMS to be needed to actual work RobinC when iface
- // is down
-- if (copy_from_user(pAdapter->PortCfg.Ssid, erq->pointer, (erq->length - 1)))
-+ if (copy_from_user(pAdapter->PortCfg.Ssid, erq->pointer, customLength))
- {
- Status = -EFAULT;
- break;
- }
-- pAdapter->PortCfg.SsidLen = erq->length - 1; //minus null character.
-+ pAdapter->PortCfg.SsidLen = customLength;
-
- memcpy(pAdapter->Mlme.CntlAux.Ssid, pAdapter->PortCfg.Ssid, pAdapter->PortCfg.SsidLen);
- pAdapter->Mlme.CntlAux.SsidLen = pAdapter->PortCfg.SsidLen;
---- Module/rtmp_main.c 2006/08/23 15:54:40 1.72
-+++ Module/rtmp_main.c 2006/11/30 23:18:16 1.73
-@@ -217,8 +217,8 @@
- csr_addr = (unsigned long) ioremap(pci_resource_start(pPci_Dev, 0), pci_resource_len(pPci_Dev, 0));
- if (!csr_addr)
- {
-- DBGPRINT(RT_DEBUG_TRACE, "ioremap failed for device %s, region 0x%X @ 0x%lX\n",
-- print_name, (ULONG)pci_resource_len(pPci_Dev, 0), pci_resource_start(pPci_Dev, 0));
-+ DBGPRINT(RT_DEBUG_TRACE, "ioremap failed for device %s, region 0x%X @ 0x%X\n",
-+ print_name, (ULONG)pci_resource_len(pPci_Dev, 0), (ULONG)pci_resource_start(pPci_Dev, 0));
- goto err_out_free_res;
- }
-
-@@ -284,8 +284,8 @@
- if (Status != NDIS_STATUS_SUCCESS)
- goto err_out_unmap;
-
-- DBGPRINT(RT_DEBUG_TRACE, "%s: at 0x%lx, VA 0x%lx, IRQ %d. \n",
-- net_dev->name, pci_resource_start(pPci_Dev, 0), (unsigned long)csr_addr, pPci_Dev->irq);
-+ DBGPRINT(RT_DEBUG_TRACE, "%s: at 0x%x, VA 0x%lx, IRQ %d. \n",
-+ net_dev->name, (ULONG)pci_resource_start(pPci_Dev, 0), (unsigned long)csr_addr, pPci_Dev->irq);
-
- // Set driver data
- pci_set_drvdata(pPci_Dev, net_dev);
-@@ -514,10 +514,16 @@
-
- ========================================================================
- */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
- irqreturn_t RTMPIsr(
- IN INT irq,
- IN VOID *dev_instance,
- IN struct pt_regs *rgs)
-+#else
-+irqreturn_t RTMPIsr(
-+ IN INT irq,
-+ IN VOID *dev_instance)
-+#endif
- {
- struct net_device *net_dev = dev_instance;
- PRTMP_ADAPTER pAdapter = net_dev->priv;
---- Module/rt_config.h 2006/08/15 13:12:55 1.16
-+++ Module/rt_config.h 2006/11/30 23:18:16 1.17
-@@ -55,7 +55,6 @@
- #error You must compile this driver with "-O".
- #endif
-
--#include <linux/config.h> //can delete
- #include <linux/module.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
Deleted: unstable/rt2500/debian/patches/2.6.20.diff
===================================================================
--- unstable/rt2500/debian/patches/2.6.20.diff 2007-10-14 18:54:33 UTC (rev 55)
+++ unstable/rt2500/debian/patches/2.6.20.diff 2007-10-14 18:55:26 UTC (rev 56)
@@ -1,44 +0,0 @@
---- Module/mlme.c 2006/11/28 08:00:02 1.34
-+++ Module/mlme.c 2007/01/20 21:12:59 1.35
-@@ -357,9 +357,15 @@
- schedule_work(&pAd->mlme_work);
- }
-
-+# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
-+VOID MlmeWork(struct work_struct *work)
-+{
-+ PRTMP_ADAPTER pAd = container_of(work, struct _RTMP_ADAPTER ,mlme_work);
-+# else /* 2.6.20 patch "older kernels" */
- VOID MlmeWork(void *vpAd)
- {
-- PRTMP_ADAPTER pAd = vpAd;
-+ PRTMP_ADAPTER pAd = vpAd;
-+#endif /* 2.6.20 patch */
- #endif
- MLME_QUEUE_ELEM *Elem = NULL;
- unsigned long flags;
---- Module/rtmp_init.c 2006/06/16 07:07:25 1.30
-+++ Module/rtmp_init.c 2007/01/20 21:12:59 1.31
-@@ -916,7 +916,11 @@
- DBGPRINT(RT_DEBUG_TRACE, "<-- NICInitAsicFromEEPROM\n");
- }
-
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
-+extern VOID MlmeWork(struct work_struct *work);
-+#else
- extern VOID MlmeWork(void *vpAd);
-+#endif
-
- void NICInitializeAdapter(IN PRTMP_ADAPTER pAdapter)
- {
-@@ -974,7 +980,9 @@
- // Initialze ASIC for TX & Rx operation
- NICInitializeAsic(pAdapter);
-
--#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
-+ INIT_WORK(&pAdapter->mlme_work, MlmeWork);
-+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
- INIT_WORK(&pAdapter->mlme_work, MlmeWork, (void*)pAdapter);
- #endif
- DBGPRINT(RT_DEBUG_TRACE, "<-- NICInitializeAdapter\n");
Deleted: unstable/rt2500/debian/patches/2.6.22.diff
===================================================================
--- unstable/rt2500/debian/patches/2.6.22.diff 2007-10-14 18:54:33 UTC (rev 55)
+++ unstable/rt2500/debian/patches/2.6.22.diff 2007-10-14 18:55:26 UTC (rev 56)
@@ -1,54 +0,0 @@
-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->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);
-
Modified: unstable/rt2500/debian/patches/series
===================================================================
--- unstable/rt2500/debian/patches/series 2007-10-14 18:54:33 UTC (rev 55)
+++ unstable/rt2500/debian/patches/series 2007-10-14 18:55:26 UTC (rev 56)
@@ -1,6 +1 @@
000_if_name.diff -p0
-002_clean.diff -p0
-003_linux-headers.diff -p0
-2.6.19.diff -p0
-2.6.20.diff -p0
-2.6.22.diff -p0
More information about the Pkg-ralink-commits
mailing list