Attachment #107708 for bug #161895

Lines 664-670 Link Here

(-)../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/beta-8187/r8180_wx.c (-2 / +2 lines)
664	};	664	};
665		665
666	#if WIRELESS_EXT >= 17	666	#if WIRELESS_EXT >= 17
667	static struct iw_statistics r8180_get_wireless_stats(struct net_device dev)	667	static struct iw_statistics r8180_get_stats(struct net_device dev)
668	{	668	{
669	struct r8180_priv *priv = ieee80211_priv(dev);	669	struct r8180_priv *priv = ieee80211_priv(dev);
670		670
Lines 680-686 Link Here
680	.num_private = sizeof(r8180_private_handler) / sizeof(iw_handler),	680	.num_private = sizeof(r8180_private_handler) / sizeof(iw_handler),
681	.num_private_args = sizeof(r8180_private_args) / sizeof(struct iw_priv_args),	681	.num_private_args = sizeof(r8180_private_args) / sizeof(struct iw_priv_args),
682	#if WIRELESS_EXT >= 17	682	#if WIRELESS_EXT >= 17
683	.get_wireless_stats = r8180_get_wireless_stats,	683	.get_wireless_stats = r8180_get_stats,
684	#endif	684	#endif
685	.private_args = (struct iw_priv_args *)r8180_private_args,	685	.private_args = (struct iw_priv_args *)r8180_private_args,
686	};	686	};




}


//irqreturn_t rtl8180_interrupt(int irq, void *netdev);
//void set_nic_rxring(struct net_device *dev);
//void set_nic_txring(struct net_device *dev);
static struct net_device_stats *rtl8180_stats(struct net_device *dev);

}		


static struct iw_statistics *r8180_get_stats(struct net_device *dev)
{
       struct r8180_priv *priv = ieee80211_priv(dev);


	write_nic_dword(dev,TX_CONF,tx | (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT));
#endif
}
void rtl8187_rx_isr(struct urb *rx_urb);


void rtl8187_rx_urbsubmit(struct net_device *dev, struct urb* rx_urb)

}
		

