rpms/rt2860-kmod/F-10 rt2860-no2.4-in-kernelversion.patch, NONE, 1.1 rt2860-kmod.spec, 1.26, 1.27 rt2860-remove-tftpboot-copy.patch, 1.2, 1.3
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2860-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6644
Modified Files:
rt2860-kmod.spec rt2860-remove-tftpboot-copy.patch
Added Files:
rt2860-no2.4-in-kernelversion.patch
Log Message:
* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.8.0.0-3.5
- Bugfix: kmod doesn't compile when the kernel version has a "2.4" substring
rt2860-no2.4-in-kernelversion.patch:
--- NEW FILE rt2860-no2.4-in-kernelversion.patch ---
--- 2008_0918_RT2860_Linux_STA_v1.8.0.0.old/os/linux/config.mk 2008-09-17 23:27:46.000000000 -0400
+++ 2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/config.mk 2009-03-26 03:02:19.000000000 -0400
@@ -223,14 +223,7 @@ export CFLAGS
endif
ifeq ($(PLATFORM),PC)
- ifneq (,$(findstring 2.4,$(LINUX_SRC)))
- # Linux 2.4
- CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h $(WFLAGS)
- export CFLAGS
- else
- # Linux 2.6
EXTRA_CFLAGS := $(WFLAGS) -I$(RT28xx_DIR)/include
- endif
endif
ifeq ($(PLATFORM),IXP)
Index: rt2860-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2860-kmod/F-10/rt2860-kmod.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rt2860-kmod.spec 25 Mar 2009 14:29:54 -0000 1.26
+++ rt2860-kmod.spec 26 Mar 2009 07:36:41 -0000 1.27
@@ -7,7 +7,7 @@
Name: rt2860-kmod
Version: 1.8.0.0
-Release: 3%{?dist}.4
+Release: 3%{?dist}.5
Summary: Kernel module for RaLink 802.11 wireless devices rt2760/rt2790/rt2860/rt2890
Group: System Environment/Kernel
@@ -19,6 +19,7 @@
Patch1: rt2860-dat-install-fixes.patch
Patch2: rt2860-add-network-mgr-support.diff
Patch3: rt2860-remove-tftpboot-copy.patch
+Patch4: rt2860-no2.4-in-kernelversion.patch
Patch5: rt2860-2.6.29-compile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,7 +48,8 @@
%patch1 -p1 -b .rpmbuild
%patch2 -p1 -b .NetworkManager
-%patch3 -p1 -b .tftpboot
+%patch3 -p0 -b .tftpboot
+%patch4 -p0 -b .no24
for kernel_version in %{?kernel_versions} ; do
cp -a *RT2860_Linux_STA* _kmod_build_${kernel_version%%___*}
@@ -76,6 +78,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.8.0.0-3.5
+- Bugfix: kmod doesn't compile when the kernel version has a "2.4" substring
+
* Wed Mar 25 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.8.0.0-3.4
- rebuild for new kernels
rt2860-remove-tftpboot-copy.patch:
Index: rt2860-remove-tftpboot-copy.patch
===================================================================
RCS file: /cvs/free/rpms/rt2860-kmod/F-10/rt2860-remove-tftpboot-copy.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rt2860-remove-tftpboot-copy.patch 19 Oct 2008 20:25:42 -0000 1.2
+++ rt2860-remove-tftpboot-copy.patch 26 Mar 2009 07:36:41 -0000 1.3
@@ -1,10 +1,12 @@
-diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile new/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile
---- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile 2008-09-17 22:26:56.000000000 -0400
-+++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile 2008-10-19 15:43:22.000000000 -0400
-@@ -125,27 +125,9 @@ LINUX:
- ifneq (,$(findstring 2.4,$(LINUX_SRC)))
- cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
- make -C $(RT28xx_DIR)/os/linux/
+--- 2008_0918_RT2860_Linux_STA_v1.8.0.0.old/Makefile 2008-09-17 22:26:56.000000000 -0400
++++ 2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile 2009-03-26 03:00:09.000000000 -0400
+@@ -122,57 +122,20 @@ build_tools:
+
+
+ LINUX:
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
+- make -C $(RT28xx_DIR)/os/linux/
-ifeq ($(RT28xx_MODE),AP)
- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot
-else
@@ -14,7 +16,7 @@
- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
-endif
-endif
- else
+-else
cp -f os/linux/Makefile.6 $(RT28xx_DIR)/os/linux/Makefile
make -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
-ifeq ($(RT28xx_MODE),AP)
@@ -26,6 +28,33 @@
- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
-endif
-endif
- endif
+-endif
clean:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- cp -f os/linux/Makefile.4 os/linux/Makefile
+-else
+ cp -f os/linux/Makefile.6 os/linux/Makefile
+-endif
+- make -C os/linux clean
+- rm -rf os/linux/Makefile
+ endif
+
+ uninstall:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- make -C $(RT28xx_DIR)/os/linux -f Makefile.4 uninstall
+-else
+ make -C $(RT28xx_DIR)/os/linux -f Makefile.6 uninstall
+ endif
+-endif
+
+ install:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- make -C $(RT28xx_DIR)/os/linux -f Makefile.4 install
+-else
+ make -C $(RT28xx_DIR)/os/linux -f Makefile.6 install
+ endif
+-endif
15 years, 3 months
rpms/rt2860-kmod/F-9 rt2860-2.6.29-compile.patch, NONE, 1.1 rt2860-no2.4-in-kernelversion.patch, NONE, 1.1 rt2860-kmod.spec, 1.16, 1.17 rt2860-remove-tftpboot-copy.patch, 1.2, 1.3 rt2860-2.6.25-iwe_stream-fix.diff, 1.2, NONE
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2860-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5959
Modified Files:
rt2860-kmod.spec rt2860-remove-tftpboot-copy.patch
Added Files:
rt2860-2.6.29-compile.patch
rt2860-no2.4-in-kernelversion.patch
Removed Files:
rt2860-2.6.25-iwe_stream-fix.diff
Log Message:
* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.8.0.0-1.14
- Bugfix: kmod doesn't compile when the kernel version has a "2.4" substring
- Add 2.6.29 compilation patch (just in case)
rt2860-2.6.29-compile.patch:
--- NEW FILE rt2860-2.6.29-compile.patch ---
diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/include/rt2860.h new/2008_0918_RT2860_Linux_STA_v1.8.0.0/include/rt2860.h
--- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/include/rt2860.h 2008-09-10 21:23:56.000000000 -0400
+++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/include/rt2860.h 2009-01-11 02:08:03.000000000 -0500
@@ -242,7 +242,7 @@ rt2860_interrupt(int irq, void *dev_inst
#endif
#define RT28XX_IRQ_REQUEST(net_dev) \
-{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->priv); \
+{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->ml_priv); \
POS_COOKIE _pObj = (POS_COOKIE)(_pAd->OS_Cookie); \
RTMP_MSI_ENABLE(_pAd); \
if ((retval = request_irq(_pObj->pci_dev->irq, \
@@ -253,14 +253,14 @@ rt2860_interrupt(int irq, void *dev_inst
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
#define RT28XX_IRQ_RELEASE(net_dev) \
-{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->priv); \
+{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->ml_priv); \
POS_COOKIE _pObj = (POS_COOKIE)(_pAd->OS_Cookie); \
synchronize_irq(_pObj->pci_dev->irq); \
free_irq(_pObj->pci_dev->irq, (net_dev)); \
RTMP_MSI_DISABLE(_pAd); }
#else
#define RT28XX_IRQ_RELEASE(net_dev) \
-{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->priv); \
+{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->ml_priv); \
POS_COOKIE _pObj = (POS_COOKIE)(_pAd->OS_Cookie); \
free_irq(_pObj->pci_dev->irq, (net_dev)); \
RTMP_MSI_DISABLE(_pAd); }
diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/2860_main_dev.c new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/2860_main_dev.c
--- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/2860_main_dev.c 2008-09-10 08:32:02.000000000 -0400
+++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/2860_main_dev.c 2009-01-11 02:03:33.000000000 -0500
@@ -170,7 +170,7 @@ static int rt2860_suspend(
}
else
{
- pAd = (PRTMP_ADAPTER)net_dev->priv;
+ pAd = (PRTMP_ADAPTER)net_dev->ml_priv;
/* we can not use IFF_UP because ra0 down but ra1 up */
/* and 1 suspend/resume function for 1 module, not for each interface */
@@ -249,7 +249,7 @@ static int rt2860_resume(
DBGPRINT(RT_DEBUG_ERROR, ("net_dev == NULL!\n"));
}
else
- pAd = (PRTMP_ADAPTER)net_dev->priv;
+ pAd = (PRTMP_ADAPTER)net_dev->ml_priv;
if (pAd != NULL)
{
@@ -336,7 +336,7 @@ static VOID __devexit rt2860_remove_one(
IN struct pci_dev *pci_dev)
{
struct net_device *net_dev = pci_get_drvdata(pci_dev);
- RTMP_ADAPTER *pAd = net_dev->priv;
+ RTMP_ADAPTER *pAd = net_dev->ml_priv;
DBGPRINT(RT_DEBUG_TRACE, ("===> rt2860_remove_one\n"));
@@ -765,7 +765,7 @@ rt2860_interrupt(int irq, void *dev_inst
#endif
{
struct net_device *net_dev = (struct net_device *) dev_instance;
- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv;
+ PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->ml_priv;
INT_SOURCE_CSR_STRUC IntSource;
POS_COOKIE pObj;
@@ -1300,7 +1300,7 @@ VOID rt2860_stop(struct net_device *net_
DBGPRINT(RT_DEBUG_ERROR, ("net_dev == NULL!\n"));
}
else
- pAd = (PRTMP_ADAPTER)net_dev->priv;
+ pAd = (PRTMP_ADAPTER)net_dev->ml_priv;
if (pAd != NULL)
{
diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_main_dev.c new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_main_dev.c
--- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_main_dev.c 2008-09-10 08:39:30.000000000 -0400
+++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_main_dev.c 2009-01-11 02:00:10.000000000 -0500
@@ -135,7 +135,7 @@ Note:
*/
int MainVirtualIF_close(IN struct net_device *net_dev)
{
- RTMP_ADAPTER *pAd = net_dev->priv;
+ RTMP_ADAPTER *pAd = net_dev->ml_priv;
// Sanity check for pAd
if (pAd == NULL)
@@ -174,7 +174,7 @@ Note:
*/
int MainVirtualIF_open(IN struct net_device *net_dev)
{
- RTMP_ADAPTER *pAd = net_dev->priv;
+ RTMP_ADAPTER *pAd = net_dev->ml_priv;
// Sanity check for pAd
if (pAd == NULL)
@@ -216,7 +216,7 @@ Note:
int rt28xx_close(IN PNET_DEV dev)
{
struct net_device * net_dev = (struct net_device *)dev;
- RTMP_ADAPTER *pAd = net_dev->priv;
+ RTMP_ADAPTER *pAd = net_dev->ml_priv;
BOOLEAN Cancelled = FALSE;
UINT32 i = 0;
@@ -396,7 +396,7 @@ int rt28xx_close(IN PNET_DEV dev)
static int rt28xx_init(IN struct net_device *net_dev)
{
- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->priv;
+ PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->ml_priv;
UINT index;
UCHAR TmpPhy;
NDIS_STATUS Status;
@@ -606,7 +606,7 @@ err1:
RT28XX_IRQ_RELEASE(net_dev);
// shall not set priv to NULL here because the priv didn't been free yet.
- //net_dev->priv = 0;
+ //net_dev->ml_priv = 0;
#ifdef INF_AMAZON_SE
err0:
#endif // INF_AMAZON_SE //
@@ -633,7 +633,7 @@ Note:
int rt28xx_open(IN PNET_DEV dev)
{
struct net_device * net_dev = (struct net_device *)dev;
- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->priv;
+ PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->ml_priv;
int retval = 0;
POS_COOKIE pObj;
@@ -642,7 +642,7 @@ int rt28xx_open(IN PNET_DEV dev)
if (pAd == NULL)
{
/* if 1st open fail, pAd will be free;
- So the net_dev->priv will be NULL in 2rd open */
+ So the net_dev->ml_priv will be NULL in 2rd open */
return -1;
}
@@ -1303,7 +1303,7 @@ INT __devinit rt28xx_probe(
if (status != NDIS_STATUS_SUCCESS)
goto err_out_free_netdev;
- net_dev->priv = (PVOID)pAd;
+ net_dev->ml_priv = (PVOID)pAd;
pAd->net_dev = net_dev; // must be before RT28XXNetDevInit()
RT28XXNetDevInit(_dev_p, net_dev, pAd);
@@ -1399,7 +1399,7 @@ Note:
int rt28xx_packet_xmit(struct sk_buff *skb)
{
struct net_device *net_dev = skb->dev;
- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv;
+ PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->ml_priv;
int status = 0;
PNDIS_PACKET pPacket = (PNDIS_PACKET) skb;
@@ -1478,7 +1478,7 @@ INT rt28xx_send_packets(
IN struct sk_buff *skb_p,
IN struct net_device *net_dev)
{
- RTMP_ADAPTER *pAd = net_dev->priv;
+ RTMP_ADAPTER *pAd = net_dev->ml_priv;
if (!(net_dev->flags & IFF_UP))
{
RELEASE_NDIS_PACKET(pAd, (PNDIS_PACKET)skb_p, NDIS_STATUS_FAILURE);
@@ -1519,7 +1519,7 @@ struct net_device *alloc_netdev(
memset(dev, 0, alloc_size);
if (sizeof_priv)
- dev->priv = (void *) (((long)(dev + 1) + 31) & ~31);
+ dev->ml_priv = (void *) (((long)(dev + 1) + 31) & ~31);
setup(dev);
strcpy(dev->name, mask);
@@ -1540,7 +1540,7 @@ void CfgInitHook(PRTMP_ADAPTER pAd)
struct iw_statistics *rt28xx_get_wireless_stats(
IN struct net_device *net_dev)
{
- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv;
+ PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->ml_priv;
DBGPRINT(RT_DEBUG_TRACE, ("rt28xx_get_wireless_stats --->\n"));
@@ -1592,18 +1592,18 @@ INT rt28xx_ioctl(
if (net_dev->priv_flags == INT_MAIN)
{
- pAd = net_dev->priv;
+ pAd = net_dev->ml_priv;
}
else
{
- pVirtualAd = net_dev->priv;
- pAd = pVirtualAd->RtmpDev->priv;
+ pVirtualAd = net_dev->ml_priv;
+ pAd = pVirtualAd->RtmpDev->ml_priv;
}
if (pAd == NULL)
{
/* if 1st open fail, pAd will be free;
- So the net_dev->priv will be NULL in 2rd open */
+ So the net_dev->ml_priv will be NULL in 2rd open */
return -ENETDOWN;
}
@@ -1640,7 +1640,7 @@ struct net_device_stats *RT28xx_get_ethe
RTMP_ADAPTER *pAd = NULL;
if (net_dev)
- pAd = net_dev->priv;
+ pAd = net_dev->ml_priv;
if (pAd)
{
diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_profile.c new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_profile.c
--- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_profile.c 2008-09-10 08:40:44.000000000 -0400
+++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/rt_profile.c 2009-01-11 01:52:14.000000000 -0500
@@ -925,9 +925,9 @@ NDIS_STATUS RTMPReadParametersHook(
// Save uid and gid used for filesystem access.
// Set user and group to 0 (root)
- orgfsuid = current->fsuid;
- orgfsgid = current->fsgid;
- current->fsuid=current->fsgid = 0;
+ orgfsuid = current_fsuid();
+ orgfsgid = current_fsgid();
+ /* current->fsuid=current->fsgid = 0;*/
orgfs = get_fs();
set_fs(KERNEL_DS);
@@ -1551,9 +1551,10 @@ NDIS_STATUS RTMPReadParametersHook(
}
set_fs(orgfs);
+#if 0
current->fsuid = orgfsuid;
current->fsgid = orgfsgid;
-
+#endif
kfree(buffer);
kfree(tmpbuf);
diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/sta_ioctl.c new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/sta_ioctl.c
--- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/sta_ioctl.c 2009-01-11 01:47:07.000000000 -0500
+++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/sta_ioctl.c 2009-01-11 02:05:38.000000000 -0500
@@ -571,7 +571,7 @@ rt_ioctl_giwname(struct net_device *dev,
struct iw_request_info *info,
char *name, char *extra)
{
-// PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+// PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
#ifdef RT2860
strncpy(name, "RT2860 Wireless", IFNAMSIZ);
@@ -583,7 +583,7 @@ int rt_ioctl_siwfreq(struct net_device *
struct iw_request_info *info,
struct iw_freq *freq, char *extra)
{
- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
int chan = -1;
//check if the interface is down
@@ -623,19 +623,19 @@ int rt_ioctl_giwfreq(struct net_device *
if (dev->priv_flags == INT_MAIN)
{
- pAdapter = dev->priv;
+ pAdapter = dev->ml_priv;
}
else
{
- pVirtualAd = dev->priv;
+ pVirtualAd = dev->ml_priv;
if (pVirtualAd && pVirtualAd->RtmpDev)
- pAdapter = pVirtualAd->RtmpDev->priv;
+ pAdapter = pVirtualAd->RtmpDev->ml_priv;
}
if (pAdapter == NULL)
{
/* if 1st open fail, pAd will be free;
- So the net_dev->priv will be NULL in 2rd open */
+ So the net_dev->ml_priv will be NULL in 2rd open */
return -ENETDOWN;
}
@@ -653,7 +653,7 @@ int rt_ioctl_siwmode(struct net_device *
struct iw_request_info *info,
__u32 *mode, char *extra)
{
- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
//check if the interface is down
if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
@@ -695,19 +695,19 @@ int rt_ioctl_giwmode(struct net_device *
if (dev->priv_flags == INT_MAIN)
{
- pAdapter = dev->priv;
+ pAdapter = dev->ml_priv;
}
else
{
- pVirtualAd = dev->priv;
+ pVirtualAd = dev->ml_priv;
if (pVirtualAd && pVirtualAd->RtmpDev)
- pAdapter = pVirtualAd->RtmpDev->priv;
+ pAdapter = pVirtualAd->RtmpDev->ml_priv;
}
if (pAdapter == NULL)
{
/* if 1st open fail, pAd will be free;
- So the net_dev->priv will be NULL in 2rd open */
+ So the net_dev->ml_priv will be NULL in 2rd open */
return -ENETDOWN;
}
@@ -732,7 +732,7 @@ int rt_ioctl_siwsens(struct net_device *
struct iw_request_info *info,
char *name, char *extra)
{
- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
//check if the interface is down
if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
@@ -763,19 +763,19 @@ int rt_ioctl_giwrange(struct net_device
if (dev->priv_flags == INT_MAIN)
{
- pAdapter = dev->priv;
+ pAdapter = dev->ml_priv;
}
else
{
- pVirtualAd = dev->priv;
+ pVirtualAd = dev->ml_priv;
if (pVirtualAd && pVirtualAd->RtmpDev)
- pAdapter = pVirtualAd->RtmpDev->priv;
+ pAdapter = pVirtualAd->RtmpDev->ml_priv;
}
if (pAdapter == NULL)
{
/* if 1st open fail, pAd will be free;
- So the net_dev->priv will be NULL in 2rd open */
+ So the net_dev->ml_priv will be NULL in 2rd open */
return -ENETDOWN;
}
@@ -857,7 +857,7 @@ int rt_ioctl_siwap(struct net_device *de
struct iw_request_info *info,
struct sockaddr *ap_addr, char *extra)
{
- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
NDIS_802_11_MAC_ADDRESS Bssid;
//check if the interface is down
@@ -902,19 +902,19 @@ int rt_ioctl_giwap(struct net_device *de
if (dev->priv_flags == INT_MAIN)
{
- pAdapter = dev->priv;
+ pAdapter = dev->ml_priv;
}
else
{
- pVirtualAd = dev->priv;
+ pVirtualAd = dev->ml_priv;
if (pVirtualAd && pVirtualAd->RtmpDev)
- pAdapter = pVirtualAd->RtmpDev->priv;
+ pAdapter = pVirtualAd->RtmpDev->ml_priv;
}
if (pAdapter == NULL)
{
/* if 1st open fail, pAd will be free;
- So the net_dev->priv will be NULL in 2rd open */
+ So the net_dev->ml_priv will be NULL in 2rd open */
return -ENETDOWN;
}
@@ -984,7 +984,7 @@ int rt_ioctl_iwaplist(struct net_device
struct iw_request_info *info,
struct iw_point *data, char *extra)
{
- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
struct sockaddr addr[IW_MAX_AP];
struct iw_quality qual[IW_MAX_AP];
@@ -1020,7 +1020,7 @@ int rt_ioctl_siwscan(struct net_device *
struct iw_request_info *info,
struct iw_point *data, char *extra)
{
- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
ULONG Now;
int Status = NDIS_STATUS_SUCCESS;
@@ -1102,7 +1102,7 @@ int rt_ioctl_giwscan(struct net_device *
struct iw_point *data, char *extra)
{
- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
int i=0;
char *current_ev = extra, *previous_ev = extra;
char *end_buf;
@@ -1391,7 +1391,7 @@ int rt_ioctl_siwessid(struct net_device
struct iw_request_info *info,
struct iw_point *data, char *essid)
{
- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
//check if the interface is down
if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
@@ -1437,19 +1437,19 @@ int rt_ioctl_giwessid(struct net_device
if (dev->priv_flags == INT_MAIN)
{
- pAdapter = dev->priv;
+ pAdapter = dev->ml_priv;
}
else
{
- pVirtualAd = dev->priv;
+ pVirtualAd = dev->ml_priv;
if (pVirtualAd && pVirtualAd->RtmpDev)
- pAdapter = pVirtualAd->RtmpDev->priv;
+ pAdapter = pVirtualAd->RtmpDev->ml_priv;
}
if (pAdapter == NULL)
{
/* if 1st open fail, pAd will be free;
- So the net_dev->priv will be NULL in 2rd open */
+ So the net_dev->ml_priv will be NULL in 2rd open */
return -ENETDOWN;
}
@@ -1480,7 +1480,7 @@ int rt_ioctl_siwnickn(struct net_device
struct iw_request_info *info,
struct iw_point *data, char *nickname)
{
- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
//check if the interface is down
if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
@@ -1508,19 +1508,19 @@ int rt_ioctl_giwnickn(struct net_device
if (dev->priv_flags == INT_MAIN)
{
- pAdapter = dev->priv;
+ pAdapter = dev->ml_priv;
}
else
{
- pVirtualAd = dev->priv;
+ pVirtualAd = dev->ml_priv;
if (pVirtualAd && pVirtualAd->RtmpDev)
- pAdapter = pVirtualAd->RtmpDev->priv;
+ pAdapter = pVirtualAd->RtmpDev->ml_priv;
}
if (pAdapter == NULL)
{
/* if 1st open fail, pAd will be free;
- So the net_dev->priv will be NULL in 2rd open */
+ So the net_dev->ml_priv will be NULL in 2rd open */
return -ENETDOWN;
}
@@ -1537,7 +1537,7 @@ int rt_ioctl_siwrts(struct net_device *d
struct iw_request_info *info,
struct iw_param *rts, char *extra)
{
- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
u16 val;
//check if the interface is down
@@ -1571,19 +1571,19 @@ int rt_ioctl_giwrts(struct net_device *d
if (dev->priv_flags == INT_MAIN)
{
- pAdapter = dev->priv;
+ pAdapter = dev->ml_priv;
}
else
{
- pVirtualAd = dev->priv;
+ pVirtualAd = dev->ml_priv;
if (pVirtualAd && pVirtualAd->RtmpDev)
- pAdapter = pVirtualAd->RtmpDev->priv;
+ pAdapter = pVirtualAd->RtmpDev->ml_priv;
}
if (pAdapter == NULL)
{
/* if 1st open fail, pAd will be free;
- So the net_dev->priv will be NULL in 2rd open */
+ So the net_dev->ml_priv will be NULL in 2rd open */
return -ENETDOWN;
}
@@ -1605,7 +1605,7 @@ int rt_ioctl_siwfrag(struct net_device *
struct iw_request_info *info,
struct iw_param *frag, char *extra)
{
- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
u16 val;
//check if the interface is down
@@ -1637,19 +1637,19 @@ int rt_ioctl_giwfrag(struct net_device *
if (dev->priv_flags == INT_MAIN)
{
- pAdapter = dev->priv;
+ pAdapter = dev->ml_priv;
}
else
{
- pVirtualAd = dev->priv;
+ pVirtualAd = dev->ml_priv;
if (pVirtualAd && pVirtualAd->RtmpDev)
- pAdapter = pVirtualAd->RtmpDev->priv;
+ pAdapter = pVirtualAd->RtmpDev->ml_priv;
}
if (pAdapter == NULL)
{
/* if 1st open fail, pAd will be free;
- So the net_dev->priv will be NULL in 2rd open */
+ So the net_dev->ml_priv will be NULL in 2rd open */
return -ENETDOWN;
}
@@ -1673,7 +1673,7 @@ int rt_ioctl_siwencode(struct net_device
struct iw_request_info *info,
struct iw_point *erq, char *extra)
{
- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
//check if the interface is down
if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
@@ -1780,19 +1780,19 @@ rt_ioctl_giwencode(struct net_device *de
if (dev->priv_flags == INT_MAIN)
{
- pAdapter = dev->priv;
+ pAdapter = dev->ml_priv;
}
else
{
- pVirtualAd = dev->priv;
+ pVirtualAd = dev->ml_priv;
if (pVirtualAd && pVirtualAd->RtmpDev)
- pAdapter = pVirtualAd->RtmpDev->priv;
+ pAdapter = pVirtualAd->RtmpDev->ml_priv;
}
if (pAdapter == NULL)
{
/* if 1st open fail, pAd will be free;
- So the net_dev->priv will be NULL in 2rd open */
+ So the net_dev->ml_priv will be NULL in 2rd open */
return -ENETDOWN;
}
@@ -1860,19 +1860,19 @@ rt_ioctl_setparam(struct net_device *dev
if (dev->priv_flags == INT_MAIN)
{
- pAdapter = dev->priv;
+ pAdapter = dev->ml_priv;
}
else
{
- pVirtualAd = dev->priv;
- pAdapter = pVirtualAd->RtmpDev->priv;
+ pVirtualAd = dev->ml_priv;
+ pAdapter = pVirtualAd->RtmpDev->ml_priv;
}
pObj = (POS_COOKIE) pAdapter->OS_Cookie;
if (pAdapter == NULL)
{
/* if 1st open fail, pAd will be free;
- So the net_dev->priv will be NULL in 2rd open */
+ So the net_dev->ml_priv will be NULL in 2rd open */
return -ENETDOWN;
}
@@ -1928,7 +1928,7 @@ rt_private_get_statistics(struct net_dev
struct iw_point *wrq, char *extra)
{
INT Status = 0;
- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv;
if (extra == NULL)
{
@@ -2055,18 +2055,18 @@ rt_private_show(struct net_device *dev,
u32 subcmd = wrq->flags;
if (dev->priv_flags == INT_MAIN)
- pAd = dev->priv;
+ pAd = dev->ml_priv;
else
{
- pVirtualAd = dev->priv;
- pAd = pVirtualAd->RtmpDev->priv;
+ pVirtualAd = dev->ml_priv;
+ pAd = pVirtualAd->RtmpDev->ml_priv;
}
pObj = (POS_COOKIE) pAd->OS_Cookie;
if (pAd == NULL)
{
/* if 1st open fail, pAd will be free;
- So the net_dev->priv will be NULL in 2rd open */
+ So the net_dev->ml_priv will be NULL in 2rd open */
return -ENETDOWN;
}
@@ -2213,7 +2213,7 @@ int rt_ioctl_siwmlme(struct net_device *
union iwreq_data *wrqu,
char *extra)
{
- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv;
struct iw_mlme *pMlme = (struct iw_mlme *)wrqu->data.pointer;
MLME_QUEUE_ELEM MsgElem;
MLME_DISASSOC_REQ_STRUCT DisAssocReq;
@@ -2270,7 +2270,7 @@ int rt_ioctl_siwauth(struct net_device *
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
struct iw_param *param = &wrqu->param;
//check if the interface is down
@@ -2413,7 +2413,7 @@ int rt_ioctl_giwauth(struct net_device *
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
struct iw_param *param = &wrqu->param;
//check if the interface is down
@@ -2487,7 +2487,7 @@ int rt_ioctl_siwencodeext(struct net_dev
union iwreq_data *wrqu,
char *extra)
{
- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
struct iw_point *encoding = &wrqu->encoding;
struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
int keyIdx, alg = ext->alg;
@@ -2596,7 +2596,7 @@ rt_ioctl_giwencodeext(struct net_device
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv;
PCHAR pKey = NULL;
struct iw_point *encoding = &wrqu->encoding;
struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
@@ -2680,7 +2680,7 @@ int rt_ioctl_siwgenie(struct net_device
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv;
if (wrqu->data.length > MAX_LEN_OF_RSNIE ||
(wrqu->data.length && extra == NULL))
@@ -2705,7 +2705,7 @@ int rt_ioctl_giwgenie(struct net_device
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv;
if ((pAd->StaCfg.RSNIE_Len == 0) ||
(pAd->StaCfg.AuthMode < Ndis802_11AuthModeWPA))
@@ -2751,7 +2751,7 @@ int rt_ioctl_siwpmksa(struct net_device
union iwreq_data *wrqu,
char *extra)
{
- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv;
struct iw_pmksa *pPmksa = (struct iw_pmksa *)wrqu->data.pointer;
INT CachedIdx = 0, idx = 0;
@@ -2834,7 +2834,7 @@ rt_private_ioctl_bbp(struct net_device *
UINT32 bbpValue;
BOOLEAN bIsPrintAllBBP = FALSE;
INT Status = 0;
- PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
memset(extra, 0x00, IW_PRIV_SIZE_MASK);
@@ -2961,7 +2961,7 @@ int rt_ioctl_siwrate(struct net_device *
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv;
UINT32 rate = wrqu->bitrate.value, fixed = wrqu->bitrate.fixed;
//check if the interface is down
@@ -3019,7 +3019,7 @@ int rt_ioctl_giwrate(struct net_device *
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
+ PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv;
int rate_index = 0, rate_count = 0;
HTTRANSMIT_SETTING ht_setting;
__s32 ralinkrate[] =
@@ -5409,19 +5409,19 @@ INT rt28xx_sta_ioctl(
if (net_dev->priv_flags == INT_MAIN)
{
- pAd = net_dev->priv;
+ pAd = net_dev->ml_priv;
}
else
{
- pVirtualAd = net_dev->priv;
- pAd = pVirtualAd->RtmpDev->priv;
+ pVirtualAd = net_dev->ml_priv;
+ pAd = pVirtualAd->RtmpDev->ml_priv;
}
pObj = (POS_COOKIE) pAd->OS_Cookie;
if (pAd == NULL)
{
/* if 1st open fail, pAd will be free;
- So the net_dev->priv will be NULL in 2rd open */
+ So the net_dev->ml_priv will be NULL in 2rd open */
return -ENETDOWN;
}
rt2860-no2.4-in-kernelversion.patch:
--- NEW FILE rt2860-no2.4-in-kernelversion.patch ---
--- 2008_0918_RT2860_Linux_STA_v1.8.0.0.old/os/linux/config.mk 2008-09-17 23:27:46.000000000 -0400
+++ 2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/config.mk 2009-03-26 03:02:19.000000000 -0400
@@ -223,14 +223,7 @@ export CFLAGS
endif
ifeq ($(PLATFORM),PC)
- ifneq (,$(findstring 2.4,$(LINUX_SRC)))
- # Linux 2.4
- CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h $(WFLAGS)
- export CFLAGS
- else
- # Linux 2.6
EXTRA_CFLAGS := $(WFLAGS) -I$(RT28xx_DIR)/include
- endif
endif
ifeq ($(PLATFORM),IXP)
Index: rt2860-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2860-kmod/F-9/rt2860-kmod.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rt2860-kmod.spec 25 Mar 2009 14:34:01 -0000 1.16
+++ rt2860-kmod.spec 26 Mar 2009 07:28:50 -0000 1.17
@@ -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: 1.8.0.0
-Release: 1%{?dist}.13
+Release: 1%{?dist}.14
Summary: Kernel module for RaLink 802.11 wireless devices rt2760/rt2790/rt2860/rt2890
Group: System Environment/Kernel
@@ -15,10 +15,12 @@
URL: http://www.ralinktech.com/ralink/Home/Support/Linux.html
Source0: http://www.ralinktech.com.tw/data/drivers/2008_0918_RT2860_Linux_STA_v1.8...
Source11: rt2860-kmodtool-excludekernel-filterfile
-Patch0: rt2860-2.6.25-iwe_stream-fix.diff
-Patch1: rt2860-dat-install-fixes.patch
-Patch2: rt2860-add-network-mgr-support.diff
-Patch3: rt2860-remove-tftpboot-copy.patch
+
+Patch1: rt2860-dat-install-fixes.patch
+Patch2: rt2860-add-network-mgr-support.diff
+Patch3: rt2860-remove-tftpboot-copy.patch
+Patch4: rt2860-no2.4-in-kernelversion.patch
+Patch5: rt2860-2.6.29-compile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -44,13 +46,18 @@
%setup -q -c -T -a 0
-%patch0 -p1 -b .iwestream
%patch1 -p1 -b .rpmbuild
%patch2 -p1 -b .NetworkManager
-%patch3 -p1 -b .tftpboot
+%patch3 -p0 -b .tftpboot
+%patch4 -p0 -b .no24
for kernel_version in %{?kernel_versions} ; do
cp -a *RT2860_Linux_STA* _kmod_build_${kernel_version%%___*}
+ pushd _kmod_build_${kernel_version%%___*}
+ if [[ $kernel_version > "2.6.29" ]]; then
+%patch5 -p2 -b .2.6.29
+ fi
+ popd
done
%build
@@ -71,6 +78,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.8.0.0-1.14
+- Bugfix: kmod doesn't compile when the kernel version has a "2.4" substring
+- Add 2.6.29 compilation patch (just in case)
+
* Wed Mar 25 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.8.0.0-1.13
- rebuild for new kernels
@@ -107,11 +118,11 @@
* Thu Oct 23 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.8.0.0-1.2
- rebuild for latest kernel; enable ppc again
-* Sun Oct 19 2008 Orcan Ogetbil <orcanbahri[at]yahoo[com]> 1.8.0.0-1.1
+* Sun Oct 19 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.8.0.0-1.1
- update strip-tftpboot-copy.patch to match rt2860 sources with no fuzziness
- revert the patch names to the old versions
-* Sun Oct 19 2008 Orcan Ogetbil <orcanbahri[at]yahoo[com]> 1.8.0.0-1
+* Sun Oct 19 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.8.0.0-1
- version update (1.8.0.0)
- patches taken from rt2870-kmod directly
rt2860-remove-tftpboot-copy.patch:
Index: rt2860-remove-tftpboot-copy.patch
===================================================================
RCS file: /cvs/free/rpms/rt2860-kmod/F-9/rt2860-remove-tftpboot-copy.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rt2860-remove-tftpboot-copy.patch 19 Oct 2008 20:41:17 -0000 1.2
+++ rt2860-remove-tftpboot-copy.patch 26 Mar 2009 07:28:50 -0000 1.3
@@ -1,10 +1,12 @@
-diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile new/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile
---- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile 2008-09-17 22:26:56.000000000 -0400
-+++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile 2008-10-19 15:43:22.000000000 -0400
-@@ -125,27 +125,9 @@ LINUX:
- ifneq (,$(findstring 2.4,$(LINUX_SRC)))
- cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
- make -C $(RT28xx_DIR)/os/linux/
+--- 2008_0918_RT2860_Linux_STA_v1.8.0.0.old/Makefile 2008-09-17 22:26:56.000000000 -0400
++++ 2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile 2009-03-26 03:00:09.000000000 -0400
+@@ -122,57 +122,20 @@ build_tools:
+
+
+ LINUX:
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
+- make -C $(RT28xx_DIR)/os/linux/
-ifeq ($(RT28xx_MODE),AP)
- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot
-else
@@ -14,7 +16,7 @@
- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
-endif
-endif
- else
+-else
cp -f os/linux/Makefile.6 $(RT28xx_DIR)/os/linux/Makefile
make -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
-ifeq ($(RT28xx_MODE),AP)
@@ -26,6 +28,33 @@
- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
-endif
-endif
- endif
+-endif
clean:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- cp -f os/linux/Makefile.4 os/linux/Makefile
+-else
+ cp -f os/linux/Makefile.6 os/linux/Makefile
+-endif
+- make -C os/linux clean
+- rm -rf os/linux/Makefile
+ endif
+
+ uninstall:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- make -C $(RT28xx_DIR)/os/linux -f Makefile.4 uninstall
+-else
+ make -C $(RT28xx_DIR)/os/linux -f Makefile.6 uninstall
+ endif
+-endif
+
+ install:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- make -C $(RT28xx_DIR)/os/linux -f Makefile.4 install
+-else
+ make -C $(RT28xx_DIR)/os/linux -f Makefile.6 install
+ endif
+-endif
--- rt2860-2.6.25-iwe_stream-fix.diff DELETED ---
15 years, 3 months
rpms/rt2870-kmod/devel rt2870-kmod.spec,1.34,1.35
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4015
Modified Files:
rt2870-kmod.spec
Log Message:
Re-enable %define buildforkernels newest
Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/devel/rt2870-kmod.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- rt2870-kmod.spec 26 Mar 2009 06:50:08 -0000 1.34
+++ rt2870-kmod.spec 26 Mar 2009 06:53:23 -0000 1.35
@@ -3,7 +3,7 @@
# "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: rt2870-kmod
Version: 2.1.0.0
15 years, 3 months
rpms/rt2870-kmod/devel rt2870-no2.4-in-kernelversion.patch, NONE, 1.1 rt2870-kmod.spec, 1.33, 1.34 rt2870-strip-tftpboot-copy.patch, 1.2, 1.3
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3624
Modified Files:
rt2870-kmod.spec rt2870-strip-tftpboot-copy.patch
Added Files:
rt2870-no2.4-in-kernelversion.patch
Log Message:
* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.0.0-2
- Bugfix: kmod doesn't compile when the kernel version has a "2.4" substring
rt2870-no2.4-in-kernelversion.patch:
--- NEW FILE rt2870-no2.4-in-kernelversion.patch ---
diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk
--- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk 2009-03-10 00:47:50.000000000 -0400
+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk 2009-03-26 01:57:12.000000000 -0400
@@ -236,14 +236,14 @@ export CFLAGS
endif
ifeq ($(PLATFORM),PC)
- ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+ # ifneq (,$(findstring 2.4,$(LINUX_SRC)))
# Linux 2.4
- CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h $(WFLAGS)
- export CFLAGS
- else
+ # CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h $(WFLAGS)
+ # export CFLAGS
+ # else
# Linux 2.6
EXTRA_CFLAGS := $(WFLAGS) -I$(RT28xx_DIR)/include
- endif
+ # endif
endif
ifeq ($(PLATFORM),IXP)
Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/devel/rt2870-kmod.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- rt2870-kmod.spec 26 Mar 2009 05:25:46 -0000 1.33
+++ rt2870-kmod.spec 26 Mar 2009 06:50:08 -0000 1.34
@@ -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: rt2870-kmod
Version: 2.1.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Kernel module for wireless devices with Ralink's rt2870 chipsets
Group: System Environment/Kernel
@@ -15,6 +15,7 @@
URL: http://www.ralinktech.com/ralink/Home/Support/Linux.html
Source0: http://www.ralinktech.com.tw/data/drivers/2009_0302_RT2870_Linux_STA_v2.1...
Source11: rt2870-kmodtool-excludekernel-filterfile
+Patch1: rt2870-no2.4-in-kernelversion.patch
Patch2: rt2870-Makefile.x-fixes.patch
Patch3: rt2870-NetworkManager-support.patch
Patch4: rt2870-strip-tftpboot-copy.patch
@@ -44,6 +45,7 @@
%setup -q -c -T -a 0
+%patch1 -p0 -b .no24
%patch2 -p0 -b .rpmbuild
%patch3 -p0 -b .NetworkManager
%patch4 -p0 -b .tftpboot
@@ -76,6 +78,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.0.0-2
+- Bugfix: kmod doesn't compile when the kernel version has a "2.4" substring
+
* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.0.0-1
- New upstream version
- Drop additional-devices patch since it is upstreamed
rt2870-strip-tftpboot-copy.patch:
Index: rt2870-strip-tftpboot-copy.patch
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/devel/rt2870-strip-tftpboot-copy.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rt2870-strip-tftpboot-copy.patch 26 Mar 2009 05:18:48 -0000 1.2
+++ rt2870-strip-tftpboot-copy.patch 26 Mar 2009 06:50:08 -0000 1.3
@@ -1,16 +1,45 @@
--- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/Makefile 2009-02-27 06:28:45.000000000 -0500
-+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/Makefile 2009-03-25 20:44:41.000000000 -0400
-@@ -137,11 +137,11 @@ LINUX:
- ifneq (,$(findstring 2.4,$(LINUX_SRC)))
- cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
- make -C $(RT28xx_DIR)/os/linux/
++++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/Makefile 2009-03-26 02:28:12.000000000 -0400
+@@ -134,41 +134,23 @@ UCOS:
+
+
+ LINUX:
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
+- make -C $(RT28xx_DIR)/os/linux/
- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
-+# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
- else
+-else
cp -f os/linux/Makefile.6 $(RT28xx_DIR)/os/linux/Makefile
make -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
-+# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
- endif
+-endif
clean:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- cp -f os/linux/Makefile.4 os/linux/Makefile
+-else
+ cp -f os/linux/Makefile.6 os/linux/Makefile
+-endif
++
+ make -C os/linux clean
+ rm -rf os/linux/Makefile
+ endif
+
+ uninstall:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- make -C $(RT28xx_DIR)/os/linux -f Makefile.4 uninstall
+-else
+ make -C $(RT28xx_DIR)/os/linux -f Makefile.6 uninstall
+ endif
+-endif
+
+ install:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- make -C $(RT28xx_DIR)/os/linux -f Makefile.4 install
+-else
+ make -C $(RT28xx_DIR)/os/linux -f Makefile.6 install
+ endif
+-endif
15 years, 3 months
rpms/rt2870-kmod/F-9 rt2870-kmod.spec,1.24,1.25
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3555
Modified Files:
rt2870-kmod.spec
Log Message:
Re-enable %define buildforkernels newest
Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-9/rt2870-kmod.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rt2870-kmod.spec 26 Mar 2009 06:13:03 -0000 1.24
+++ rt2870-kmod.spec 26 Mar 2009 06:47:14 -0000 1.25
@@ -3,7 +3,7 @@
# "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: rt2870-kmod
Version: 2.1.0.0
15 years, 3 months
rpms/rt2870-kmod/F-10 rt2870-kmod.spec,1.30,1.31
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3527
Modified Files:
rt2870-kmod.spec
Log Message:
Re-enable %define buildforkernels newest
Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-10/rt2870-kmod.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- rt2870-kmod.spec 26 Mar 2009 06:16:31 -0000 1.30
+++ rt2870-kmod.spec 26 Mar 2009 06:46:42 -0000 1.31
@@ -3,7 +3,7 @@
# "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: rt2870-kmod
Version: 2.1.0.0
15 years, 3 months
rpms/rt2870-kmod/F-10 rt2870-strip-tftpboot-copy.patch,1.2,1.3
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3117
Modified Files:
rt2870-strip-tftpboot-copy.patch
Log Message:
Update patch to fix the "2.4 in kernel version" issue
rt2870-strip-tftpboot-copy.patch:
Index: rt2870-strip-tftpboot-copy.patch
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-10/rt2870-strip-tftpboot-copy.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rt2870-strip-tftpboot-copy.patch 26 Mar 2009 05:31:48 -0000 1.2
+++ rt2870-strip-tftpboot-copy.patch 26 Mar 2009 06:45:04 -0000 1.3
@@ -1,16 +1,45 @@
--- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/Makefile 2009-02-27 06:28:45.000000000 -0500
-+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/Makefile 2009-03-25 20:44:41.000000000 -0400
-@@ -137,11 +137,11 @@ LINUX:
- ifneq (,$(findstring 2.4,$(LINUX_SRC)))
- cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
- make -C $(RT28xx_DIR)/os/linux/
++++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/Makefile 2009-03-26 02:28:12.000000000 -0400
+@@ -134,41 +134,23 @@ UCOS:
+
+
+ LINUX:
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
+- make -C $(RT28xx_DIR)/os/linux/
- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
-+# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
- else
+-else
cp -f os/linux/Makefile.6 $(RT28xx_DIR)/os/linux/Makefile
make -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
-+# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
- endif
+-endif
clean:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- cp -f os/linux/Makefile.4 os/linux/Makefile
+-else
+ cp -f os/linux/Makefile.6 os/linux/Makefile
+-endif
++
+ make -C os/linux clean
+ rm -rf os/linux/Makefile
+ endif
+
+ uninstall:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- make -C $(RT28xx_DIR)/os/linux -f Makefile.4 uninstall
+-else
+ make -C $(RT28xx_DIR)/os/linux -f Makefile.6 uninstall
+ endif
+-endif
+
+ install:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- make -C $(RT28xx_DIR)/os/linux -f Makefile.4 install
+-else
+ make -C $(RT28xx_DIR)/os/linux -f Makefile.6 install
+ endif
+-endif
15 years, 3 months
rpms/rt2870-kmod/F-9 rt2870-strip-tftpboot-copy.patch,1.2,1.3
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2461
Modified Files:
rt2870-strip-tftpboot-copy.patch
Log Message:
Update patch to fix the "2.4 in kernel version" issue
rt2870-strip-tftpboot-copy.patch:
Index: rt2870-strip-tftpboot-copy.patch
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-9/rt2870-strip-tftpboot-copy.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rt2870-strip-tftpboot-copy.patch 26 Mar 2009 05:38:45 -0000 1.2
+++ rt2870-strip-tftpboot-copy.patch 26 Mar 2009 06:34:26 -0000 1.3
@@ -1,16 +1,45 @@
--- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/Makefile 2009-02-27 06:28:45.000000000 -0500
-+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/Makefile 2009-03-25 20:44:41.000000000 -0400
-@@ -137,11 +137,11 @@ LINUX:
- ifneq (,$(findstring 2.4,$(LINUX_SRC)))
- cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
- make -C $(RT28xx_DIR)/os/linux/
++++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/Makefile 2009-03-26 02:28:12.000000000 -0400
+@@ -134,41 +134,23 @@ UCOS:
+
+
+ LINUX:
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
+- make -C $(RT28xx_DIR)/os/linux/
- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
-+# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
- else
+-else
cp -f os/linux/Makefile.6 $(RT28xx_DIR)/os/linux/Makefile
make -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
-+# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
- endif
+-endif
clean:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- cp -f os/linux/Makefile.4 os/linux/Makefile
+-else
+ cp -f os/linux/Makefile.6 os/linux/Makefile
+-endif
++
+ make -C os/linux clean
+ rm -rf os/linux/Makefile
+ endif
+
+ uninstall:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- make -C $(RT28xx_DIR)/os/linux -f Makefile.4 uninstall
+-else
+ make -C $(RT28xx_DIR)/os/linux -f Makefile.6 uninstall
+ endif
+-endif
+
+ install:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+- make -C $(RT28xx_DIR)/os/linux -f Makefile.4 install
+-else
+ make -C $(RT28xx_DIR)/os/linux -f Makefile.6 install
+ endif
+-endif
15 years, 3 months
rpms/rt2870-kmod/F-10 rt2870-no2.4-in-kernelversion.patch, NONE, 1.1 rt2870-kmod.spec, 1.29, 1.30
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1596
Modified Files:
rt2870-kmod.spec
Added Files:
rt2870-no2.4-in-kernelversion.patch
Log Message:
* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.0.0-2
- Bugfix: kmod doesn't compile when the kernel version has a "2.4" substring
rt2870-no2.4-in-kernelversion.patch:
--- NEW FILE rt2870-no2.4-in-kernelversion.patch ---
diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk
--- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk 2009-03-10 00:47:50.000000000 -0400
+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk 2009-03-26 01:57:12.000000000 -0400
@@ -236,14 +236,14 @@ export CFLAGS
endif
ifeq ($(PLATFORM),PC)
- ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+ # ifneq (,$(findstring 2.4,$(LINUX_SRC)))
# Linux 2.4
- CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h $(WFLAGS)
- export CFLAGS
- else
+ # CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h $(WFLAGS)
+ # export CFLAGS
+ # else
# Linux 2.6
EXTRA_CFLAGS := $(WFLAGS) -I$(RT28xx_DIR)/include
- endif
+ # endif
endif
ifeq ($(PLATFORM),IXP)
Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-10/rt2870-kmod.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- rt2870-kmod.spec 26 Mar 2009 05:40:22 -0000 1.29
+++ rt2870-kmod.spec 26 Mar 2009 06:16:31 -0000 1.30
@@ -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: rt2870-kmod
Version: 2.1.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Kernel module for wireless devices with Ralink's rt2870 chipsets
Group: System Environment/Kernel
@@ -15,6 +15,7 @@
URL: http://www.ralinktech.com/ralink/Home/Support/Linux.html
Source0: http://www.ralinktech.com.tw/data/drivers/2009_0302_RT2870_Linux_STA_v2.1...
Source11: rt2870-kmodtool-excludekernel-filterfile
+Patch1: rt2870-no2.4-in-kernelversion.patch
Patch2: rt2870-Makefile.x-fixes.patch
Patch3: rt2870-NetworkManager-support.patch
Patch4: rt2870-strip-tftpboot-copy.patch
@@ -44,6 +45,7 @@
%setup -q -c -T -a 0
+%patch1 -p0 -b .no24
%patch2 -p0 -b .rpmbuild
%patch3 -p0 -b .NetworkManager
%patch4 -p0 -b .tftpboot
@@ -76,6 +78,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.0.0-2
+- Bugfix: kmod doesn't compile when the kernel version has a "2.4" substring
+
* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.0.0-1
- New upstream version
- Drop additional-devices patch since it is upstreamed
15 years, 3 months
rpms/rt2870-kmod/F-9 rt2870-no2.4-in-kernelversion.patch, NONE, 1.1 rt2870-kmod.spec, 1.23, 1.24
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1154
Modified Files:
rt2870-kmod.spec
Added Files:
rt2870-no2.4-in-kernelversion.patch
Log Message:
* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.0.0-2
- Bugfix: kmod doesn't compile when the kernel version has a "2.4" substring
rt2870-no2.4-in-kernelversion.patch:
--- NEW FILE rt2870-no2.4-in-kernelversion.patch ---
diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk
--- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk 2009-03-10 00:47:50.000000000 -0400
+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk 2009-03-26 01:57:12.000000000 -0400
@@ -236,14 +236,14 @@ export CFLAGS
endif
ifeq ($(PLATFORM),PC)
- ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+ # ifneq (,$(findstring 2.4,$(LINUX_SRC)))
# Linux 2.4
- CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h $(WFLAGS)
- export CFLAGS
- else
+ # CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h $(WFLAGS)
+ # export CFLAGS
+ # else
# Linux 2.6
EXTRA_CFLAGS := $(WFLAGS) -I$(RT28xx_DIR)/include
- endif
+ # endif
endif
ifeq ($(PLATFORM),IXP)
Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-9/rt2870-kmod.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rt2870-kmod.spec 26 Mar 2009 05:41:39 -0000 1.23
+++ rt2870-kmod.spec 26 Mar 2009 06:13:03 -0000 1.24
@@ -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: rt2870-kmod
Version: 2.1.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Kernel module for wireless devices with Ralink's rt2870 chipsets
Group: System Environment/Kernel
@@ -15,6 +15,7 @@
URL: http://www.ralinktech.com/ralink/Home/Support/Linux.html
Source0: http://www.ralinktech.com.tw/data/drivers/2009_0302_RT2870_Linux_STA_v2.1...
Source11: rt2870-kmodtool-excludekernel-filterfile
+Patch1: rt2870-no2.4-in-kernelversion.patch
Patch2: rt2870-Makefile.x-fixes.patch
Patch3: rt2870-NetworkManager-support.patch
Patch4: rt2870-strip-tftpboot-copy.patch
@@ -44,6 +45,7 @@
%setup -q -c -T -a 0
+%patch1 -p0 -b .no24
%patch2 -p0 -b .rpmbuild
%patch3 -p0 -b .NetworkManager
%patch4 -p0 -b .tftpboot
@@ -76,6 +78,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.0.0-2
+- Bugfix: kmod doesn't compile when the kernel version has a "2.4" substring
+
* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.0.0-1
- New upstream version
- Drop additional-devices patch since it is upstreamed
15 years, 3 months