rpms/rt2870-kmod/F-10 rt2870-kmod.spec,1.16,1.17
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27022
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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rt2870-kmod.spec 11 Jan 2009 15:20:58 -0000 1.16
+++ rt2870-kmod.spec 11 Jan 2009 15:22:32 -0000 1.17
@@ -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: 1.4.0.0
15 years, 10 months
rpms/rt2870-kmod/F-10 rt2870-2.6.29-compile.patch, NONE, 1.1 rt2870-kmod.spec, 1.15, 1.16
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26847
Modified Files:
rt2870-kmod.spec
Added Files:
rt2870-2.6.29-compile.patch
Log Message:
* Sun Jan 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.4.0.0-4
- Add a patch for compilation against kernels >= 2.6.29
rt2870-2.6.29-compile.patch:
--- NEW FILE rt2870-2.6.29-compile.patch ---
diff -rupN old/2008_0925_RT2870_Linux_STA_v1.4.0.0/common/2870_rtmp_init.c new/2008_0925_RT2870_Linux_STA_v1.4.0.0/common/2870_rtmp_init.c
--- old/2008_0925_RT2870_Linux_STA_v1.4.0.0/common/2870_rtmp_init.c 2008-09-18 22:59:12.000000000 -0400
+++ new/2008_0925_RT2870_Linux_STA_v1.4.0.0/common/2870_rtmp_init.c 2009-01-10 16:34:25.000000000 -0500
@@ -763,7 +763,7 @@ Note:
NDIS_STATUS CreateThreads(
IN struct net_device *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;
pid_t pid_number = -1;
diff -rupN old/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/rt_main_dev.c new/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/rt_main_dev.c
--- old/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/rt_main_dev.c 2008-09-19 01:40:02.000000000 -0400
+++ new/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/rt_main_dev.c 2009-01-10 16:34:15.000000000 -0500
@@ -125,7 +125,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)
@@ -165,7 +165,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)
@@ -207,7 +207,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;
#ifdef RT2870
@@ -416,7 +416,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;
@@ -689,7 +689,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 //
@@ -716,7 +716,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;
@@ -725,7 +725,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;
}
@@ -1416,7 +1416,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);
@@ -1517,7 +1517,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;
@@ -1605,7 +1605,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))
{
@@ -1717,7 +1717,7 @@ static BOOLEAN RT28XXAvailRANameAssign(
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"));
@@ -1769,18 +1769,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;
}
@@ -1817,7 +1817,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_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/rt_profile.c new/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/rt_profile.c
--- old/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/rt_profile.c 2008-09-19 01:40:52.000000000 -0400
+++ new/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/rt_profile.c 2009-01-10 16:34:15.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);
@@ -1590,9 +1590,10 @@ NDIS_STATUS RTMPReadParametersHook(
}
set_fs(orgfs);
+#if 0
current->fsuid = orgfsuid;
current->fsgid = orgfsgid;
-
+#endif
kfree(buffer);
kfree(tmpbuf);
diff -rupN old/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/sta_ioctl.c new/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/sta_ioctl.c
--- old/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/sta_ioctl.c 2008-09-25 04:28:00.000000000 -0400
+++ new/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/sta_ioctl.c 2009-01-10 16:34:05.000000000 -0500
@@ -580,7 +580,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 RT2870
strncpy(name, "RT2870 Wireless", IFNAMSIZ);
@@ -592,7 +592,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
@@ -632,19 +632,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;
}
@@ -662,7 +662,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))
@@ -704,19 +704,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;
}
@@ -741,7 +741,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))
@@ -772,19 +772,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;
}
@@ -866,7 +866,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
@@ -911,19 +911,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;
}
@@ -993,7 +993,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];
@@ -1029,7 +1029,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;
@@ -1111,7 +1111,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;
@@ -1400,7 +1400,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))
@@ -1446,13 +1446,13 @@ 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)
@@ -1499,7 +1499,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))
@@ -1527,13 +1527,13 @@ 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)
@@ -1556,7 +1556,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
@@ -1590,13 +1590,13 @@ 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)
@@ -1624,7 +1624,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
@@ -1656,13 +1656,13 @@ 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)
@@ -1692,7 +1692,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))
@@ -1800,13 +1800,13 @@ 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)
@@ -1880,12 +1880,12 @@ 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;
@@ -1948,7 +1948,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)
{
@@ -2075,11 +2075,11 @@ 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;
@@ -2237,7 +2237,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;
@@ -2294,7 +2294,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
@@ -2447,7 +2447,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
@@ -2521,7 +2521,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;
@@ -2649,7 +2649,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;
@@ -2733,7 +2733,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))
@@ -2758,7 +2758,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))
@@ -2804,7 +2804,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;
@@ -2888,7 +2888,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);
@@ -3015,7 +3015,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
@@ -3073,7 +3073,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[] =
@@ -5483,12 +5483,12 @@ 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;
Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-10/rt2870-kmod.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rt2870-kmod.spec 20 Dec 2008 08:00:46 -0000 1.15
+++ rt2870-kmod.spec 11 Jan 2009 15:20:58 -0000 1.16
@@ -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: 1.4.0.0
-Release: 3%{?dist}.1
+Release: 4%{?dist}
Summary: Kernel module for wireless devices with Ralink's rt2870 chipsets
Group: System Environment/Kernel
@@ -20,6 +20,7 @@
Patch2: rt2870-Makefile.x-fixes.patch
Patch3: rt2870-NetworkManager-support.patch
Patch4: rt2870-strip-tftpboot-copy.patch
+Patch5: rt2870-2.6.29-compile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -52,6 +53,11 @@
for kernel_version in %{?kernel_versions} ; do
cp -a *RT2870_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
@@ -72,6 +78,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jan 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.4.0.0-4
+- Add a patch for compilation against kernels >= 2.6.29
+
* Sat Dec 20 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.4.0.0-3.1
- rebuild for latest Fedora kernel;
15 years, 10 months
rpms/rt2870-kmod/devel rt2870-kmod.spec,1.20,1.21
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26461
Modified Files:
rt2870-kmod.spec
Log Message:
re-enabled %define buildforkernels newest
Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/devel/rt2870-kmod.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rt2870-kmod.spec 11 Jan 2009 15:00:25 -0000 1.20
+++ rt2870-kmod.spec 11 Jan 2009 15:15:40 -0000 1.21
@@ -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: 1.4.0.0
15 years, 10 months
rpms/rt2870-kmod/devel rt2870-kmod.spec,1.19,1.20
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25234
Modified Files:
rt2870-kmod.spec
Log Message:
Fix the SPEC file to apply the 2.6.29 patch correctly
Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/devel/rt2870-kmod.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rt2870-kmod.spec 11 Jan 2009 14:14:24 -0000 1.19
+++ rt2870-kmod.spec 11 Jan 2009 15:00:25 -0000 1.20
@@ -52,10 +52,12 @@
%patch4 -p1 -b .tftpboot
for kernel_version in %{?kernel_versions} ; do
- if [[ $kernel_version > "2.6.29" ]]; then
-%patch5 -p1 -b .2.6.29
- fi
cp -a *RT2870_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
15 years, 10 months
rpms/rt2870-kmod/devel rt2870-2.6.29-compile.patch, NONE, 1.1 rt2870-kmod.spec, 1.18, 1.19
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22265
Modified Files:
rt2870-kmod.spec
Added Files:
rt2870-2.6.29-compile.patch
Log Message:
* Sun Jan 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.4.0.0-4
- Add a patch for compilation against kernels >= 2.6.29
rt2870-2.6.29-compile.patch:
--- NEW FILE rt2870-2.6.29-compile.patch ---
diff -rupN old/2008_0925_RT2870_Linux_STA_v1.4.0.0/common/2870_rtmp_init.c new/2008_0925_RT2870_Linux_STA_v1.4.0.0/common/2870_rtmp_init.c
--- old/2008_0925_RT2870_Linux_STA_v1.4.0.0/common/2870_rtmp_init.c 2008-09-18 22:59:12.000000000 -0400
+++ new/2008_0925_RT2870_Linux_STA_v1.4.0.0/common/2870_rtmp_init.c 2009-01-10 16:34:25.000000000 -0500
@@ -763,7 +763,7 @@ Note:
NDIS_STATUS CreateThreads(
IN struct net_device *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;
pid_t pid_number = -1;
diff -rupN old/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/rt_main_dev.c new/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/rt_main_dev.c
--- old/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/rt_main_dev.c 2008-09-19 01:40:02.000000000 -0400
+++ new/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/rt_main_dev.c 2009-01-10 16:34:15.000000000 -0500
@@ -125,7 +125,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)
@@ -165,7 +165,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)
@@ -207,7 +207,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;
#ifdef RT2870
@@ -416,7 +416,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;
@@ -689,7 +689,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 //
@@ -716,7 +716,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;
@@ -725,7 +725,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;
}
@@ -1416,7 +1416,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);
@@ -1517,7 +1517,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;
@@ -1605,7 +1605,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))
{
@@ -1717,7 +1717,7 @@ static BOOLEAN RT28XXAvailRANameAssign(
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"));
@@ -1769,18 +1769,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;
}
@@ -1817,7 +1817,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_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/rt_profile.c new/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/rt_profile.c
--- old/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/rt_profile.c 2008-09-19 01:40:52.000000000 -0400
+++ new/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/rt_profile.c 2009-01-10 16:34:15.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);
@@ -1590,9 +1590,10 @@ NDIS_STATUS RTMPReadParametersHook(
}
set_fs(orgfs);
+#if 0
current->fsuid = orgfsuid;
current->fsgid = orgfsgid;
-
+#endif
kfree(buffer);
kfree(tmpbuf);
diff -rupN old/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/sta_ioctl.c new/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/sta_ioctl.c
--- old/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/sta_ioctl.c 2008-09-25 04:28:00.000000000 -0400
+++ new/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/sta_ioctl.c 2009-01-10 16:34:05.000000000 -0500
@@ -580,7 +580,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 RT2870
strncpy(name, "RT2870 Wireless", IFNAMSIZ);
@@ -592,7 +592,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
@@ -632,19 +632,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;
}
@@ -662,7 +662,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))
@@ -704,19 +704,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;
}
@@ -741,7 +741,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))
@@ -772,19 +772,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;
}
@@ -866,7 +866,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
@@ -911,19 +911,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;
}
@@ -993,7 +993,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];
@@ -1029,7 +1029,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;
@@ -1111,7 +1111,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;
@@ -1400,7 +1400,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))
@@ -1446,13 +1446,13 @@ 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)
@@ -1499,7 +1499,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))
@@ -1527,13 +1527,13 @@ 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)
@@ -1556,7 +1556,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
@@ -1590,13 +1590,13 @@ 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)
@@ -1624,7 +1624,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
@@ -1656,13 +1656,13 @@ 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)
@@ -1692,7 +1692,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))
@@ -1800,13 +1800,13 @@ 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)
@@ -1880,12 +1880,12 @@ 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;
@@ -1948,7 +1948,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)
{
@@ -2075,11 +2075,11 @@ 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;
@@ -2237,7 +2237,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;
@@ -2294,7 +2294,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
@@ -2447,7 +2447,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
@@ -2521,7 +2521,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;
@@ -2649,7 +2649,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;
@@ -2733,7 +2733,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))
@@ -2758,7 +2758,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))
@@ -2804,7 +2804,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;
@@ -2888,7 +2888,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);
@@ -3015,7 +3015,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
@@ -3073,7 +3073,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[] =
@@ -5483,12 +5483,12 @@ 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;
Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/devel/rt2870-kmod.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rt2870-kmod.spec 11 Jan 2009 10:41:27 -0000 1.18
+++ rt2870-kmod.spec 11 Jan 2009 14:14:24 -0000 1.19
@@ -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: 1.4.0.0
-Release: 3%{?dist}.4
+Release: 4%{?dist}
Summary: Kernel module for wireless devices with Ralink's rt2870 chipsets
Group: System Environment/Kernel
@@ -20,6 +20,7 @@
Patch2: rt2870-Makefile.x-fixes.patch
Patch3: rt2870-NetworkManager-support.patch
Patch4: rt2870-strip-tftpboot-copy.patch
+Patch5: rt2870-2.6.29-compile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -51,6 +52,9 @@
%patch4 -p1 -b .tftpboot
for kernel_version in %{?kernel_versions} ; do
+ if [[ $kernel_version > "2.6.29" ]]; then
+%patch5 -p1 -b .2.6.29
+ fi
cp -a *RT2870_Linux_STA* _kmod_build_${kernel_version%%___*}
done
@@ -72,6 +76,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jan 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.4.0.0-4
+- Add a patch for compilation against kernels >= 2.6.29
+
* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.4.0.0-3.4
- rebuild for latest Fedora kernel;
15 years, 10 months
rpms/wl-kmod/devel wl-kmod.spec,1.17,1.18
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10953
Modified Files:
wl-kmod.spec
Log Message:
* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.12-1.1
- rebuild for latest Fedora kernel;
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wl-kmod.spec 4 Jan 2009 15:13:10 -0000 1.17
+++ wl-kmod.spec 11 Jan 2009 10:49:03 -0000 1.18
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.10.27.12
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -80,6 +80,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.12-1.1
+- rebuild for latest Fedora kernel;
+
* Sun Jan 04 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.27.12-1
- Update version to 5.10.27.12
- Remove vlanmode and build patches
15 years, 10 months
rpms/slmodem-kmod/devel slmodem-kmod.spec,1.15,1.16
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/slmodem-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10831
Modified Files:
slmodem-kmod.spec
Log Message:
* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.15
- rebuild for latest Fedora kernel;
Index: slmodem-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/slmodem-kmod/devel/slmodem-kmod.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- slmodem-kmod.spec 4 Jan 2009 09:47:37 -0000 1.15
+++ slmodem-kmod.spec 11 Jan 2009 10:48:48 -0000 1.16
@@ -12,7 +12,7 @@
Name: slmodem-kmod
Version: 2.9.11
-Release: 26%{?dist}.14
+Release: 26%{?dist}.15
Summary: Proprietary SmartLink softmodem kernel drivers
Group: System Environment/Kernel
@@ -102,6 +102,9 @@
%changelog
+* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.15
+- rebuild for latest Fedora kernel;
+
* Sun Jan 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.14
- rebuild for latest Fedora kernel;
15 years, 10 months
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.22,1.23
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10710
Modified Files:
nvidia-kmod.spec
Log Message:
* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.22-1.1
- rebuild for latest Fedora kernel;
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nvidia-kmod.spec 9 Jan 2009 14:17:02 -0000 1.22
+++ nvidia-kmod.spec 11 Jan 2009 10:48:33 -0000 1.23
@@ -3,12 +3,12 @@
# "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 akmod
+%define buildforkernels newest
Name: nvidia-kmod
Version: 180.22
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -94,6 +94,9 @@
%changelog
+* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.22-1.1
+- rebuild for latest Fedora kernel;
+
* Thu Jan 8 2009 kwizart < kwizart at gmail.com > - 180.22-1
- Update to 180.22 (stable)
15 years, 10 months
rpms/nvidia-beta-kmod/devel nvidia-beta-kmod.spec,1.13,1.14
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/nvidia-beta-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10586
Modified Files:
nvidia-beta-kmod.spec
Log Message:
* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.11.02-1.4
- rebuild for latest Fedora kernel;
Index: nvidia-beta-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-beta-kmod/devel/nvidia-beta-kmod.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nvidia-beta-kmod.spec 4 Jan 2009 09:47:06 -0000 1.13
+++ nvidia-beta-kmod.spec 11 Jan 2009 10:48:18 -0000 1.14
@@ -8,7 +8,7 @@
Name: nvidia-beta-kmod
Version: 180.11.02
# Taken over by kmodtool
-Release: 1%{?dist}.3
+Release: 1%{?dist}.4
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -91,6 +91,9 @@
%changelog
+* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.11.02-1.4
+- rebuild for latest Fedora kernel;
+
* Sun Jan 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.11.02-1.3
- rebuild for latest Fedora kernel;
15 years, 10 months
rpms/nvidia-96xx-kmod/devel nvidia-96xx-kmod.spec,1.10,1.11
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/nvidia-96xx-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10465
Modified Files:
nvidia-96xx-kmod.spec
Log Message:
* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.10
- rebuild for latest Fedora kernel;
Index: nvidia-96xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-96xx-kmod/devel/nvidia-96xx-kmod.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nvidia-96xx-kmod.spec 4 Jan 2009 09:46:49 -0000 1.10
+++ nvidia-96xx-kmod.spec 11 Jan 2009 10:48:01 -0000 1.11
@@ -9,7 +9,7 @@
Name: nvidia-96xx-kmod
Version: 96.43.09
-Release: 1%{?dist}.9
+Release: 1%{?dist}.10
# Taken over by kmodtool
Summary: NVIDIA 1.0.96xx display driver kernel module
Group: System Environment/Kernel
@@ -96,6 +96,9 @@
%changelog
+* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.10
+- rebuild for latest Fedora kernel;
+
* Sun Jan 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.9
- rebuild for latest Fedora kernel;
15 years, 10 months