Attachment #187349 for bug #228553

View | Details | Raw Unified | Return to bug 228553 | Differences between

and this patch

Lines 1309-1316 int RtmpOSNetDevAddrSet( Link Here

(-)2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/rt_linux.c (-3 / +11 lines)
1309	RTMP_ADAPTER *pAd;	1309	RTMP_ADAPTER *pAd;
1310		1310
1311	net_dev = pNetDev;	1311	net_dev = pNetDev;
		1312	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
1312	pAd = (RTMP_ADAPTER *)net_dev->priv;	1313	pAd = (RTMP_ADAPTER *)net_dev->priv;
1313		1314	#else
		1315	pAd = (RTMP_ADAPTER *)net_dev->ml_priv;
		1316	#endif
		1317
1314	#ifdef CONFIG_STA_SUPPORT	1318	#ifdef CONFIG_STA_SUPPORT
1315	// work-around for the SuSE due to it has it's own interface name management system.	1319	// work-around for the SuSE due to it has it's own interface name management system.
1316	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)	1320	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
Lines 1502-1509 int RtmpOSNetDevAttach( Link Here
1502	// If we need hook some callback function to the net device structrue, now do it.	1506	// If we need hook some callback function to the net device structrue, now do it.
1503	if (pDevOpHook)	1507	if (pDevOpHook)
1504	{	1508	{
1505	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)pNetDev->priv;	1509	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
1506		1510	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)pNetDev->priv;
		1511	#else
		1512	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)pNetDev->ml_priv;
		1513	#endif
		1514
1507	pNetDev->open = pDevOpHook->open;	1515	pNetDev->open = pDevOpHook->open;
1508	pNetDev->stop = pDevOpHook->stop;	1516	pNetDev->stop = pDevOpHook->stop;
1509	pNetDev->hard_start_xmit = (HARD_START_XMIT_FUNC)(pDevOpHook->xmit);	1517	pNetDev->hard_start_xmit = (HARD_START_XMIT_FUNC)(pDevOpHook->xmit);

Lines 93-100 Note: Link Here

