Package: rt2500-source Version: 1.1.0+cvs20061231-2 Followup-For: Bug #406825
The patch is working, however not protected against older kernel versions... - System Information: Debian Release: 4.0 APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.20-rc5 Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1) Versions of packages rt2500-source depends on: ii debhelper 5.0.42 helper programs for debian/rules ii module-assistant 0.10.9 tool to make module package creati rt2500-source recommends no packages. -- no debconf information
Only in rt2500-new: config.mk Only in rt2500-new/debian: control Only in rt2500-new/debian: control.backup diff -pur rt2500/debian/docs rt2500-new/debian/docs --- rt2500/debian/docs 2007-01-03 20:06:04.000000000 +0000 +++ rt2500-new/debian/docs 2007-01-14 13:52:47.000000000 +0000 @@ -1,3 +1,3 @@ FAQ THANKS -Module/README +README Only in rt2500-new/debian: docs.backup Only in rt2500-new/debian: README.Debian Only in rt2500-new/debian: README.Debian.backup diff -pur rt2500/mlme.c rt2500-new/mlme.c --- rt2500/mlme.c 2006-11-28 08:00:02.000000000 +0000 +++ rt2500-new/mlme.c 2007-01-14 13:52:48.000000000 +0000 @@ -1,5 +1,6 @@ /*************************************************************************** * RT2400/RT2500 SourceForge Project - http://rt2x00.serialmonkey.com * + * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -357,9 +358,14 @@ VOID MlmeHandler( schedule_work(&pAd->mlme_work); } -VOID MlmeWork(void *vpAd) + +//VOID MlmeWork(void *vpAd) +VOID MlmeWork(struct work_struct *work) { - PRTMP_ADAPTER pAd = vpAd; + +// PRTMP_ADAPTER pAd = vpAd; + PRTMP_ADAPTER pAd = container_of(work, struct _RTMP_ADAPTER ,mlme_work); + #endif MLME_QUEUE_ELEM *Elem = NULL; unsigned long flags; Only in rt2500-new: rt2500 diff -pur rt2500/rtmp_init.c rt2500-new/rtmp_init.c --- rt2500/rtmp_init.c 2006-06-16 07:07:25.000000000 +0000 +++ rt2500-new/rtmp_init.c 2007-01-14 13:52:48.000000000 +0000 @@ -916,7 +916,7 @@ VOID NICInitAsicFromEEPROM( DBGPRINT(RT_DEBUG_TRACE, "<-- NICInitAsicFromEEPROM\n"); } -extern VOID MlmeWork(void *vpAd); +extern VOID MlmeWork(struct work_struct *work); void NICInitializeAdapter(IN PRTMP_ADAPTER pAdapter) { @@ -975,7 +975,7 @@ void NICInitializeAdapter(IN PRTMP_AD NICInitializeAsic(pAdapter); #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) - INIT_WORK(&pAdapter->mlme_work, MlmeWork, (void*)pAdapter); + INIT_WORK(&pAdapter->mlme_work, MlmeWork/*, (void*)pAdapter*/); #endif DBGPRINT(RT_DEBUG_TRACE, "<-- NICInitializeAdapter\n"); }
