rpms/iscsitarget-kmod/F-11 iscsitarget-kmod.spec,1.38,1.39
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/iscsitarget-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23177
Modified Files:
iscsitarget-kmod.spec
Log Message:
* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:0.4.17-2.21
- rebuild for new kernels
Index: iscsitarget-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/iscsitarget-kmod/F-11/iscsitarget-kmod.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- iscsitarget-kmod.spec 22 Aug 2009 17:42:34 -0000 1.38
+++ iscsitarget-kmod.spec 23 Aug 2009 18:05:03 -0000 1.39
@@ -7,7 +7,7 @@
Name: iscsitarget-kmod
Version: 0.4.17
-Release: 2%{?dist}.20
+Release: 2%{?dist}.21
Epoch: 1
Summary: iscsitarget kernel modules
@@ -71,6 +71,9 @@
%changelog
+* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:0.4.17-2.21
+- rebuild for new kernels
+
* Sat Aug 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:0.4.17-2.20
- rebuild for new kernels
15 years, 3 months
rpms/em8300-kmod/F-11 em8300-kmod.spec,1.44,1.45
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/em8300-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23055
Modified Files:
em8300-kmod.spec
Log Message:
* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.17.3-1.6
- rebuild for new kernels
Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/em8300-kmod/F-11/em8300-kmod.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- em8300-kmod.spec 22 Aug 2009 17:42:18 -0000 1.44
+++ em8300-kmod.spec 23 Aug 2009 18:04:48 -0000 1.45
@@ -10,7 +10,7 @@
Name: em8300-kmod
Summary: Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
Version: 0.17.3
-Release: 1%{?prever:.1.%{prever}}%{?dist}.5
+Release: 1%{?prever:.1.%{prever}}%{?dist}.6
Group: System Environment/Kernel
License: GPLv2+
@@ -66,6 +66,9 @@
%changelog
+* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.17.3-1.6
+- rebuild for new kernels
+
* Sat Aug 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.17.3-1.5
- rebuild for new kernels
15 years, 3 months
rpms/blcr-kmod/F-11 blcr-kmod.spec,1.21,1.22
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/blcr-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22929
Modified Files:
blcr-kmod.spec
Log Message:
* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8.1-3.15
- rebuild for new kernels
Index: blcr-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/blcr-kmod/F-11/blcr-kmod.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- blcr-kmod.spec 22 Aug 2009 17:42:02 -0000 1.21
+++ blcr-kmod.spec 23 Aug 2009 18:04:32 -0000 1.22
@@ -7,7 +7,7 @@
Name: blcr-kmod
Version: 0.8.1
-Release: 3%{?dist}.14
+Release: 3%{?dist}.15
Summary: Kernel module (kmod) for Berkeley Lab Checkpoint/Restart for Linux
%define distname blcr-%{version}
@@ -81,6 +81,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8.1-3.15
+- rebuild for new kernels
+
* Sat Aug 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8.1-3.14
- rebuild for new kernels
15 years, 3 months
rpms/buildsys-build-rpmfusion/F-10 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.31, 1.32 buildsys-build-rpmfusion.spec, 1.35, 1.36
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21184
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:10-0.35
- rebuild for kernel 2.6.29.6-99.fc10
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-10/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- buildsys-build-rpmfusion-kerneldevpkgs-current 22 Aug 2009 07:59:15 -0000 1.31
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 23 Aug 2009 07:09:38 -0000 1.32
@@ -1,3 +1,3 @@
-2.6.27.30-170.2.82.fc10
-2.6.27.30-170.2.82.fc10smp
-2.6.27.30-170.2.82.fc10PAE
+2.6.29.6-99.fc10
+2.6.29.6-99.fc10smp
+2.6.29.6-99.fc10PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-10/buildsys-build-rpmfusion.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- buildsys-build-rpmfusion.spec 22 Aug 2009 07:59:15 -0000 1.35
+++ buildsys-build-rpmfusion.spec 23 Aug 2009 07:09:38 -0000 1.36
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 10
-Release: 0.34
+Release: 0.35
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -100,6 +100,9 @@
%changelog
+* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:10-0.35
+- rebuild for kernel 2.6.29.6-99.fc10
+
* Sat Aug 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:10-0.34
- rebuild for kernel 2.6.27.30-170.2.82.fc10
15 years, 3 months
rpms/buildsys-build-rpmfusion/F-11 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.23, 1.24 buildsys-build-rpmfusion.spec, 1.31, 1.32
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21060
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:11-0.20
- rebuild for kernel 2.6.30.5-32.fc11
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-11/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- buildsys-build-rpmfusion-kerneldevpkgs-current 20 Aug 2009 14:41:32 -0000 1.23
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 23 Aug 2009 07:08:34 -0000 1.24
@@ -1,3 +1,3 @@
-2.6.29.6-217.2.8.fc11
-2.6.29.6-217.2.8.fc11smp
-2.6.29.6-217.2.8.fc11PAE
+2.6.30.5-32.fc11
+2.6.30.5-32.fc11smp
+2.6.30.5-32.fc11PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-11/buildsys-build-rpmfusion.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- buildsys-build-rpmfusion.spec 20 Aug 2009 14:41:32 -0000 1.31
+++ buildsys-build-rpmfusion.spec 23 Aug 2009 07:08:34 -0000 1.32
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 11
-Release: 0.19
+Release: 0.20
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -90,6 +90,9 @@
%changelog
+* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:11-0.20
+- rebuild for kernel 2.6.30.5-32.fc11
+
* Thu Aug 20 2009 Xavier Lamien <laxathom(a)fedoraproject.org> - 10:11-0.19
- rebuild for kernel 2.6.29.6-217.2.8.fc11
15 years, 3 months
rpms/rt3070-kmod/F-10 rt3070-suppress-flood.patch, NONE, 1.1 rt3070-kmod.spec, 1.17, 1.18
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt3070-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18891
Modified Files:
rt3070-kmod.spec
Added Files:
rt3070-suppress-flood.patch
Log Message:
* Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.1.0-2
- Suppress a flood of system log messages
rt3070-suppress-flood.patch:
--- NEW FILE rt3070-suppress-flood.patch ---
diff -rupN 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/common/cmm_asic.c 2009_0520_RT3070_Linux_STA_v2.1.1.0/common/cmm_asic.c
--- 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/common/cmm_asic.c 2009-05-20 21:59:31.000000000 -0400
+++ 2009_0520_RT3070_Linux_STA_v2.1.1.0/common/cmm_asic.c 2009-08-22 15:57:28.000000000 -0400
@@ -694,7 +694,7 @@ VOID AsicSwitchChannel(
TxPwer = (7+TxPwer);
TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer);
R3 |= (TxPwer << 10);
- DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer=%d \n", TxPwer));
+ // comment out as it causes flood // DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer=%d \n", TxPwer));
}
else
{
@@ -708,7 +708,7 @@ VOID AsicSwitchChannel(
TxPwer2 = (7+TxPwer2);
TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2);
R4 |= (TxPwer2 << 7);
- DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
+ // comment out as it causes flood // DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
}
else
{
diff -rupN 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/os/linux/rt_ate.c 2009_0520_RT3070_Linux_STA_v2.1.1.0/os/linux/rt_ate.c
--- 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/os/linux/rt_ate.c 2009-05-20 22:00:29.000000000 -0400
+++ 2009_0520_RT3070_Linux_STA_v2.1.1.0/os/linux/rt_ate.c 2009-08-22 15:57:28.000000000 -0400
@@ -3166,7 +3166,7 @@ VOID ATEAsicSwitchChannel(
TxPwer = (7+TxPwer);
TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer);
R3 |= (TxPwer << 10);
- ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer=%d \n", TxPwer));
+ // comment out as it causes flood // ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer=%d \n", TxPwer));
}
else
{
@@ -3180,7 +3180,7 @@ VOID ATEAsicSwitchChannel(
TxPwer2 = (7+TxPwer2);
TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2);
R4 |= (TxPwer2 << 7);
- ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
+ // comment out as it causes flood // ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
}
else
{
diff -rupN 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/os/linux/sta_ioctl.c 2009_0520_RT3070_Linux_STA_v2.1.1.0/os/linux/sta_ioctl.c
--- 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/os/linux/sta_ioctl.c 2009-08-22 15:56:34.000000000 -0400
+++ 2009_0520_RT3070_Linux_STA_v2.1.1.0/os/linux/sta_ioctl.c 2009-08-22 15:57:28.000000000 -0400
@@ -1541,7 +1541,7 @@ int rt_ioctl_giwscan(struct net_device *
data->length = current_ev - extra;
pAdapter->StaCfg.bScanReqIsFromWebUI = FALSE;
- DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length));
+ // comment out as it causes flood in system messages. // DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length));
return 0;
}
#endif
Index: rt3070-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt3070-kmod/F-10/rt3070-kmod.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rt3070-kmod.spec 22 Aug 2009 17:19:51 -0000 1.17
+++ rt3070-kmod.spec 22 Aug 2009 20:02:49 -0000 1.18
@@ -3,11 +3,11 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
Name: rt3070-kmod
Version: 2.1.1.0
-Release: 1%{?dist}.8
+Release: 2%{?dist}
Summary: Kernel module for wireless devices with Ralink's rt307x chipsets
Group: System Environment/Kernel
@@ -21,6 +21,8 @@
Patch3: rt3070-NetworkManager-support.patch
Patch4: rt3070-strip-tftpboot-copy.patch
Patch5: rt3070-2.6.29-compile.patch
+Patch6: rt3070-suppress-flood.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -51,6 +53,7 @@
%patch2 -p1 -b .rpmbuild
%patch3 -p1 -b .NetworkManager
%patch4 -p1 -b .tftpboot
+%patch6 -p1 -b .messageflood
popd
# Fix permissions
@@ -93,6 +96,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.1.0-2
+- Suppress a flood of system log messages
+
* Sat Aug 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-1.8
- rebuild for new kernels
15 years, 3 months
rpms/rt3070-kmod/F-11 rt3070-2.6.31-compile.patch, NONE, 1.1 rt3070-suppress-flood.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 rt3070-kmod.spec, 1.20, 1.21 sources, 1.3, 1.4 rt3070-2.6.29-compile.patch, 1.3, NONE
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt3070-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17912
Modified Files:
.cvsignore rt3070-kmod.spec sources
Added Files:
rt3070-2.6.31-compile.patch rt3070-suppress-flood.patch
Removed Files:
rt3070-2.6.29-compile.patch
Log Message:
* Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.1.0-2
- Suppress a flood of system log messages
- Fix for kernels >= 2.6.31
rt3070-2.6.31-compile.patch:
--- NEW FILE rt3070-2.6.31-compile.patch ---
diff -rupN 2009_0525_RT3070_Linux_STA_v2.1.1.0.old/include/rtmp_os.h 2009_0525_RT3070_Linux_STA_v2.1.1.0/include/rtmp_os.h
--- 2009_0525_RT3070_Linux_STA_v2.1.1.0.old/include/rtmp_os.h 2009-05-20 23:33:56.000000000 -0400
+++ 2009_0525_RT3070_Linux_STA_v2.1.1.0/include/rtmp_os.h 2009-08-04 00:00:46.000000000 -0400
@@ -53,6 +53,7 @@
*/
typedef struct _RTMP_OS_NETDEV_OP_HOOK_
{
+ /*
void *open;
void *stop;
void *xmit;
@@ -63,6 +64,8 @@ typedef struct _RTMP_OS_NETDEV_OP_HOOK_
unsigned char devAddr[6];
unsigned char devName[16];
unsigned char needProtcted;
+ */
+ struct net_device_ops *netdev_ops;
}RTMP_OS_NETDEV_OP_HOOK, *PRTMP_OS_NETDEV_OP_HOOK;
diff -rupN 2009_0525_RT3070_Linux_STA_v2.1.1.0.old/os/linux/rt_linux.c 2009_0525_RT3070_Linux_STA_v2.1.1.0/os/linux/rt_linux.c
--- 2009_0525_RT3070_Linux_STA_v2.1.1.0.old/os/linux/rt_linux.c 2009-05-20 23:33:56.000000000 -0400
+++ 2009_0525_RT3070_Linux_STA_v2.1.1.0/os/linux/rt_linux.c 2009-08-04 00:04:15.000000000 -0400
@@ -1506,20 +1506,21 @@ int RtmpOSNetDevAttach(
if (pDevOpHook)
{
PRTMP_ADAPTER pAd = RTMP_OS_NETDEV_GET_PRIV(pNetDev);
-
+ pNetDev->netdev_ops = pDevOpHook->netdev_ops;
+ /*
pNetDev->open = pDevOpHook->open;
pNetDev->stop = pDevOpHook->stop;
pNetDev->hard_start_xmit = (HARD_START_XMIT_FUNC)(pDevOpHook->xmit);
pNetDev->do_ioctl = pDevOpHook->ioctl;
-
+ */
/* if you don't implement get_stats, just leave the callback function as NULL, a dummy
function will make kernel panic.
*/
- if (pDevOpHook->get_stats)
+ /*if (pDevOpHook->get_stats)
pNetDev->get_stats = pDevOpHook->get_stats;
-
+ */
/* OS specific flags, here we used to indicate if we are virtual interface */
- pNetDev->priv_flags = pDevOpHook->priv_flags;
+ // pNetDev->priv_flags = pDevOpHook->priv_flags;
#if (WIRELESS_EXT < 21) && (WIRELESS_EXT >= 12)
pNetDev->get_wireless_stats = rt28xx_get_wireless_stats;
@@ -1544,15 +1545,15 @@ int RtmpOSNetDevAttach(
#endif // CONFIG_APSTA_MIXED_SUPPORT //
// copy the net device mac address to the net_device structure.
- NdisMoveMemory(pNetDev->dev_addr, &pDevOpHook->devAddr[0], MAC_ADDR_LEN);
+ // NdisMoveMemory(pNetDev->dev_addr, &pDevOpHook->devAddr[0], MAC_ADDR_LEN);
- rtnl_locked = pDevOpHook->needProtcted;
+ // rtnl_locked = pDevOpHook->needProtcted;
}
-
+ /*
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
pNetDev->validate_addr = NULL;
#endif
-
+ */
if (rtnl_locked)
ret = register_netdevice(pNetDev);
else
diff -rupN 2009_0525_RT3070_Linux_STA_v2.1.1.0.old/os/linux/rt_main_dev.c 2009_0525_RT3070_Linux_STA_v2.1.1.0/os/linux/rt_main_dev.c
--- 2009_0525_RT3070_Linux_STA_v2.1.1.0.old/os/linux/rt_main_dev.c 2009-05-20 23:33:56.000000000 -0400
+++ 2009_0525_RT3070_Linux_STA_v2.1.1.0/os/linux/rt_main_dev.c 2009-08-04 00:06:08.000000000 -0400
@@ -504,6 +504,21 @@ err:
return (-1);
} /* End of rt28xx_open */
+static const struct net_device_ops rt2870_netdev_ops = {
+ .ndo_open = MainVirtualIF_open,//
+ .ndo_stop = MainVirtualIF_close,//
+ .ndo_do_ioctl = rt28xx_ioctl,//
+ .ndo_get_stats = RT28xx_get_ether_stats,//
+ .ndo_validate_addr = NULL,
+ .ndo_set_mac_address = eth_mac_addr,
+ .ndo_change_mtu = eth_change_mtu,
+#ifdef IKANOS_VX_1X0
+ .ndo_start_xmit = IKANOS_DataFramesTx,//
+#else
+ .ndo_start_xmit = rt28xx_send_packets,//
+#endif
+};
+
PNET_DEV RtmpPhyNetDevInit(
IN RTMP_ADAPTER *pAd,
@@ -520,6 +535,8 @@ PNET_DEV RtmpPhyNetDevInit(
}
NdisZeroMemory((unsigned char *)pNetDevHook, sizeof(RTMP_OS_NETDEV_OP_HOOK));
+ pNetDevHook->netdev_ops = &rt2870_netdev_ops;
+ /*
pNetDevHook->open = MainVirtualIF_open;
pNetDevHook->stop = MainVirtualIF_close;
pNetDevHook->xmit = rt28xx_send_packets;
@@ -531,7 +548,7 @@ PNET_DEV RtmpPhyNetDevInit(
pNetDevHook->get_stats = RT28xx_get_ether_stats;
pNetDevHook->needProtcted = FALSE;
-
+ */
RTMP_OS_NETDEV_SET_PRIV(net_dev, pAd);
//net_dev->priv = (PVOID)pAd;
pAd->net_dev = net_dev;
rt3070-suppress-flood.patch:
--- NEW FILE rt3070-suppress-flood.patch ---
diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/common/cmm_asic.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/common/cmm_asic.c
--- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/common/cmm_asic.c 2009-03-25 03:20:30.000000000 -0400
+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/common/cmm_asic.c 2009-08-22 12:24:53.000000000 -0400
@@ -609,7 +609,7 @@ VOID AsicSwitchChannel(
TxPwer = (7+TxPwer);
TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer);
R3 |= (TxPwer << 10);
- DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer=%d \n", TxPwer));
+ // comment out as it causes flood // DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer=%d \n", TxPwer));
}
else
{
@@ -623,7 +623,7 @@ VOID AsicSwitchChannel(
TxPwer2 = (7+TxPwer2);
TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2);
R4 |= (TxPwer2 << 7);
- DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
+ // comment out as it causes flood // DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
}
else
{
diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/rt_ate.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/rt_ate.c
--- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/rt_ate.c 2009-03-25 04:06:34.000000000 -0400
+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/rt_ate.c 2009-08-22 12:25:24.000000000 -0400
@@ -4031,7 +4031,7 @@ VOID ATEAsicSwitchChannel(
TxPwer = (7+TxPwer);
TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer);
R3 |= (TxPwer << 10);
- ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer=%d \n", TxPwer));
+ // comment out as it causes flood // ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer=%d \n", TxPwer));
}
else
{
@@ -4045,7 +4045,7 @@ VOID ATEAsicSwitchChannel(
TxPwer2 = (7+TxPwer2);
TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2);
R4 |= (TxPwer2 << 7);
- ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
+ // comment out as it causes flood // ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
}
else
{
diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/sta_ioctl.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/sta_ioctl.c
--- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/sta_ioctl.c 2009-04-23 06:07:18.000000000 -0400
+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/sta_ioctl.c 2009-08-22 12:22:44.000000000 -0400
@@ -1465,7 +1465,7 @@ int rt_ioctl_giwscan(struct net_device *
data->length = current_ev - extra;
pAdapter->StaCfg.bScanReqIsFromWebUI = FALSE;
- DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length));
+ // comment out as it causes flood in system messages. // DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length));
return 0;
}
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/rt3070-kmod/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 23 May 2009 05:18:50 -0000 1.3
+++ .cvsignore 22 Aug 2009 19:51:52 -0000 1.4
@@ -1 +1 @@
-2009_0520_RT3070_Linux_STA_v2.1.1.0.tar.gz
+2009_0525_RT3070_Linux_STA_v2.1.1.0.bz2
Index: rt3070-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt3070-kmod/F-11/rt3070-kmod.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rt3070-kmod.spec 22 Aug 2009 17:44:10 -0000 1.20
+++ rt3070-kmod.spec 22 Aug 2009 19:51:52 -0000 1.21
@@ -3,24 +3,26 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
Name: rt3070-kmod
Version: 2.1.1.0
-Release: 1%{?dist}.9
+Release: 2%{?dist}
Summary: Kernel module for wireless devices with Ralink's rt307x chipsets
Group: System Environment/Kernel
License: GPLv2+
URL: http://www.ralinktech.com/ralink/Home/Support/Linux.html
-Source0: http://www.ralinktech.com.tw/data/drivers/2009_0520_RT3070_Linux_STA_v%{v...
+Source0: http://www.ralinktech.com.tw/data/drivers/2009_0525_RT3070_Linux_STA_v%{v...
Source11: rt3070-kmodtool-excludekernel-filterfile
Patch1: rt3070-no2.4-in-kernelversion.patch
Patch2: rt3070-Makefile.x-fixes.patch
Patch3: rt3070-NetworkManager-support.patch
Patch4: rt3070-strip-tftpboot-copy.patch
-Patch5: rt3070-2.6.29-compile.patch
+Patch5: rt3070-2.6.31-compile.patch
+Patch6: rt3070-suppress-flood.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -46,11 +48,12 @@
%setup -q -c -T -a 0
pushd *RT3070*Linux*STA*
-find . -type d -exec chmod 755 {} \;
%patch1 -p1 -b .no24
%patch2 -p1 -b .rpmbuild
%patch3 -p1 -b .NetworkManager
%patch4 -p1 -b .tftpboot
+%patch5 -p1 -b .2.6.31
+%patch6 -p1 -b .messageflood
popd
# Fix permissions
@@ -67,12 +70,6 @@
for kernel_version in %{?kernel_versions} ; do
cp -a *RT3070*Linux*STA* _kmod_build_${kernel_version%%___*}
- pushd _kmod_build_${kernel_version%%___*}
- if [[ $kernel_version > "2.6.29" ]]; then
-# There are still build errors that need to be corrected
-%patch5 -p1 -b .2.6.29
- fi
- popd
done
%build
@@ -93,6 +90,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.1.0-2
+- Suppress a flood of system log messages
+- Fix for kernels >= 2.6.31
+
* Sat Aug 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-1.9
- rebuild for new kernels
Index: sources
===================================================================
RCS file: /cvs/free/rpms/rt3070-kmod/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 23 May 2009 05:18:50 -0000 1.3
+++ sources 22 Aug 2009 19:51:52 -0000 1.4
@@ -1 +1 @@
-f4823d3b51034d8e655125ac5d133f6b 2009_0520_RT3070_Linux_STA_v2.1.1.0.tar.gz
+b31ab4d77b6836853e293355915cfcad 2009_0525_RT3070_Linux_STA_v2.1.1.0.bz2
--- rt3070-2.6.29-compile.patch DELETED ---
15 years, 3 months
rpms/rt3070-kmod/devel rt3070-suppress-flood.patch, NONE, 1.1 rt3070-kmod.spec, 1.15, 1.16
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt3070-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17345
Modified Files:
rt3070-kmod.spec
Added Files:
rt3070-suppress-flood.patch
Log Message:
* Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.1.0-3
- Suppress a flood of system log messages
rt3070-suppress-flood.patch:
--- NEW FILE rt3070-suppress-flood.patch ---
diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/common/cmm_asic.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/common/cmm_asic.c
--- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/common/cmm_asic.c 2009-03-25 03:20:30.000000000 -0400
+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/common/cmm_asic.c 2009-08-22 12:24:53.000000000 -0400
@@ -609,7 +609,7 @@ VOID AsicSwitchChannel(
TxPwer = (7+TxPwer);
TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer);
R3 |= (TxPwer << 10);
- DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer=%d \n", TxPwer));
+ // comment out as it causes flood // DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer=%d \n", TxPwer));
}
else
{
@@ -623,7 +623,7 @@ VOID AsicSwitchChannel(
TxPwer2 = (7+TxPwer2);
TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2);
R4 |= (TxPwer2 << 7);
- DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
+ // comment out as it causes flood // DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
}
else
{
diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/rt_ate.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/rt_ate.c
--- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/rt_ate.c 2009-03-25 04:06:34.000000000 -0400
+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/rt_ate.c 2009-08-22 12:25:24.000000000 -0400
@@ -4031,7 +4031,7 @@ VOID ATEAsicSwitchChannel(
TxPwer = (7+TxPwer);
TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer);
R3 |= (TxPwer << 10);
- ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer=%d \n", TxPwer));
+ // comment out as it causes flood // ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer=%d \n", TxPwer));
}
else
{
@@ -4045,7 +4045,7 @@ VOID ATEAsicSwitchChannel(
TxPwer2 = (7+TxPwer2);
TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2);
R4 |= (TxPwer2 << 7);
- ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
+ // comment out as it causes flood // ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
}
else
{
diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/sta_ioctl.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/sta_ioctl.c
--- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/sta_ioctl.c 2009-04-23 06:07:18.000000000 -0400
+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/sta_ioctl.c 2009-08-22 12:22:44.000000000 -0400
@@ -1465,7 +1465,7 @@ int rt_ioctl_giwscan(struct net_device *
data->length = current_ev - extra;
pAdapter->StaCfg.bScanReqIsFromWebUI = FALSE;
- DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length));
+ // comment out as it causes flood in system messages. // DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length));
return 0;
}
#endif
Index: rt3070-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt3070-kmod/devel/rt3070-kmod.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rt3070-kmod.spec 4 Aug 2009 04:57:22 -0000 1.15
+++ rt3070-kmod.spec 22 Aug 2009 19:42:32 -0000 1.16
@@ -7,7 +7,7 @@
Name: rt3070-kmod
Version: 2.1.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Kernel module for wireless devices with Ralink's rt307x chipsets
Group: System Environment/Kernel
@@ -21,6 +21,7 @@
Patch3: rt3070-NetworkManager-support.patch
Patch4: rt3070-strip-tftpboot-copy.patch
Patch5: rt3070-2.6.31-compile.patch
+Patch6: rt3070-suppress-flood.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@
%patch3 -p1 -b .NetworkManager
%patch4 -p1 -b .tftpboot
%patch5 -p1 -b .2.6.31
+%patch6 -p1 -b .messageflood
popd
# Fix permissions
@@ -88,6 +90,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.1.0-3
+- Suppress a flood of system log messages
+
* Mon Aug 03 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com>- 2.1.1.0-2
- Fix for kernels >= 2.6.31
15 years, 3 months
rpms/rt2860-kmod/F-10 rt2860-suppress-flood.patch, NONE, 1.1 rt2860-kmod.spec, 1.42, 1.43
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2860-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16081
Modified Files:
rt2860-kmod.spec
Added Files:
rt2860-suppress-flood.patch
Log Message:
* Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.2.0-2
- Suppress a flood of system log messages
rt2860-suppress-flood.patch:
--- NEW FILE rt2860-suppress-flood.patch ---
diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/common/cmm_asic.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/common/cmm_asic.c
--- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/common/cmm_asic.c 2009-03-25 03:20:30.000000000 -0400
+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/common/cmm_asic.c 2009-08-22 12:24:53.000000000 -0400
@@ -609,7 +609,7 @@ VOID AsicSwitchChannel(
TxPwer = (7+TxPwer);
TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer);
R3 |= (TxPwer << 10);
- DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer=%d \n", TxPwer));
+ // comment out as it causes flood // DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer=%d \n", TxPwer));
}
else
{
@@ -623,7 +623,7 @@ VOID AsicSwitchChannel(
TxPwer2 = (7+TxPwer2);
TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2);
R4 |= (TxPwer2 << 7);
- DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
+ // comment out as it causes flood // DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
}
else
{
diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/rt_ate.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/rt_ate.c
--- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/rt_ate.c 2009-03-25 04:06:34.000000000 -0400
+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/rt_ate.c 2009-08-22 12:25:24.000000000 -0400
@@ -4031,7 +4031,7 @@ VOID ATEAsicSwitchChannel(
TxPwer = (7+TxPwer);
TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer);
R3 |= (TxPwer << 10);
- ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer=%d \n", TxPwer));
+ // comment out as it causes flood // ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer=%d \n", TxPwer));
}
else
{
@@ -4045,7 +4045,7 @@ VOID ATEAsicSwitchChannel(
TxPwer2 = (7+TxPwer2);
TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2);
R4 |= (TxPwer2 << 7);
- ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
+ // comment out as it causes flood // ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
}
else
{
diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/sta_ioctl.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/sta_ioctl.c
--- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/sta_ioctl.c 2009-04-23 06:07:18.000000000 -0400
+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/sta_ioctl.c 2009-08-22 12:22:44.000000000 -0400
@@ -1465,7 +1465,7 @@ int rt_ioctl_giwscan(struct net_device *
data->length = current_ev - extra;
pAdapter->StaCfg.bScanReqIsFromWebUI = FALSE;
- DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length));
+ // comment out as it causes flood in system messages. // DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length));
return 0;
}
#endif
Index: rt2860-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2860-kmod/F-10/rt2860-kmod.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- rt2860-kmod.spec 22 Aug 2009 17:19:19 -0000 1.42
+++ rt2860-kmod.spec 22 Aug 2009 19:24:30 -0000 1.43
@@ -3,11 +3,11 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
Name: rt2860-kmod
Version: 2.1.2.0
-Release: 1%{?dist}.8
+Release: 2%{?dist}
Summary: Kernel module for RaLink 802.11 wireless devices rt2760/rt2790/rt2860/rt2890
Group: System Environment/Kernel
@@ -20,6 +20,8 @@
Patch2: rt2860-add-network-mgr-support.diff
Patch3: rt2860-remove-tftpboot-copy.patch
Patch4: rt2860-no2.4-in-kernelversion.patch
+#Patch5: rt2860-2.6.31-compile.patch
+Patch6: rt2860-suppress-flood.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -50,6 +52,8 @@
%patch2 -p1 -b .NetworkManager
%patch3 -p1 -b .tftpboot
%patch4 -p1 -b .no24
+#patch5 -p1 -b .2.6.31
+%patch6 -p1 -b .messageflood
popd
# Fix weird permissions
@@ -78,6 +82,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.2.0-2
+- Suppress a flood of system log messages
+
* Sat Aug 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.2.0-1.8
- rebuild for new kernels
15 years, 3 months
rpms/rt2860-kmod/F-11 rt2860-2.6.31-compile.patch, NONE, 1.1 rt2860-suppress-flood.patch, NONE, 1.1 rt2860-kmod.spec, 1.50, 1.51
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2860-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15908
Modified Files:
rt2860-kmod.spec
Added Files:
rt2860-2.6.31-compile.patch rt2860-suppress-flood.patch
Log Message:
* Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.2.0-2
- Suppress a flood of system log messages
- Fix for kernels >= 2.6.31
rt2860-2.6.31-compile.patch:
--- NEW FILE rt2860-2.6.31-compile.patch ---
diff -rupN 2009_0521_RT2870_Linux_STA_V2.1.2.0.old/include/rtmp_os.h 2009_0521_RT2870_Linux_STA_V2.1.2.0/include/rtmp_os.h
--- 2009_0521_RT2870_Linux_STA_V2.1.2.0.old/include/rtmp_os.h 2009-04-23 05:40:41.000000000 -0400
+++ 2009_0521_RT2870_Linux_STA_V2.1.2.0/include/rtmp_os.h 2009-08-02 19:46:07.000000000 -0400
@@ -59,6 +59,7 @@
*/
typedef struct _RTMP_OS_NETDEV_OP_HOOK_
{
+ /*
void *open;
void *stop;
void *xmit;
@@ -69,6 +70,8 @@ typedef struct _RTMP_OS_NETDEV_OP_HOOK_
unsigned char devAddr[6];
unsigned char devName[16];
unsigned char needProtcted;
+ */
+ struct net_device_ops *netdev_ops;
}RTMP_OS_NETDEV_OP_HOOK, *PRTMP_OS_NETDEV_OP_HOOK;
diff -rupN 2009_0521_RT2870_Linux_STA_V2.1.2.0.old/os/linux/rt_linux.c 2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/rt_linux.c
--- 2009_0521_RT2870_Linux_STA_V2.1.2.0.old/os/linux/rt_linux.c 2009-04-23 05:55:24.000000000 -0400
+++ 2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/rt_linux.c 2009-08-02 20:32:09.000000000 -0400
@@ -1505,20 +1505,22 @@ int RtmpOSNetDevAttach(
PRTMP_ADAPTER pAd = NULL;
GET_PAD_FROM_NET_DEV(pAd, pNetDev);
+ pNetDev->netdev_ops = pDevOpHook->netdev_ops;
+ /*
pNetDev->open = pDevOpHook->open;
pNetDev->stop = pDevOpHook->stop;
pNetDev->hard_start_xmit = (HARD_START_XMIT_FUNC)(pDevOpHook->xmit);
pNetDev->do_ioctl = pDevOpHook->ioctl;
-
+ */
/* if you don't implement get_stats, just leave the callback function as NULL, a dummy
function will make kernel panic.
*/
- if (pDevOpHook->get_stats)
+ /*if (pDevOpHook->get_stats)
pNetDev->get_stats = pDevOpHook->get_stats;
-
+ */
/* OS specific flags, here we used to indicate if we are virtual interface */
- pNetDev->priv_flags = pDevOpHook->priv_flags;
-
+ // pNetDev->priv_flags = pDevOpHook->priv_flags;
+
#if (WIRELESS_EXT < 21) && (WIRELESS_EXT >= 12)
pNetDev->get_wireless_stats = rt28xx_get_wireless_stats;
#endif
@@ -1542,15 +1544,15 @@ int RtmpOSNetDevAttach(
#endif // CONFIG_APSTA_MIXED_SUPPORT //
// copy the net device mac address to the net_device structure.
- NdisMoveMemory(pNetDev->dev_addr, &pDevOpHook->devAddr[0], MAC_ADDR_LEN);
+ //NdisMoveMemory(pNetDev->dev_addr, &pDevOpHook->devAddr[0], MAC_ADDR_LEN);
- rtnl_locked = pDevOpHook->needProtcted;
+ //rtnl_locked = pDevOpHook->needProtcted;
}
-
+ /*
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
pNetDev->validate_addr = NULL;
#endif
-
+ */
if (rtnl_locked)
ret = register_netdevice(pNetDev);
else
diff -rupN 2009_0521_RT2870_Linux_STA_V2.1.2.0.old/os/linux/rt_main_dev.c 2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/rt_main_dev.c
--- 2009_0521_RT2870_Linux_STA_V2.1.2.0.old/os/linux/rt_main_dev.c 2009-04-23 05:40:40.000000000 -0400
+++ 2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/rt_main_dev.c 2009-08-02 19:38:35.000000000 -0400
@@ -501,6 +501,20 @@ err:
return (-1);
} /* End of rt28xx_open */
+static const struct net_device_ops rt2870_netdev_ops = {
+ .ndo_open = MainVirtualIF_open,//
+ .ndo_stop = MainVirtualIF_close,//
+ .ndo_do_ioctl = rt28xx_ioctl,//
+ .ndo_get_stats = RT28xx_get_ether_stats,//
+ .ndo_validate_addr = NULL,
+ .ndo_set_mac_address = eth_mac_addr,
+ .ndo_change_mtu = eth_change_mtu,
+#ifdef IKANOS_VX_1X0
+ .ndo_start_xmit = IKANOS_DataFramesTx,//
+#else
+ .ndo_start_xmit = rt28xx_send_packets,//
+#endif
+};
PNET_DEV RtmpPhyNetDevInit(
IN RTMP_ADAPTER *pAd,
@@ -517,6 +531,8 @@ PNET_DEV RtmpPhyNetDevInit(
}
NdisZeroMemory((unsigned char *)pNetDevHook, sizeof(RTMP_OS_NETDEV_OP_HOOK));
+ pNetDevHook->netdev_ops = &rt2870_netdev_ops;
+ /*
pNetDevHook->open = MainVirtualIF_open;
pNetDevHook->stop = MainVirtualIF_close;
pNetDevHook->xmit = rt28xx_send_packets;
@@ -528,7 +544,7 @@ PNET_DEV RtmpPhyNetDevInit(
pNetDevHook->get_stats = RT28xx_get_ether_stats;
pNetDevHook->needProtcted = FALSE;
-
+ */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
net_dev->ml_priv = (PVOID)pAd;
#else
rt2860-suppress-flood.patch:
--- NEW FILE rt2860-suppress-flood.patch ---
diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/common/cmm_asic.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/common/cmm_asic.c
--- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/common/cmm_asic.c 2009-03-25 03:20:30.000000000 -0400
+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/common/cmm_asic.c 2009-08-22 12:24:53.000000000 -0400
@@ -609,7 +609,7 @@ VOID AsicSwitchChannel(
TxPwer = (7+TxPwer);
TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer);
R3 |= (TxPwer << 10);
- DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer=%d \n", TxPwer));
+ // comment out as it causes flood // DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer=%d \n", TxPwer));
}
else
{
@@ -623,7 +623,7 @@ VOID AsicSwitchChannel(
TxPwer2 = (7+TxPwer2);
TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2);
R4 |= (TxPwer2 << 7);
- DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
+ // comment out as it causes flood // DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
}
else
{
diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/rt_ate.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/rt_ate.c
--- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/rt_ate.c 2009-03-25 04:06:34.000000000 -0400
+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/rt_ate.c 2009-08-22 12:25:24.000000000 -0400
@@ -4031,7 +4031,7 @@ VOID ATEAsicSwitchChannel(
TxPwer = (7+TxPwer);
TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer);
R3 |= (TxPwer << 10);
- ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer=%d \n", TxPwer));
+ // comment out as it causes flood // ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer=%d \n", TxPwer));
}
else
{
@@ -4045,7 +4045,7 @@ VOID ATEAsicSwitchChannel(
TxPwer2 = (7+TxPwer2);
TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2);
R4 |= (TxPwer2 << 7);
- ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
+ // comment out as it causes flood // ATEDBGPRINT(RT_DEBUG_TRACE, ("ATEAsicSwitchChannel: TxPwer2=%d \n", TxPwer2));
}
else
{
diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/sta_ioctl.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/sta_ioctl.c
--- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/sta_ioctl.c 2009-04-23 06:07:18.000000000 -0400
+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/sta_ioctl.c 2009-08-22 12:22:44.000000000 -0400
@@ -1465,7 +1465,7 @@ int rt_ioctl_giwscan(struct net_device *
data->length = current_ev - extra;
pAdapter->StaCfg.bScanReqIsFromWebUI = FALSE;
- DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length));
+ // comment out as it causes flood in system messages. // DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length));
return 0;
}
#endif
Index: rt2860-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2860-kmod/F-11/rt2860-kmod.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- rt2860-kmod.spec 22 Aug 2009 17:43:37 -0000 1.50
+++ rt2860-kmod.spec 22 Aug 2009 19:22:17 -0000 1.51
@@ -3,11 +3,11 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
Name: rt2860-kmod
Version: 2.1.2.0
-Release: 1%{?dist}.9
+Release: 2%{?dist}
Summary: Kernel module for RaLink 802.11 wireless devices rt2760/rt2790/rt2860/rt2890
Group: System Environment/Kernel
@@ -20,6 +20,8 @@
Patch2: rt2860-add-network-mgr-support.diff
Patch3: rt2860-remove-tftpboot-copy.patch
Patch4: rt2860-no2.4-in-kernelversion.patch
+Patch5: rt2860-2.6.31-compile.patch
+Patch6: rt2860-suppress-flood.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -50,6 +52,8 @@
%patch2 -p1 -b .NetworkManager
%patch3 -p1 -b .tftpboot
%patch4 -p1 -b .no24
+%patch5 -p1 -b .2.6.31
+%patch6 -p1 -b .messageflood
popd
# Fix weird permissions
@@ -78,6 +82,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Aug 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.2.0-2
+- Suppress a flood of system log messages
+- Fix for kernels >= 2.6.31
+
* Sat Aug 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.2.0-1.9
- rebuild for new kernels
15 years, 3 months