(-)2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/rt_main_dev.c (-2 / +40 lines)
93	*/	93	*/
94	int MainVirtualIF_close(IN struct net_device *net_dev)	94	int MainVirtualIF_close(IN struct net_device *net_dev)
95	{	95	{
		96	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
96	RTMP_ADAPTER *pAd = net_dev->priv;	97	RTMP_ADAPTER *pAd = net_dev->priv;
97		98	#else
		99	RTMP_ADAPTER *pAd = net_dev->ml_priv;
		100	#endif
98	// Sanity check for pAd	101	// Sanity check for pAd
99	if (pAd == NULL)	102	if (pAd == NULL)
100	return 0; // close ok	103	return 0; // close ok
Lines 133-139 Note: Link Here
133	*/	136	*/
134	int MainVirtualIF_open(IN struct net_device *net_dev)	137	int MainVirtualIF_open(IN struct net_device *net_dev)
135	{	138	{
		139	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
136	RTMP_ADAPTER *pAd = net_dev->priv;	140	RTMP_ADAPTER *pAd = net_dev->priv;
		141	#else
		142	RTMP_ADAPTER *pAd = net_dev->ml_priv;
		143	#endif
137		144
138	// Sanity check for pAd	145	// Sanity check for pAd
139	if (pAd == NULL)	146	if (pAd == NULL)
Lines 175-181 Note: Link Here
175	int rt28xx_close(IN PNET_DEV dev)	182	int rt28xx_close(IN PNET_DEV dev)
176	{	183	{
177	struct net_device * net_dev = (struct net_device *)dev;	184	struct net_device * net_dev = (struct net_device *)dev;
		185	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
178	RTMP_ADAPTER *pAd = net_dev->priv;	186	RTMP_ADAPTER *pAd = net_dev->priv;
		187	#else
		188	RTMP_ADAPTER *pAd = net_dev->ml_priv;
		189	#endif
179	BOOLEAN Cancelled;	190	BOOLEAN Cancelled;
180	UINT32 i = 0;	191	UINT32 i = 0;
181	#ifdef RTMP_MAC_USB	192	#ifdef RTMP_MAC_USB
Lines 404-410 Note: Link Here
404	int rt28xx_open(IN PNET_DEV dev)	415	int rt28xx_open(IN PNET_DEV dev)
405	{	416	{
406	struct net_device * net_dev = (struct net_device *)dev;	417	struct net_device * net_dev = (struct net_device *)dev;
		418	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
407	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->priv;	419	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->priv;
		420	#else
		421	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->ml_priv;
		422	#endif
408	int retval = 0;	423	int retval = 0;
409	//POS_COOKIE pObj;	424	//POS_COOKIE pObj;
410		425
Lines 522-529 PNET_DEV RtmpPhyNetDevInit( Link Here
522	pNetDevHook->get_stats = RT28xx_get_ether_stats;	537	pNetDevHook->get_stats = RT28xx_get_ether_stats;
523		538
524	pNetDevHook->needProtcted = FALSE;	539	pNetDevHook->needProtcted = FALSE;
525		540	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
526	net_dev->priv = (PVOID)pAd;	541	net_dev->priv = (PVOID)pAd;
		542	#else
		543	net_dev->ml_priv = (PVOID)pAd;
		544	#endif
527	pAd->net_dev = net_dev;	545	pAd->net_dev = net_dev;
528		546
529		547
Lines 559-565 Note: Link Here
559	int rt28xx_packet_xmit(struct sk_buff *skb)	577	int rt28xx_packet_xmit(struct sk_buff *skb)
560	{	578	{
561	struct net_device *net_dev = skb->dev;	579	struct net_device *net_dev = skb->dev;
		580	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
562	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv;	581	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv;
		582	#else
		583	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->ml_priv;
		584	#endif
563	int status = 0;	585	int status = 0;
564	PNDIS_PACKET pPacket = (PNDIS_PACKET) skb;	586	PNDIS_PACKET pPacket = (PNDIS_PACKET) skb;
565		587
Lines 641-647 static int rt28xx_send_packets( Link Here
641	IN struct sk_buff *skb_p,	663	IN struct sk_buff *skb_p,
642	IN struct net_device *net_dev)	664	IN struct net_device *net_dev)
643	{	665	{
		666	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
644	RTMP_ADAPTER *pAd = net_dev->priv;	667	RTMP_ADAPTER *pAd = net_dev->priv;
		668	#else
		669	RTMP_ADAPTER *pAd = net_dev->ml_priv;
		670	#endif
645		671
646	if (!(net_dev->flags & IFF_UP))	672	if (!(net_dev->flags & IFF_UP))
647	{	673	{
Lines 661-667 static int rt28xx_send_packets( Link Here
661	struct iw_statistics *rt28xx_get_wireless_stats(	687	struct iw_statistics *rt28xx_get_wireless_stats(
662	IN struct net_device *net_dev)	688	IN struct net_device *net_dev)
663	{	689	{
		690	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
664	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv;	691	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv;
		692	#else
		693	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->ml_priv;
		694	#endif
665		695
666		696
667	DBGPRINT(RT_DEBUG_TRACE, ("rt28xx_get_wireless_stats --->\n"));	697	DBGPRINT(RT_DEBUG_TRACE, ("rt28xx_get_wireless_stats --->\n"));
Lines 709-715 INT rt28xx_ioctl( Link Here
709	RTMP_ADAPTER *pAd = NULL;	739	RTMP_ADAPTER *pAd = NULL;
710	INT ret = 0;	740	INT ret = 0;
711		741
		742	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
712	pAd = net_dev->priv;	743	pAd = net_dev->priv;
		744	#else
		745	pAd = net_dev->ml_priv;
		746	#endif
713	if (pAd == NULL)	747	if (pAd == NULL)
714	{	748	{
715	/* if 1st open fail, pAd will be free;	749	/* if 1st open fail, pAd will be free;
Lines 751-757 static struct net_device_stats *RT28xx_g Link Here
751	RTMP_ADAPTER *pAd = NULL;	785	RTMP_ADAPTER *pAd = NULL;
752		786
753	if (net_dev)	787	if (net_dev)
		788	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
754	pAd = net_dev->priv;	789	pAd = net_dev->priv;
		790	#else
		791	pAd = net_dev->ml_priv;
		792	#endif
755		793
756	if (pAd)	794	if (pAd)
757	{	795	{

Lines 612-618 int rt_ioctl_siwfreq(struct net_device * Link Here

(-)2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/sta_ioctl.c (-1 / +144 lines)
612	struct iw_request_info *info,	612	struct iw_request_info *info,
613	struct iw_freq freq, char extra)	613	struct iw_freq freq, char extra)
614	{	614	{
		615	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
615	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	616	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		617	#else
		618	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		619	#endif
616	int chan = -1;	620	int chan = -1;
617		621
618	//check if the interface is down	622	//check if the interface is down
Lines 651-657 int rt_ioctl_giwfreq(struct net_device * Link Here
651	UCHAR ch;	655	UCHAR ch;
652	ULONG m = 2412000;	656	ULONG m = 2412000;
653		657
		658	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
654	pAdapter = dev->priv;	659	pAdapter = dev->priv;
		660	#else
		661	pAdapter = dev->ml_priv;
		662	#endif
655	if (pAdapter == NULL)	663	if (pAdapter == NULL)
656	{	664	{
657	/* if 1st open fail, pAd will be free;	665	/* if 1st open fail, pAd will be free;
Lines 674-680 int rt_ioctl_siwmode(struct net_device * Link Here
674	struct iw_request_info *info,	682	struct iw_request_info *info,
675	__u32 mode, char extra)	683	__u32 mode, char extra)
676	{	684	{
		685	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
677	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	686	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		687	#else
		688	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		689	#endif
678		690
679	//check if the interface is down	691	//check if the interface is down
680	if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))	692	if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
Lines 712-718 int rt_ioctl_giwmode(struct net_device * Link Here
712	struct iw_request_info *info,	724	struct iw_request_info *info,
713	__u32 mode, char extra)	725	__u32 mode, char extra)
714	{	726	{
		727	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
715	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	728	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		729	#else
		730	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		731	#endif
716		732
717	if (pAdapter == NULL)	733	if (pAdapter == NULL)
718	{	734	{
Lines 742-748 int rt_ioctl_siwsens(struct net_device * Link Here
742	struct iw_request_info *info,	758	struct iw_request_info *info,
743	char name, char extra)	759	char name, char extra)
744	{	760	{
		761	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
745	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	762	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		763	#else
		764	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		765	#endif
746		766
747	//check if the interface is down	767	//check if the interface is down
748	if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))	768	if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
Lines 765-771 int rt_ioctl_giwrange(struct net_device Link Here
765	struct iw_request_info *info,	785	struct iw_request_info *info,
766	struct iw_point data, char extra)	786	struct iw_point data, char extra)
767	{	787	{
		788	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
768	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	789	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		790	#else
		791	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		792	#endif
769	struct iw_range range = (struct iw_range ) extra;	793	struct iw_range range = (struct iw_range ) extra;
770	u16 val;	794	u16 val;
771	int i;	795	int i;
Lines 855-861 int rt_ioctl_siwap(struct net_device *de Link Here
855	struct iw_request_info *info,	879	struct iw_request_info *info,
856	struct sockaddr ap_addr, char extra)	880	struct sockaddr ap_addr, char extra)
857	{	881	{
		882	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
858	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	883	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		884	#else
		885	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		886	#endif
859	NDIS_802_11_MAC_ADDRESS Bssid;	887	NDIS_802_11_MAC_ADDRESS Bssid;
860		888
861	//check if the interface is down	889	//check if the interface is down
Lines 895-901 int rt_ioctl_giwap(struct net_device *de Link Here
895	struct iw_request_info *info,	923	struct iw_request_info *info,
896	struct sockaddr ap_addr, char extra)	924	struct sockaddr ap_addr, char extra)
897	{	925	{
		926	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
898	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	927	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		928	#else
		929	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		930	#endif
899		931
900	if (pAdapter == NULL)	932	if (pAdapter == NULL)
901	{	933	{
Lines 970-976 int rt_ioctl_iwaplist(struct net_device Link Here
970	struct iw_request_info *info,	1002	struct iw_request_info *info,
971	struct iw_point data, char extra)	1003	struct iw_point data, char extra)
972	{	1004	{
		1005	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
973	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	1006	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		1007	#else
		1008	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		1009	#endif
974		1010
975	struct sockaddr addr[IW_MAX_AP];	1011	struct sockaddr addr[IW_MAX_AP];
976	struct iw_quality qual[IW_MAX_AP];	1012	struct iw_quality qual[IW_MAX_AP];
Lines 1006-1012 int rt_ioctl_siwscan(struct net_device * Link Here
1006	struct iw_request_info *info,	1042	struct iw_request_info *info,
1007	struct iw_point data, char extra)	1043	struct iw_point data, char extra)
1008	{	1044	{
		1045	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
1009	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	1046	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		1047	#else
		1048	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		1049	#endif
1010		1050
1011	ULONG Now;	1051	ULONG Now;
1012	int Status = NDIS_STATUS_SUCCESS;	1052	int Status = NDIS_STATUS_SUCCESS;
Lines 1088-1094 int rt_ioctl_giwscan(struct net_device * Link Here
1088	struct iw_point data, char extra)	1128	struct iw_point data, char extra)
1089	{	1129	{
1090		1130
		1131	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
1091	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	1132	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		1133	#else
		1134	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		1135	#endif
1092	int i=0;	1136	int i=0;
1093	PSTRING current_ev = extra, previous_ev = extra;	1137	PSTRING current_ev = extra, previous_ev = extra;
1094	PSTRING end_buf;	1138	PSTRING end_buf;
Lines 1457-1463 int rt_ioctl_siwessid(struct net_device Link Here
1457	struct iw_request_info *info,	1501	struct iw_request_info *info,
1458	struct iw_point data, char essid)	1502	struct iw_point data, char essid)
1459	{	1503	{
		1504	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
1460	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	1505	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		1506	#else
		1507	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		1508	#endif
1461		1509
1462	//check if the interface is down	1510	//check if the interface is down
1463	if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))	1511	if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
Lines 1498-1504 int rt_ioctl_giwessid(struct net_device Link Here
1498	struct iw_request_info *info,	1546	struct iw_request_info *info,
1499	struct iw_point data, char essid)	1547	struct iw_point data, char essid)
1500	{	1548	{
		1549	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
1501	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	1550	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		1551	#else
		1552	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		1553	#endif
1502		1554
1503	if (pAdapter == NULL)	1555	if (pAdapter == NULL)
1504	{	1556	{
Lines 1544-1550 int rt_ioctl_siwnickn(struct net_device Link Here
1544	struct iw_request_info *info,	1596	struct iw_request_info *info,
1545	struct iw_point data, char nickname)	1597	struct iw_point data, char nickname)
1546	{	1598	{
		1599	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
1547	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	1600	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		1601	#else
		1602	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		1603	#endif
1548		1604
1549	//check if the interface is down	1605	//check if the interface is down
1550	if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))	1606	if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
Lines 1567-1573 int rt_ioctl_giwnickn(struct net_device Link Here
1567	struct iw_request_info *info,	1623	struct iw_request_info *info,
1568	struct iw_point data, char nickname)	1624	struct iw_point data, char nickname)
1569	{	1625	{
		1626	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
1570	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	1627	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		1628	#else
		1629	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		1630	#endif
1571		1631
1572	if (pAdapter == NULL)	1632	if (pAdapter == NULL)
1573	{	1633	{
Lines 1589-1595 int rt_ioctl_siwrts(struct net_device *d Link Here
1589	struct iw_request_info *info,	1649	struct iw_request_info *info,
1590	struct iw_param rts, char extra)	1650	struct iw_param rts, char extra)
1591	{	1651	{
		1652	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
1592	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	1653	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		1654	#else
		1655	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		1656	#endif
1593	u16 val;	1657	u16 val;
1594		1658
1595	//check if the interface is down	1659	//check if the interface is down
Lines 1618-1624 int rt_ioctl_giwrts(struct net_device *d Link Here
1618	struct iw_request_info *info,	1682	struct iw_request_info *info,
1619	struct iw_param rts, char extra)	1683	struct iw_param rts, char extra)
1620	{	1684	{
		1685	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
1621	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	1686	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		1687	#else
		1688	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		1689	#endif
1622		1690
1623	if (pAdapter == NULL)	1691	if (pAdapter == NULL)
1624	{	1692	{
Lines 1645-1651 int rt_ioctl_siwfrag(struct net_device * Link Here
1645	struct iw_request_info *info,	1713	struct iw_request_info *info,
1646	struct iw_param frag, char extra)	1714	struct iw_param frag, char extra)
1647	{	1715	{
		1716	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
1648	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	1717	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		1718	#else
		1719	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		1720	#endif
1649	u16 val;	1721	u16 val;
1650		1722
1651	//check if the interface is down	1723	//check if the interface is down
Lines 1672-1678 int rt_ioctl_giwfrag(struct net_device * Link Here
1672	struct iw_request_info *info,	1744	struct iw_request_info *info,
1673	struct iw_param frag, char extra)	1745	struct iw_param frag, char extra)
1674	{	1746	{
		1747	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
1675	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	1748	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		1749	#else
		1750	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		1751	#endif
1676		1752
1677	if (pAdapter == NULL)	1753	if (pAdapter == NULL)
1678	{	1754	{
Lines 1701-1707 int rt_ioctl_siwencode(struct net_device Link Here
1701	struct iw_request_info *info,	1777	struct iw_request_info *info,
1702	struct iw_point erq, char extra)	1778	struct iw_point erq, char extra)
1703	{	1779	{
		1780	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
1704	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	1781	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		1782	#else
		1783	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		1784	#endif
1705		1785
1706	//check if the interface is down	1786	//check if the interface is down
1707	if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))	1787	if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
Lines 1807-1813 rt_ioctl_giwencode(struct net_device *de Link Here
1807	struct iw_point erq, char key)	1887	struct iw_point erq, char key)
1808	{	1888	{
1809	int kid;	1889	int kid;
		1890	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
1810	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	1891	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		1892	#else
		1893	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		1894	#endif
1811		1895
1812	if (pAdapter == NULL)	1896	if (pAdapter == NULL)
1813	{	1897	{
Lines 1877-1883 rt_ioctl_setparam(struct net_device *dev Link Here
1877	PSTRING value;	1961	PSTRING value;
1878	int Status=0;	1962	int Status=0;
1879		1963
		1964	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
1880	pAdapter = dev->priv;	1965	pAdapter = dev->priv;
		1966	#else
		1967	pAdapter = dev->ml_priv;
		1968	#endif
1881	if (pAdapter == NULL)	1969	if (pAdapter == NULL)
1882	{	1970	{
1883	/* if 1st open fail, pAd will be free;	1971	/* if 1st open fail, pAd will be free;
Lines 1941-1947 rt_private_get_statistics(struct net_dev Link Here
1941	struct iw_point wrq, char extra)	2029	struct iw_point wrq, char extra)
1942	{	2030	{
1943	INT Status = 0;	2031	INT Status = 0;
		2032	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
1944	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;	2033	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
		2034	#else
		2035	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv;
		2036	#endif
1945		2037
1946	if (extra == NULL)	2038	if (extra == NULL)
1947	{	2039	{
Lines 2068-2074 rt_private_show(struct net_device *dev, Link Here
2068	POS_COOKIE pObj;	2160	POS_COOKIE pObj;
2069	u32 subcmd = wrq->flags;	2161	u32 subcmd = wrq->flags;
2070		2162
		2163	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
2071	pAd = dev->priv;	2164	pAd = dev->priv;
		2165	#else
		2166	pAd = dev->ml_priv;
		2167	#endif
2072	if (pAd == NULL)	2168	if (pAd == NULL)
2073	{	2169	{
2074	/* if 1st open fail, pAd will be free;	2170	/* if 1st open fail, pAd will be free;
Lines 2220-2226 int rt_ioctl_siwmlme(struct net_device * Link Here
2220	union iwreq_data *wrqu,	2316	union iwreq_data *wrqu,
2221	char *extra)	2317	char *extra)
2222	{	2318	{
		2319	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
2223	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;	2320	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
		2321	#else
		2322	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv;
		2323	#endif
2224	struct iw_mlme pMlme = (struct iw_mlme )wrqu->data.pointer;	2324	struct iw_mlme pMlme = (struct iw_mlme )wrqu->data.pointer;
2225	MLME_QUEUE_ELEM MsgElem;	2325	MLME_QUEUE_ELEM MsgElem;
2226	MLME_DISASSOC_REQ_STRUCT DisAssocReq;	2326	MLME_DISASSOC_REQ_STRUCT DisAssocReq;
Lines 2277-2283 int rt_ioctl_siwauth(struct net_device * Link Here
2277	struct iw_request_info *info,	2377	struct iw_request_info *info,
2278	union iwreq_data wrqu, char extra)	2378	union iwreq_data wrqu, char extra)
2279	{	2379	{
		2380	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
2280	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	2381	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		2382	#else
		2383	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		2384	#endif
2281	struct iw_param *param = &wrqu->param;	2385	struct iw_param *param = &wrqu->param;
2282		2386
2283	//check if the interface is down	2387	//check if the interface is down
Lines 2430-2436 int rt_ioctl_giwauth(struct net_device * Link Here
2430	struct iw_request_info *info,	2534	struct iw_request_info *info,
2431	union iwreq_data wrqu, char extra)	2535	union iwreq_data wrqu, char extra)
2432	{	2536	{
		2537	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
2433	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	2538	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		2539	#else
		2540	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		2541	#endif
2434	struct iw_param *param = &wrqu->param;	2542	struct iw_param *param = &wrqu->param;
2435		2543
2436	//check if the interface is down	2544	//check if the interface is down
Lines 2504-2510 int rt_ioctl_siwencodeext(struct net_dev Link Here
2504	union iwreq_data *wrqu,	2612	union iwreq_data *wrqu,
2505	char *extra)	2613	char *extra)
2506	{	2614	{
		2615	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
2507	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	2616	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		2617	#else
		2618	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		2619	#endif
2508	struct iw_point *encoding = &wrqu->encoding;	2620	struct iw_point *encoding = &wrqu->encoding;
2509	struct iw_encode_ext ext = (struct iw_encode_ext )extra;	2621	struct iw_encode_ext ext = (struct iw_encode_ext )extra;
2510	int keyIdx, alg = ext->alg;	2622	int keyIdx, alg = ext->alg;
Lines 2629-2635 rt_ioctl_giwencodeext(struct net_device Link Here
2629	struct iw_request_info *info,	2741	struct iw_request_info *info,
2630	union iwreq_data wrqu, char extra)	2742	union iwreq_data wrqu, char extra)
2631	{	2743	{
		2744	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
2632	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;	2745	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
		2746	#else
		2747	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv;
		2748	#endif
2633	PCHAR pKey = NULL;	2749	PCHAR pKey = NULL;
2634	struct iw_point *encoding = &wrqu->encoding;	2750	struct iw_point *encoding = &wrqu->encoding;
2635	struct iw_encode_ext ext = (struct iw_encode_ext )extra;	2751	struct iw_encode_ext ext = (struct iw_encode_ext )extra;
Lines 2713-2719 int rt_ioctl_siwgenie(struct net_device Link Here
2713	struct iw_request_info *info,	2829	struct iw_request_info *info,
2714	union iwreq_data wrqu, char extra)	2830	union iwreq_data wrqu, char extra)
2715	{	2831	{
		2832	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
2716	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;	2833	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
		2834	#else
		2835	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv;
		2836	#endif
2717		2837
2718	DBGPRINT(RT_DEBUG_TRACE ,("===> rt_ioctl_siwgenie\n"));	2838	DBGPRINT(RT_DEBUG_TRACE ,("===> rt_ioctl_siwgenie\n"));
2719	#ifdef NATIVE_WPA_SUPPLICANT_SUPPORT	2839	#ifdef NATIVE_WPA_SUPPLICANT_SUPPORT
Lines 2745-2751 int rt_ioctl_giwgenie(struct net_device Link Here
2745	struct iw_request_info *info,	2865	struct iw_request_info *info,
2746	union iwreq_data wrqu, char extra)	2866	union iwreq_data wrqu, char extra)
2747	{	2867	{
		2868	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
2748	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;	2869	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
		2870	#else
		2871	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv;
		2872	#endif
2749		2873
2750	if ((pAd->StaCfg.RSNIE_Len == 0) \|\|	2874	if ((pAd->StaCfg.RSNIE_Len == 0) \|\|
2751	(pAd->StaCfg.AuthMode < Ndis802_11AuthModeWPA))	2875	(pAd->StaCfg.AuthMode < Ndis802_11AuthModeWPA))
Lines 2791-2797 int rt_ioctl_siwpmksa(struct net_device Link Here
2791	union iwreq_data *wrqu,	2915	union iwreq_data *wrqu,
2792	char *extra)	2916	char *extra)
2793	{	2917	{
		2918	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
2794	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;	2919	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
		2920	#else
		2921	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv;
		2922	#endif
2795	struct iw_pmksa pPmksa = (struct iw_pmksa )wrqu->data.pointer;	2923	struct iw_pmksa pPmksa = (struct iw_pmksa )wrqu->data.pointer;
2796	INT CachedIdx = 0, idx = 0;	2924	INT CachedIdx = 0, idx = 0;
2797		2925
Lines 2875-2881 rt_private_ioctl_bbp(struct net_device * Link Here
2875	UINT32 bbpValue;	3003	UINT32 bbpValue;
2876	BOOLEAN bIsPrintAllBBP = FALSE;	3004	BOOLEAN bIsPrintAllBBP = FALSE;
2877	INT Status = 0;	3005	INT Status = 0;
		3006	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
2878	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;	3007	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
		3008	#else
		3009	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
		3010	#endif
2879		3011
2880		3012
2881	memset(extra, 0x00, IW_PRIV_SIZE_MASK);	3013	memset(extra, 0x00, IW_PRIV_SIZE_MASK);
Lines 3002-3008 int rt_ioctl_siwrate(struct net_device * Link Here
3002	struct iw_request_info *info,	3134	struct iw_request_info *info,
3003	union iwreq_data wrqu, char extra)	3135	union iwreq_data wrqu, char extra)
3004	{	3136	{
		3137	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
3005	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;	3138	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
		3139	#else
		3140	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv;
		3141	#endif
3006	UINT32 rate = wrqu->bitrate.value, fixed = wrqu->bitrate.fixed;	3142	UINT32 rate = wrqu->bitrate.value, fixed = wrqu->bitrate.fixed;
3007		3143
3008	//check if the interface is down	3144	//check if the interface is down
Lines 3060-3066 int rt_ioctl_giwrate(struct net_device * Link Here
3060	struct iw_request_info *info,	3196	struct iw_request_info *info,
3061	union iwreq_data wrqu, char extra)	3197	union iwreq_data wrqu, char extra)
3062	{	3198	{
		3199	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
3063	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;	3200	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
		3201	#else
		3202	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv;
		3203	#endif
3064	int rate_index = 0, rate_count = 0;	3204	int rate_index = 0, rate_count = 0;
3065	HTTRANSMIT_SETTING ht_setting;	3205	HTTRANSMIT_SETTING ht_setting;
3066	__s32 ralinkrate[] =	3206	__s32 ralinkrate[] =
Lines 5512-5519 INT rt28xx_sta_ioctl( Link Here
5512	INT Status = NDIS_STATUS_SUCCESS;	5652	INT Status = NDIS_STATUS_SUCCESS;
5513	USHORT subcmd;	5653	USHORT subcmd;
5514		5654
5515		5655	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
5516	pAd = net_dev->priv;	5656	pAd = net_dev->priv;
		5657	#else
		5658	pAd = net_dev->ml_priv;
		5659	#endif
5517	if (pAd == NULL)	5660	if (pAd == NULL)
5518	{	5661	{
5519	/* if 1st open fail, pAd will be free;	5662	/* if 1st open fail, pAd will be free;

Return to bug 228553