void rtl8187_rx_isr(struct urb *rx_urb)
{
	struct net_device *dev = (struct net_device*)rx_urb->context;
	struct r8180_priv *priv = ieee80211_priv(dev);


void rtl8180_try_wake_queue(struct net_device *dev, int pri);

void rtl8187_lptx_isr(struct urb *tx_urb)
{
	struct net_device *dev = (struct net_device*)tx_urb->context;
	struct r8180_priv *priv = ieee80211_priv(dev);

	
}

void rtl8187_nptx_isr(struct urb *tx_urb)
{
	struct net_device *dev = (struct net_device*)tx_urb->context;
	struct r8180_priv *priv = ieee80211_priv(dev);

	dev->do_ioctl = rtl8180_ioctl;
	dev->set_multicast_list = r8180_set_multicast;
	dev->set_mac_address = r8180_set_mac_adr;
	dev->get_stats = r8180_get_stats;
	dev->type=ARPHRD_ETHER;
	
	if (dev_alloc_name(dev, ifname) < 0){

Lines 26-32 Link Here

(-)../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/beta-8187/r8187.h (-1 / +2 lines)
26		26
27	#include <linux/module.h>	27	#include <linux/module.h>
28	#include <linux/kernel.h>	28	#include <linux/kernel.h>
29	#include <linux/config.h>	29	#include <linux/autoconf.h>
30	#include <linux/init.h>	30	#include <linux/init.h>
31	#include <linux/ioport.h>	31	#include <linux/ioport.h>
32	#include <linux/sched.h>	32	#include <linux/sched.h>
Lines 285-289 Link Here
285	void write_phy_cck(struct net_device *dev, u8 adr, u32 data);	285	void write_phy_cck(struct net_device *dev, u8 adr, u32 data);
286	void write_phy_ofdm(struct net_device *dev, u8 adr, u32 data);	286	void write_phy_ofdm(struct net_device *dev, u8 adr, u32 data);
287	void rtl8185_tx_antenna(struct net_device *dev, u8 ant);	287	void rtl8185_tx_antenna(struct net_device *dev, u8 ant);
		288	void rtl8180_set_mode(struct net_device *dev,int mode);
288	void rtl8187_set_rxconf(struct net_device *dev);	289	void rtl8187_set_rxconf(struct net_device *dev);
289	#endif	290	#endif




ps_timeout	ieee80211.h	/^	int ps_timeout;$/;"	m	struct:ieee80211_device
ps_tl	ieee80211.h	/^	u32 ps_tl;$/;"	m	struct:ieee80211_device
queue_stop	ieee80211.h	/^	short queue_stop;$/;"	m	struct:ieee80211_device
r8180_get_stats	r8180_wx.c	/^static struct iw_statistics *r8180_get_stats(struct net_device *dev)$/;"	f	file:
r8180_get_stats	r8187_core.c	/^static struct iw_statistics *r8180_get_stats(struct net_device *dev)$/;"	f	file:
r8180_priv	r8187.h	/^typedef struct r8180_priv$/;"	s
r8180_priv	r8187.h	/^}r8180_priv;$/;"	t
r8180_private_args	r8180_wx.c	/^static const struct iw_priv_args r8180_private_args[] = { $/;"	v	file:

rtl8187_beacon_stop	r8187_core.c	/^void rtl8187_beacon_stop(struct net_device *dev)$/;"	f
rtl8187_beacon_tx	r8187_core.c	/^void rtl8187_beacon_tx(struct net_device *dev)$/;"	f
rtl8187_link_change	r8187_core.c	/^void rtl8187_link_change(struct net_device *dev)$/;"	f
rtl8187_lptx_isr	r8187_core.c	/^void rtl8187_lptx_isr(struct urb *tx_urb)$/;"	f
rtl8187_net_update	r8187_core.c	/^void rtl8187_net_update(struct net_device *dev)$/;"	f
rtl8187_nptx_isr	r8187_core.c	/^void rtl8187_nptx_isr(struct urb *tx_urb)$/;"	f
rtl8187_rx_initiate	r8187_core.c	/^void rtl8187_rx_initiate(struct net_device *dev)$/;"	f
rtl8187_rx_isr	r8187_core.c	/^void rtl8187_rx_isr(struct urb *rx_urb)$/;"	f
rtl8187_rx_urbsubmit	r8187_core.c	/^void rtl8187_rx_urbsubmit(struct net_device *dev, struct urb* rx_urb)$/;"	f
rtl8187_set_rate	r8187_core.c	/^void rtl8187_set_rate(struct net_device *dev)$/;"	f
rtl8187_set_rxconf	r8187_core.c	/^void rtl8187_set_rxconf(struct net_device *dev)$/;"	f

Lines 11-17 Link Here

(-)../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/ieee80211/ieee80211_crypt.c (-1 / +1 lines)
11	*	11	*
12	*/	12	*/
13		13
14	#include <linux/config.h>	14	#include <linux/autoconf.h>
15	#include <linux/version.h>	15	#include <linux/version.h>
16	#include <linux/module.h>	16	#include <linux/module.h>
17	#include <linux/init.h>	17	#include <linux/init.h>

Lines 9-15 Link Here

(-)../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/ieee80211/ieee80211_crypt_ccmp.c (-1 / +1 lines)
9	* more details.	9	* more details.
10	*/	10	*/
11		11
12	#include <linux/config.h>	12	#include <linux/autoconf.h>
13	#include <linux/version.h>	13	#include <linux/version.h>
14	#include <linux/module.h>	14	#include <linux/module.h>
15	#include <linux/init.h>	15	#include <linux/init.h>

Lines 9-15 Link Here

(-)../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/ieee80211/ieee80211_crypt_tkip.c (-1 / +1 lines)
9	* more details.	9	* more details.
10	*/	10	*/
11		11
12	#include <linux/config.h>	12	#include <linux/autoconf.h>
13	#include <linux/version.h>	13	#include <linux/version.h>
14	#include <linux/module.h>	14	#include <linux/module.h>
15	#include <linux/init.h>	15	#include <linux/init.h>

Lines 9-15 Link Here

(-)../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/ieee80211/ieee80211_crypt_wep.c (-1 / +1 lines)
9	* more details.	9	* more details.
10	*/	10	*/
11		11
12	#include <linux/config.h>	12	#include <linux/autoconf.h>
13	#include <linux/version.h>	13	#include <linux/version.h>
14	#include <linux/module.h>	14	#include <linux/module.h>
15	#include <linux/init.h>	15	#include <linux/init.h>

Lines 31-37 Link Here

(-)../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/ieee80211/ieee80211_module.c (-1 / +1 lines)
31	*******************************************************************************/	31	*******************************************************************************/
32		32
33	#include <linux/compiler.h>	33	#include <linux/compiler.h>
34	#include <linux/config.h>	34	#include <linux/autoconf.h>
35	#include <linux/errno.h>	35	#include <linux/errno.h>
36	#include <linux/if_arp.h>	36	#include <linux/if_arp.h>
37	#include <linux/in6.h>	37	#include <linux/in6.h>

Lines 22-28 Link Here

(-)../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/ieee80211/ieee80211_rx.c (-1 / +1 lines)
22		22
23		23
24	#include <linux/compiler.h>	24	#include <linux/compiler.h>
25	#include <linux/config.h>	25	#include <linux/autoconf.h>
26	#include <linux/errno.h>	26	#include <linux/errno.h>
27	#include <linux/if_arp.h>	27	#include <linux/if_arp.h>
28	#include <linux/in6.h>	28	#include <linux/in6.h>

Lines 356-362 Link Here

(-)../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/ieee80211/ieee80211_softmac_wx.c (-1 / +1 lines)
356	spin_lock_irqsave(&ieee->lock, flags);	356	spin_lock_irqsave(&ieee->lock, flags);
357		357
358	if (wrqu->essid.flags && wrqu->essid.length) {	358	if (wrqu->essid.flags && wrqu->essid.length) {
359	len = ((wrqu->essid.length-1) < IW_ESSID_MAX_SIZE) ? (wrqu->essid.length-1) : IW_ESSID_MAX_SIZE;	359	len = ((wrqu->essid.length) < IW_ESSID_MAX_SIZE) ? (wrqu->essid.length) : IW_ESSID_MAX_SIZE;
360		360
361	strncpy(ieee->current_network.ssid, extra, len);	361	strncpy(ieee->current_network.ssid, extra, len);
362	ieee->current_network.ssid_len = len;	362	ieee->current_network.ssid_len = len;

Lines 32-38 Link Here

(-)../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/ieee80211/ieee80211_tx.c (-1 / +1 lines)
32	******************************************************************************/	32	******************************************************************************/
33		33
34	#include <linux/compiler.h>	34	#include <linux/compiler.h>
35	#include <linux/config.h>	35	#include <linux/autoconf.h>
36	#include <linux/errno.h>	36	#include <linux/errno.h>
37	#include <linux/if_arp.h>	37	#include <linux/if_arp.h>
38	#include <linux/in6.h>	38	#include <linux/in6.h>

Return to bug 161895

Lines 266-272 Link Here

(-)../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/beta-8187/r8187_core.c (-7 / +7 lines)
266	}	266	}
267		267
268		268
269	//irqreturn_t rtl8180_interrupt(int irq, void netdev, struct pt_regs regs);	269	//irqreturn_t rtl8180_interrupt(int irq, void *netdev);
270	//void set_nic_rxring(struct net_device *dev);	270	//void set_nic_rxring(struct net_device *dev);
271	//void set_nic_txring(struct net_device *dev);	271	//void set_nic_txring(struct net_device *dev);
272	static struct net_device_stats rtl8180_stats(struct net_device dev);	272	static struct net_device_stats rtl8180_stats(struct net_device dev);
Lines 408-414 Link Here
408	}	408	}
409		409
410		410
411	static struct iw_statistics r8180_get_wireless_stats(struct net_device dev)	411	static struct iw_statistics r8180_get_stats(struct net_device dev)
412	{	412	{
413	struct r8180_priv *priv = ieee80211_priv(dev);	413	struct r8180_priv *priv = ieee80211_priv(dev);
414		414
Lines 678-684 Link Here
678	write_nic_dword(dev,TX_CONF,tx \| (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT));	678	write_nic_dword(dev,TX_CONF,tx \| (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT));
679	#endif	679	#endif
680	}	680	}
681	void rtl8187_rx_isr(struct urb rx_urb, struct pt_regs regs);	681	void rtl8187_rx_isr(struct urb *rx_urb);
682		682
683		683
684	void rtl8187_rx_urbsubmit(struct net_device dev, struct urb rx_urb)	684	void rtl8187_rx_urbsubmit(struct net_device dev, struct urb rx_urb)
Lines 1048-1054 Link Here
1048	}	1048	}
1049		1049
1050		1050
1051	void rtl8187_rx_isr(struct urb rx_urb, struct pt_regs regs)	1051	void rtl8187_rx_isr(struct urb *rx_urb)
1052	{	1052	{
1053	struct net_device dev = (struct net_device)rx_urb->context;	1053	struct net_device dev = (struct net_device)rx_urb->context;
1054	struct r8180_priv *priv = ieee80211_priv(dev);	1054	struct r8180_priv *priv = ieee80211_priv(dev);
Lines 1225-1231 Link Here
1225		1225
1226	void rtl8180_try_wake_queue(struct net_device *dev, int pri);	1226	void rtl8180_try_wake_queue(struct net_device *dev, int pri);
1227		1227
1228	void rtl8187_lptx_isr(struct urb tx_urb, struct pt_regs regs)	1228	void rtl8187_lptx_isr(struct urb *tx_urb)
1229	{	1229	{
1230	struct net_device dev = (struct net_device)tx_urb->context;	1230	struct net_device dev = (struct net_device)tx_urb->context;
1231	struct r8180_priv *priv = ieee80211_priv(dev);	1231	struct r8180_priv *priv = ieee80211_priv(dev);
Lines 1324-1330 Link Here
1324		1324
1325	}	1325	}
1326		1326
1327	void rtl8187_nptx_isr(struct urb tx_urb, struct pt_regs regs)	1327	void rtl8187_nptx_isr(struct urb *tx_urb)
1328	{	1328	{
1329	struct net_device dev = (struct net_device)tx_urb->context;	1329	struct net_device dev = (struct net_device)tx_urb->context;
1330	struct r8180_priv *priv = ieee80211_priv(dev);	1330	struct r8180_priv *priv = ieee80211_priv(dev);
Lines 2418-2424 Link Here
2418	dev->do_ioctl = rtl8180_ioctl;	2418	dev->do_ioctl = rtl8180_ioctl;
2419	dev->set_multicast_list = r8180_set_multicast;	2419	dev->set_multicast_list = r8180_set_multicast;
2420	dev->set_mac_address = r8180_set_mac_adr;	2420	dev->set_mac_address = r8180_set_mac_adr;
2421	dev->get_wireless_stats = r8180_get_wireless_stats;	2421	dev->get_stats = r8180_get_stats;
2422	dev->type=ARPHRD_ETHER;	2422	dev->type=ARPHRD_ETHER;
2423		2423
2424	if (dev_alloc_name(dev, ifname) < 0){	2424	if (dev_alloc_name(dev, ifname) < 0){

Lines 1118-1125 Link Here

(-)../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/beta-8187/tags (-5 / +5 lines)
1118	ps_timeout ieee80211.h /^ int ps_timeout;$/;" m struct:ieee80211_device	1118	ps_timeout ieee80211.h /^ int ps_timeout;$/;" m struct:ieee80211_device
1119	ps_tl ieee80211.h /^ u32 ps_tl;$/;" m struct:ieee80211_device	1119	ps_tl ieee80211.h /^ u32 ps_tl;$/;" m struct:ieee80211_device
1120	queue_stop ieee80211.h /^ short queue_stop;$/;" m struct:ieee80211_device	1120	queue_stop ieee80211.h /^ short queue_stop;$/;" m struct:ieee80211_device
1121	r8180_get_wireless_stats r8180_wx.c /^static struct iw_statistics r8180_get_wireless_stats(struct net_device dev)$/;" f file:	1121	r8180_get_stats r8180_wx.c /^static struct iw_statistics r8180_get_stats(struct net_device dev)$/;" f file:
1122	r8180_get_wireless_stats r8187_core.c /^static struct iw_statistics r8180_get_wireless_stats(struct net_device dev)$/;" f file:	1122	r8180_get_stats r8187_core.c /^static struct iw_statistics r8180_get_stats(struct net_device dev)$/;" f file:
1123	r8180_priv r8187.h /^typedef struct r8180_priv$/;" s	1123	r8180_priv r8187.h /^typedef struct r8180_priv$/;" s
1124	r8180_priv r8187.h /^}r8180_priv;$/;" t	1124	r8180_priv r8187.h /^}r8180_priv;$/;" t
1125	r8180_private_args r8180_wx.c /^static const struct iw_priv_args r8180_private_args[] = { $/;" v file:	1125	r8180_private_args r8180_wx.c /^static const struct iw_priv_args r8180_private_args[] = { $/;" v file:
Lines 1228-1238 Link Here
1228	rtl8187_beacon_stop r8187_core.c /^void rtl8187_beacon_stop(struct net_device *dev)$/;" f	1228	rtl8187_beacon_stop r8187_core.c /^void rtl8187_beacon_stop(struct net_device *dev)$/;" f
1229	rtl8187_beacon_tx r8187_core.c /^void rtl8187_beacon_tx(struct net_device *dev)$/;" f	1229	rtl8187_beacon_tx r8187_core.c /^void rtl8187_beacon_tx(struct net_device *dev)$/;" f
1230	rtl8187_link_change r8187_core.c /^void rtl8187_link_change(struct net_device *dev)$/;" f	1230	rtl8187_link_change r8187_core.c /^void rtl8187_link_change(struct net_device *dev)$/;" f
1231	rtl8187_lptx_isr r8187_core.c /^void rtl8187_lptx_isr(struct urb tx_urb, struct pt_regs regs)$/;" f	1231	rtl8187_lptx_isr r8187_core.c /^void rtl8187_lptx_isr(struct urb *tx_urb)$/;" f
1232	rtl8187_net_update r8187_core.c /^void rtl8187_net_update(struct net_device *dev)$/;" f	1232	rtl8187_net_update r8187_core.c /^void rtl8187_net_update(struct net_device *dev)$/;" f
1233	rtl8187_nptx_isr r8187_core.c /^void rtl8187_nptx_isr(struct urb tx_urb, struct pt_regs regs)$/;" f	1233	rtl8187_nptx_isr r8187_core.c /^void rtl8187_nptx_isr(struct urb *tx_urb)$/;" f
1234	rtl8187_rx_initiate r8187_core.c /^void rtl8187_rx_initiate(struct net_device *dev)$/;" f	1234	rtl8187_rx_initiate r8187_core.c /^void rtl8187_rx_initiate(struct net_device *dev)$/;" f
1235	rtl8187_rx_isr r8187_core.c /^void rtl8187_rx_isr(struct urb rx_urb, struct pt_regs regs)$/;" f	1235	rtl8187_rx_isr r8187_core.c /^void rtl8187_rx_isr(struct urb *rx_urb)$/;" f
1236	rtl8187_rx_urbsubmit r8187_core.c /^void rtl8187_rx_urbsubmit(struct net_device dev, struct urb rx_urb)$/;" f	1236	rtl8187_rx_urbsubmit r8187_core.c /^void rtl8187_rx_urbsubmit(struct net_device dev, struct urb rx_urb)$/;" f
1237	rtl8187_set_rate r8187_core.c /^void rtl8187_set_rate(struct net_device *dev)$/;" f	1237	rtl8187_set_rate r8187_core.c /^void rtl8187_set_rate(struct net_device *dev)$/;" f
1238	rtl8187_set_rxconf r8187_core.c /^void rtl8187_set_rxconf(struct net_device *dev)$/;" f	1238	rtl8187_set_rxconf r8187_core.c /^void rtl8187_set_rxconf(struct net_device *dev)$/;" f